Skip to content

Commit ab441dc

Browse files
markuspgmarkuspg
committed
Fix and rename Config::find to Config::filter
Signed-off-by: markuspg <markuspg@users.noreply.github.com>
1 parent 46ed5c4 commit ab441dc

2 files changed

Lines changed: 46 additions & 44 deletions

File tree

‎libuuu/config.cpp‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -43,47 +43,49 @@ constexpr uint16_t FSL_VID = 0x15A2;
4343
constexpr uint16_t NXP_VID = 0x1FC9;
4444
constexpr uint16_t BD_VID = 0x3016;
4545

46-
Config::Config()
46+
Config::Config(bool construct_empty)
4747
{
48-
emplace_back(ConfigItem{"SDPS:", "MX8QXP", nullptr, NXP_VID, 0x012F, 0x0002});
49-
emplace_back(ConfigItem{"SDPS:", "MX8QM", "MX8QXP", NXP_VID, 0x0129, 0x0002});
50-
emplace_back(ConfigItem{"SDPS:", "MX8DXL", "MX8QXP", NXP_VID, 0x0147});
51-
emplace_back(ConfigItem{"SDPS:", "MX28", nullptr, FSL_VID, 0x004f});
52-
emplace_back(ConfigItem{"SDPS:", "MX815", nullptr, NXP_VID, 0x013E});
53-
emplace_back(ConfigItem{"SDPS:", "MX865", "MX815", NXP_VID, 0x0146});
54-
emplace_back(ConfigItem{"SDPS:", "MX8ULP", "MX815", NXP_VID, 0x014A});
55-
emplace_back(ConfigItem{"SDPS:", "MX8ULP", "MX815", NXP_VID, 0x014B});
56-
emplace_back(ConfigItem{"SDPS:", "MX93", "MX815", NXP_VID, 0x014E});
57-
emplace_back(ConfigItem{"SDPS:", "MX91", "MX815", NXP_VID, 0x0159});
58-
emplace_back(ConfigItem{"SDPS:", "MX95", nullptr, NXP_VID, 0x015D});
59-
emplace_back(ConfigItem{"SDPS:", "MX95", nullptr, NXP_VID, 0x015C});
60-
emplace_back(ConfigItem{"SDPS:", "MX943", "MX95", NXP_VID, 0x0027});
61-
emplace_back(ConfigItem{"SDP:", "MX7D", nullptr, FSL_VID, 0x0076});
62-
emplace_back(ConfigItem{"SDP:", "MX6Q", nullptr, FSL_VID, 0x0054});
63-
emplace_back(ConfigItem{"SDP:", "MX6D", "MX6Q", FSL_VID, 0x0061});
64-
emplace_back(ConfigItem{"SDP:", "MX6SL", "MX6Q", FSL_VID, 0x0063});
65-
emplace_back(ConfigItem{"SDP:", "MX6SX", "MX6Q", FSL_VID, 0x0071});
66-
emplace_back(ConfigItem{"SDP:", "MX6UL", "MX7D", FSL_VID, 0x007D});
67-
emplace_back(ConfigItem{"SDP:", "MX6ULL", "MX7D", FSL_VID, 0x0080});
68-
emplace_back(ConfigItem{"SDP:", "MX6SLL", "MX7D", NXP_VID, 0x0128});
69-
emplace_back(ConfigItem{"SDP:", "MX7ULP", nullptr, NXP_VID, 0x0126});
70-
emplace_back(ConfigItem{"SDP:", "MXRT106X", nullptr, NXP_VID, 0x0135});
71-
emplace_back(ConfigItem{"SDP:", "MX8MM", "MX8MQ", NXP_VID, 0x0134});
72-
emplace_back(ConfigItem{"SDP:", "MX8MQ", "MX8MQ", NXP_VID, 0x012B});
73-
emplace_back(ConfigItem{"SDPU:", "SPL", "SPL", 0x0525, 0xB4A4, 0, 0x04FF});
74-
emplace_back(ConfigItem{"SDPV:", "SPL1", "SPL", 0x0525, 0xB4A4, 0x0500, 0x9998});
75-
emplace_back(ConfigItem{"SDPV:", "SPL1", "SPL", NXP_VID, 0x0151, 0x0500, 0x9998});
76-
emplace_back(ConfigItem{"SDPU:", "SPL", "SPL", 0x0525, 0xB4A4, 0x9999, 0x9999}); /*old i.MX8 MQEVk use bcd 9999*/
77-
emplace_back(ConfigItem{"SDPU:", "SPL", "SPL", BD_VID, 0x1001, 0, 0x04FF});
78-
emplace_back(ConfigItem{"SDPV:", "SPL1", "SPL", BD_VID, 0x1001, 0x0500, 0x9998});
79-
emplace_back(ConfigItem{"FBK:", nullptr, nullptr, 0x066F, 0x9AFE});
80-
emplace_back(ConfigItem{"FBK:", nullptr, nullptr, 0x066F, 0x9BFF});
81-
emplace_back(ConfigItem{"FBK:", nullptr, nullptr, NXP_VID, 0x0153});
82-
emplace_back(ConfigItem{"FB:", nullptr, nullptr, 0x0525, 0xA4A5});
83-
emplace_back(ConfigItem{"FB:", nullptr, nullptr, 0x18D1, 0x0D02});
84-
emplace_back(ConfigItem{"FB:", nullptr, nullptr, BD_VID, 0x0001});
85-
emplace_back(ConfigItem{"FB:", nullptr, nullptr, NXP_VID, 0x0152});
86-
emplace_back(ConfigItem{"FB:", nullptr, nullptr, 0x0483, 0x0afb});
48+
if (!construct_empty) {
49+
emplace_back(ConfigItem{"SDPS:", "MX8QXP", nullptr, NXP_VID, 0x012F, 0x0002});
50+
emplace_back(ConfigItem{"SDPS:", "MX8QM", "MX8QXP", NXP_VID, 0x0129, 0x0002});
51+
emplace_back(ConfigItem{"SDPS:", "MX8DXL", "MX8QXP", NXP_VID, 0x0147});
52+
emplace_back(ConfigItem{"SDPS:", "MX28", nullptr, FSL_VID, 0x004f});
53+
emplace_back(ConfigItem{"SDPS:", "MX815", nullptr, NXP_VID, 0x013E});
54+
emplace_back(ConfigItem{"SDPS:", "MX865", "MX815", NXP_VID, 0x0146});
55+
emplace_back(ConfigItem{"SDPS:", "MX8ULP", "MX815", NXP_VID, 0x014A});
56+
emplace_back(ConfigItem{"SDPS:", "MX8ULP", "MX815", NXP_VID, 0x014B});
57+
emplace_back(ConfigItem{"SDPS:", "MX93", "MX815", NXP_VID, 0x014E});
58+
emplace_back(ConfigItem{"SDPS:", "MX91", "MX815", NXP_VID, 0x0159});
59+
emplace_back(ConfigItem{"SDPS:", "MX95", nullptr, NXP_VID, 0x015D});
60+
emplace_back(ConfigItem{"SDPS:", "MX95", nullptr, NXP_VID, 0x015C});
61+
emplace_back(ConfigItem{"SDPS:", "MX943", "MX95", NXP_VID, 0x0027});
62+
emplace_back(ConfigItem{"SDP:", "MX7D", nullptr, FSL_VID, 0x0076});
63+
emplace_back(ConfigItem{"SDP:", "MX6Q", nullptr, FSL_VID, 0x0054});
64+
emplace_back(ConfigItem{"SDP:", "MX6D", "MX6Q", FSL_VID, 0x0061});
65+
emplace_back(ConfigItem{"SDP:", "MX6SL", "MX6Q", FSL_VID, 0x0063});
66+
emplace_back(ConfigItem{"SDP:", "MX6SX", "MX6Q", FSL_VID, 0x0071});
67+
emplace_back(ConfigItem{"SDP:", "MX6UL", "MX7D", FSL_VID, 0x007D});
68+
emplace_back(ConfigItem{"SDP:", "MX6ULL", "MX7D", FSL_VID, 0x0080});
69+
emplace_back(ConfigItem{"SDP:", "MX6SLL", "MX7D", NXP_VID, 0x0128});
70+
emplace_back(ConfigItem{"SDP:", "MX7ULP", nullptr, NXP_VID, 0x0126});
71+
emplace_back(ConfigItem{"SDP:", "MXRT106X", nullptr, NXP_VID, 0x0135});
72+
emplace_back(ConfigItem{"SDP:", "MX8MM", "MX8MQ", NXP_VID, 0x0134});
73+
emplace_back(ConfigItem{"SDP:", "MX8MQ", "MX8MQ", NXP_VID, 0x012B});
74+
emplace_back(ConfigItem{"SDPU:", "SPL", "SPL", 0x0525, 0xB4A4, 0, 0x04FF});
75+
emplace_back(ConfigItem{"SDPV:", "SPL1", "SPL", 0x0525, 0xB4A4, 0x0500, 0x9998});
76+
emplace_back(ConfigItem{"SDPV:", "SPL1", "SPL", NXP_VID, 0x0151, 0x0500, 0x9998});
77+
emplace_back(ConfigItem{"SDPU:", "SPL", "SPL", 0x0525, 0xB4A4, 0x9999, 0x9999}); /*old i.MX8 MQEVk use bcd 9999*/
78+
emplace_back(ConfigItem{"SDPU:", "SPL", "SPL", BD_VID, 0x1001, 0, 0x04FF});
79+
emplace_back(ConfigItem{"SDPV:", "SPL1", "SPL", BD_VID, 0x1001, 0x0500, 0x9998});
80+
emplace_back(ConfigItem{"FBK:", nullptr, nullptr, 0x066F, 0x9AFE});
81+
emplace_back(ConfigItem{"FBK:", nullptr, nullptr, 0x066F, 0x9BFF});
82+
emplace_back(ConfigItem{"FBK:", nullptr, nullptr, NXP_VID, 0x0153});
83+
emplace_back(ConfigItem{"FB:", nullptr, nullptr, 0x0525, 0xA4A5});
84+
emplace_back(ConfigItem{"FB:", nullptr, nullptr, 0x18D1, 0x0D02});
85+
emplace_back(ConfigItem{"FB:", nullptr, nullptr, BD_VID, 0x0001});
86+
emplace_back(ConfigItem{"FB:", nullptr, nullptr, NXP_VID, 0x0152});
87+
emplace_back(ConfigItem{"FB:", nullptr, nullptr, 0x0483, 0x0afb});
88+
}
8789
}
8890

8991
int uuu_for_each_cfg(uuu_show_cfg fn, void *p)
@@ -121,9 +123,9 @@ ConfigItem * Config::find(uint16_t vid, uint16_t pid, uint16_t ver)
121123
return nullptr;
122124
}
123125

124-
Config Config::find(const string &pro)
126+
Config Config::filter(const string &pro)
125127
{
126-
Config items;
128+
Config items{true};
127129
for (auto it = begin(); it != end(); it++)
128130
{
129131
if (it->m_protocol == pro)

‎libuuu/config.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ class ConfigItem
6161
class Config :public std::vector<ConfigItem>
6262
{
6363
public:
64-
Config();
64+
Config(bool construct_empty = false);
6565
ConfigItem *find(uint16_t vid, uint16_t pid, uint16_t ver);
66-
Config find(const std::string &protocol);
66+
Config filter(const std::string &protocol);
6767
};
6868

6969
Config * get_config() noexcept;

0 commit comments

Comments
 (0)