diff --git a/include/pci.ids.hpp b/include/pci.ids.hpp index 576990c5..204e65eb 100644 --- a/include/pci.ids.hpp +++ b/include/pci.ids.hpp @@ -341,59 +341,59 @@ inline constexpr std::array get_pci_vendors_location_array() 896967, 897248, 897413, 897460, 897924, 897973, 898624, 898644, 898678, 898827, 898998, 899026, 899088, 899105, 899151, 899165, 900895, 901125, 901157, 901919, 902238, 902289, 902372, 902467, 902565, 902626, 905369, 905381, 905632, 906124, 906164, 906202, 906366, 906578, 906889, 906913, - 907152, 907241, 907880, 907910, 907935, 908004, 908107, 912117, 912656, 912693, 912749, 913046, - 913098, 913145, 913963, 914368, 914783, 914829, 914895, 914945, 914961, 914974, 915357, 915818, - 915847, 916036, 916139, 917630, 917662, 917684, 917775, 917875, 917984, 918249, 921564, 927025, - 927163, 927218, 927262, 927311, 927332, 928187, 928212, 928265, 928310, 929423, 931691, 931851, - 931941, 932005, 932571, 932852, 932887, 933145, 933158, 933182, 933208, 933261, 933280, 933365, - 933739, 938043, 938094, 938188, 938302, 938313, 938428, 938620, 938701, 938853, 938884, 938897, - 938918, 938945, 938967, 938995, 939081, 939219, 941029, 943186, 943199, 946054, 946299, 946403, - 946644, 946884, 946945, 946957, 946982, 946994, 948033, 948103, 948687, 948790, 948816, 948935, - 949434, 949542, 949603, 949629, 950468, 950492, 951886, 951989, 952024, 952134, 952151, 952193, - 952227, 952318, 964910, 964925, 965093, 965242, 965298, 965421, 965666, 966224, 967482, 968400, - 968513, 968571, 968813, 968837, 968889, 968918, 972953, 973012, 973070, 973311, 973350, 974247, - 974286, 974302, 974374, 980324, 980345, 980410, 980431, 980759, 981126, 981252, 981280, 981441, - 981562, 981616, 981697, 981755, 981857, 981957, 981976, 981991, 982061, 982120, 982262, 982837, - 982868, 982884, 982955, 983026, 983043, 983556, 983585, 983620, 983897, 984003, 984126, 984223, - 984241, 984321, 984368, 984447, 984496, 984568, 984630, 985033, 985350, 985388, 985422, 985494, - 985556, 985569, 986148, 986247, 986263, 986526, 987345, 987360, 987495, 988133, 988156, 988210, - 988232, 988254, 988284, 988562, 988638, 988687, 989871, 989949, 989977, 990065, 990202, 990489, - 990536, 991856, 992179, 992248, 992348, 992383, 992405, 992423, 992481, 992887, 992926, 993002, - 993050, 993121, 993271, 993591, 994162, 994269, 994349, 996636, 996679, 996737, 996833, 996925, - 996993, 997044, 997303, 997357, 998096, 998158, 998225, 998270, 998330, 998358, 998395, 998417, - 998448, 998788, 998834, 998879, 998951, 999035, 999063, 999078, 999107, 999150, 999184, 999264, - 999329, 999369, 999420, 999458, 999512, 1000756, 1000781, 1000814, 1000841, 1000882, 1000940, 1000961, - 1001028, 1001066, 1001096, 1001140, 1001160, 1001190, 1001206, 1001237, 1001291, 1001380, 1002372, 1002405, - 1002486, 1002514, 1002557, 1002589, 1002613, 1002768, 1002790, 1002862, 1002886, 1004078, 1004463, 1004521, - 1005627, 1005656, 1005693, 1005857, 1005879, 1005941, 1005976, 1005989, 1006037, 1006401, 1006425, 1009497, - 1009523, 1009554, 1009584, 1009773, 1009784, 1009809, 1009848, 1009910, 1009932, 1015978, 1016002, 1016074, - 1016094, 1016112, 1016139, 1016301, 1016739, 1016916, 1016944, 1016976, 1017003, 1017573, 1018713, 1018737, - 1018788, 1018854, 1018907, 1018963, 1018994, 1019124, 1019147, 1019166, 1019210, 1019276, 1019333, 1023819, - 1023841, 1023896, 1024636, 1024665, 1024715, 1024729, 1024759, 1024817, 1024983, 1025007, 1025033, 1025072, - 1025137, 1025154, 1025180, 1025333, 1025546, 1025560, 1025594, 1025628, 1025662, 1025752, 1025768, 1025820, - 1025840, 1025893, 1025927, 1026242, 1026384, 1026418, 1026654, 1026686, 1026706, 1026740, 1026774, 1026808, - 1026833, 1026895, 1026915, 1026964, 1027026, 1027088, 1027125, 1027215, 1027245, 1027353, 1027377, 1027391, - 1027596, 1027625, 1027671, 1423123, 1427605, 1427706, 1427733, 1427748, 1427783, 1428148, 1428256, 1428316, - 1428448, 1430160, 1430187, 1430255, 1430322, 1430372, 1430400, 1430424, 1430458, 1433699, 1447195, 1447228, - 1447249, 1447274, 1447389, 1447462, 1447530, 1448691, 1448713, 1448860, 1448909, 1449577, 1449623, 1449640, - 1449665, 1449687, 1449709, 1449745, 1449756, 1449856, 1449869, 1449882, 1449895, 1449908, 1449921, 1449934, - 1449947, 1449960, 1449973, 1449986, 1449999, 1450012, 1450025, 1450038, 1450051, 1450064, 1450091, 1450124, - 1450254, 1450274, 1450312, 1450336, 1450369, 1450460, 1450663, 1450728, 1450753, 1450780, 1450881, 1450921, - 1451923, 1451940, 1452283, 1452298, 1452329, 1452409, 1452479, 1452501, 1452532, 1452625, 1452662, 1452843, - 1452896, 1452926, 1452975, 1453104, 1453142, 1453156, 1453220, 1453276, 1455147, 1455210, 1456547, 1456595, - 1456617, 1456629, 1456920, 1456946, 1456969, 1457375, 1457940, 1457967, 1458119, 1458171, 1458200, 1458564, - 1458576, 1458760, 1458773, 1458804, 1459104, 1459222, 1459280, 1459310, 1461071, 1461111, 1461148, 1461278, - 1461317, 1461362, 1461392, 1461498, 1461576, 1462297, 1462378, 1462416, 1462470, 1462498, 1462566, 1462602, - 1462691, 1462730, 1462828, 1462956, 1463008 }; + 907152, 907241, 907880, 907910, 907935, 908004, 908107, 912113, 912652, 912689, 912745, 913042, + 913094, 913141, 913959, 914364, 914779, 914825, 914891, 914941, 914957, 914970, 915353, 915814, + 915843, 916032, 916135, 917626, 917658, 917680, 917771, 917871, 917980, 918245, 921560, 927021, + 927159, 927214, 927258, 927307, 927328, 928183, 928208, 928261, 928306, 929419, 931687, 931847, + 931937, 932001, 932567, 932848, 932883, 933141, 933154, 933178, 933204, 933257, 933276, 933361, + 933735, 938039, 938090, 938184, 938298, 938309, 938424, 938616, 938697, 938849, 938880, 938893, + 938914, 938941, 938963, 938991, 939077, 939215, 941025, 943182, 943195, 946050, 946295, 946399, + 946640, 946880, 946941, 946953, 946978, 946990, 948029, 948099, 948683, 948786, 948812, 948931, + 949430, 949538, 949599, 949625, 950464, 950488, 951882, 951985, 952020, 952130, 952147, 952189, + 952223, 952314, 964906, 964921, 965089, 965238, 965294, 965417, 965662, 966220, 967478, 968396, + 968509, 968567, 968809, 968833, 968885, 968914, 972949, 973008, 973066, 973307, 973346, 974243, + 974282, 974298, 974370, 980320, 980341, 980406, 980427, 980755, 981122, 981248, 981276, 981437, + 981558, 981612, 981693, 981751, 981853, 981953, 981972, 981987, 982057, 982116, 982258, 982833, + 982864, 982880, 982951, 983022, 983039, 983552, 983581, 983616, 983893, 983999, 984122, 984219, + 984237, 984317, 984364, 984443, 984492, 984564, 984626, 985029, 985346, 985384, 985418, 985490, + 985552, 985565, 986144, 986243, 986259, 986522, 987341, 987356, 987491, 988129, 988152, 988206, + 988228, 988250, 988280, 988558, 988634, 988683, 989867, 989945, 989973, 990061, 990198, 990485, + 990532, 991852, 992175, 992244, 992344, 992379, 992401, 992419, 992477, 992883, 992922, 992998, + 993046, 993117, 993267, 993587, 994158, 994265, 994345, 996632, 996675, 996733, 996829, 996921, + 996989, 997040, 997299, 997353, 998092, 998154, 998221, 998266, 998326, 998354, 998391, 998413, + 998444, 998784, 998830, 998875, 998947, 999031, 999059, 999074, 999103, 999146, 999180, 999260, + 999325, 999365, 999416, 999454, 999508, 1000752, 1000777, 1000810, 1000837, 1000878, 1000936, 1000957, + 1001024, 1001062, 1001092, 1001136, 1001156, 1001186, 1001202, 1001233, 1001287, 1001376, 1002368, 1002401, + 1002482, 1002510, 1002553, 1002585, 1002609, 1002764, 1002786, 1002858, 1002882, 1004074, 1004459, 1004517, + 1005623, 1005652, 1005689, 1005853, 1005875, 1005937, 1005972, 1005985, 1006033, 1006397, 1006421, 1009493, + 1009519, 1009550, 1009580, 1009769, 1009780, 1009805, 1009844, 1009906, 1009928, 1015974, 1015998, 1016070, + 1016090, 1016108, 1016135, 1016297, 1016735, 1016912, 1016940, 1016972, 1016999, 1017569, 1018709, 1018733, + 1018784, 1018850, 1018903, 1018959, 1018990, 1019120, 1019143, 1019162, 1019206, 1019272, 1019329, 1023815, + 1023837, 1023892, 1024632, 1024661, 1024711, 1024725, 1024755, 1024813, 1024979, 1025003, 1025029, 1025068, + 1025133, 1025150, 1025176, 1025329, 1025542, 1025556, 1025590, 1025624, 1025658, 1025748, 1025764, 1025816, + 1025836, 1025889, 1025923, 1026238, 1026380, 1026414, 1026650, 1026682, 1026702, 1026736, 1026770, 1026804, + 1026829, 1026891, 1026911, 1026960, 1027022, 1027084, 1027121, 1027211, 1027241, 1027349, 1027373, 1027387, + 1027592, 1027621, 1027667, 1423119, 1427601, 1427702, 1427729, 1427744, 1427779, 1428144, 1428252, 1428312, + 1428444, 1430156, 1430183, 1430251, 1430318, 1430368, 1430396, 1430420, 1430454, 1433695, 1447191, 1447224, + 1447245, 1447270, 1447385, 1447458, 1447526, 1448687, 1448709, 1448856, 1448905, 1449573, 1449619, 1449636, + 1449661, 1449683, 1449705, 1449741, 1449752, 1449852, 1449865, 1449878, 1449891, 1449904, 1449917, 1449930, + 1449943, 1449956, 1449969, 1449982, 1449995, 1450008, 1450021, 1450034, 1450047, 1450060, 1450087, 1450120, + 1450250, 1450270, 1450308, 1450332, 1450365, 1450456, 1450659, 1450724, 1450749, 1450776, 1450877, 1450917, + 1451919, 1451936, 1452279, 1452294, 1452325, 1452405, 1452475, 1452497, 1452528, 1452621, 1452658, 1452839, + 1452892, 1452922, 1452971, 1453100, 1453138, 1453152, 1453216, 1453272, 1455143, 1455206, 1456543, 1456591, + 1456613, 1456625, 1456916, 1456942, 1456965, 1457371, 1457936, 1457963, 1458115, 1458167, 1458196, 1458560, + 1458572, 1458756, 1458769, 1458800, 1459100, 1459218, 1459276, 1459306, 1461067, 1461107, 1461144, 1461274, + 1461313, 1461358, 1461388, 1461494, 1461572, 1462293, 1462374, 1462412, 1462466, 1462494, 1462562, 1462598, + 1462687, 1462726, 1462824, 1462952, 1463004 }; } inline std::string get_pci_ids() { - return R""""(# + return R"(# # List of PCI ID's # -# Version: 2024.09.12 -# Date: 2024-09-12 03:15:02 +# Version: 2024.10.24 +# Date: 2024-10-24 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -25721,7 +25721,7 @@ inline std::string get_pci_ids() 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD - 5018 FireCuda 530 SSD + 5018 E18 PCIe SSD 5019 BarraCuda PCIe SSD (DRAM-less) # 2TB 5021 FireCuda 520 SSD @@ -27888,7 +27888,7 @@ inline std::string get_pci_ids() 1010 AWM 1 2000 AWM 2 2010 AWM 2-M -1fe1 Beijing Eswin Computing Technology Co., Ltd. +1fe1 Beijing ESWIN Computing Technology Co., Ltd. 1fe4 HippStor Technology 1600 HP600 Series NVMe SSD 1fe4 0075 Enterprise NVMe SSD U.2 3.84TB(HP610) @@ -39081,11 +39081,11 @@ C 12 Processing accelerators C 13 Non-Essential Instrumentation C 40 Coprocessor C ff Unassigned class -)""""; +)"; } inline const std::string& all_ids = get_pci_ids(); inline constexpr std::array pci_vendors_array = get_pci_vendors_array(); inline constexpr std::array pci_vendors_location_array = get_pci_vendors_location_array(); -#endif // PCI_IDS_HPP +#endif // _PCI_IDS_HPP \ No newline at end of file diff --git a/scripts/generate_pci_arrays.py b/scripts/generate_pci_arrays.py index ca26f65c..f87224a4 100644 --- a/scripts/generate_pci_arrays.py +++ b/scripts/generate_pci_arrays.py @@ -107,13 +107,13 @@ } inline std::string get_pci_ids() { - return R"""(%s)"""; + return R"(%s)"; } inline const std::string& all_ids = get_pci_ids(); inline constexpr std::array pci_vendors_array = get_pci_vendors_array(); inline constexpr std::array pci_vendors_location_array = get_pci_vendors_location_array(); -#endif // PCI_IDS_HPP""" % (len(vendor_array), repr(vendor_array).replace("'", '"').replace('[', '{').replace(']', '}'), len(location_array), repr(location_array).replace("'", '"').replace('[', '{').replace(']', '}'), file, len(vendor_array), len(location_array))) +#endif // _PCI_IDS_HPP""" % (len(vendor_array), repr(vendor_array).replace("'", '"').replace('[', '{').replace(']', '}'), len(location_array), repr(location_array).replace("'", '"').replace('[', '{').replace(']', '}'), file, len(vendor_array), len(location_array))) print(file[159514:159524])