From 2c7dfdd5d09b7a3a4cf3e3d4628ada78edef5f21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Mon, 4 Feb 2013 11:16:42 -0800 Subject: [PATCH] Update. --- iab.txt | 25 +++++++++++++++++++++++++ oui.txt | 45 +++++++++++++++++++++++++++++++++++++++++++++ pci.ids | 24 ++++++++++++++++++++++-- udev-hwdb-update.pl | 2 ++ 4 files changed, 94 insertions(+), 2 deletions(-) diff --git a/iab.txt b/iab.txt index 768e37a..970c02f 100644 --- a/iab.txt +++ b/iab.txt @@ -26444,3 +26444,28 @@ FFF000-FFFFFF (base 16) MSR-Solutions GmbH Newcastle Tye & Wear NE1 3DQ UNITED KINGDOM +40-D8-55 (hex) Heart Force Medical +095000-095FFF (base 16) Heart Force Medical + 212 - 2112 West Broadway + Vancouver BC V6K 2C8 + CANADA + +40-D8-55 (hex) Comtel Electronics GmbH +096000-096FFF (base 16) Comtel Electronics GmbH + Bretonischer Ring 11 + Grasbrunn 85630 + GERMANY + +40-D8-55 (hex) Burton Technical Services LLC +097000-097FFF (base 16) Burton Technical Services LLC + 1214 Metro Park Blvd + Suite 101 + Lewisville Texas 75057 + UNITED STATES + +40-D8-55 (hex) Dave Srl +098000-098FFF (base 16) Dave Srl + Via Talponedo 29a + Porcia Pordenone 33080 + ITALY + diff --git a/oui.txt b/oui.txt index 60a10c6..abbbfc3 100644 --- a/oui.txt +++ b/oui.txt @@ -92489,6 +92489,13 @@ company_id Organization Shinjuku Tokyo 160-0023 JAPAN +64-E5-99 (hex) EFM Networks +64E599 (base 16) EFM Networks + 6F Benposra II B/D + 1197-1 Bojeong-dong + Yong In Kyunggi-do 446-913 + KOREA, REPUBLIC OF + 64-E6-82 (hex) Apple, Inc. 64E682 (base 16) Apple, Inc. 1 infinite Loop @@ -97957,6 +97964,12 @@ company_id Organization Beijing 100081 CHINA +94-AC-CA (hex) trivum technologies GmbH +94ACCA (base 16) trivum technologies GmbH + Heusteigstraße 37 + Stuttgart 70108 + GERMANY + 94-AE-61 (hex) Alcatel Lucent 94AE61 (base 16) Alcatel Lucent Via trento, 30 @@ -98316,6 +98329,12 @@ company_id Organization Dallas TX 75243 UNITED STATES +98-5C-93 (hex) SBG Systems SAS +985C93 (base 16) SBG Systems SAS + 3bis, chemin de la Jonchere + Rueil Malmaison Ile de France 92500 + FRANCE + 98-5E-1B (hex) ConversDigital Co., Ltd. 985E1B (base 16) ConversDigital Co., Ltd. 5308 5th Bldg., Dong Seoul Univ. @@ -99283,6 +99302,13 @@ A088B4 (base 16) Intel Corporate Kulim Kedah 09000 MALAYSIA +A0-8A-87 (hex) HuiZhou KaiYue Electronic Co.,Ltd +A08A87 (base 16) HuiZhou KaiYue Electronic Co.,Ltd + 3#,Ruttang 2nd area,Tongcheng Avenue + Shuikuo + Huizhou Guangdong 516005 + CHINA + A0-8C-15 (hex) Gerhard D. Wempe KG A08C15 (base 16) Gerhard D. Wempe KG Steinstrasse 23 @@ -105195,6 +105221,13 @@ D42C3D (base 16) Sky Light Digital Limited Hong Kong 999077 CHINA +D4-3A-65 (hex) IGRS Engineering Lab Ltd. +D43A65 (base 16) IGRS Engineering Lab Ltd. + 8F,Taipeng Mansion + No.10 Haidian North 2nd Street + Haidian District Beijing 10000 + CHINA + D4-3A-E9 (hex) DONGGUAN ipt INDUSTRIAL CO., LTD D43AE9 (base 16) DONGGUAN ipt INDUSTRIAL CO., LTD No.66-1.Ist New Area, Nanshe Dist., Chigang,Humen, @@ -109017,6 +109050,12 @@ F49466 (base 16) CountMax, ltd poselok Lesnoy Moscowskaya oblast 141231 RUSSIAN FEDERATION +F4-99-AC (hex) WEBER Schraubautomaten GmbH +F499AC (base 16) WEBER Schraubautomaten GmbH + Hans-Urmiller-Ring 56 + Wolfratshausen Bayern 82515 + GERMANY + F4-9F-54 (hex) Samsung Electronics F49F54 (base 16) Samsung Electronics #94-1, Imsoo-Dong @@ -109692,6 +109731,12 @@ FC10BD (base 16) Control Sistematizado S.A. Medellin Antioquia 10101 COLOMBIA +FC-11-86 (hex) Logic3 plc +FC1186 (base 16) Logic3 plc + Rhodes Way + Watford Hertfordshire WD24 4YW + UNITED KINGDOM + FC-17-94 (hex) InterCreative Co., Ltd FC1794 (base 16) InterCreative Co., Ltd 897-6, HoGye-Dong, DongAn-Gu, diff --git a/pci.ids b/pci.ids index 5979afd..55e1e8f 100644 --- a/pci.ids +++ b/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2013.02.01 -# Date: 2013-02-01 03:15:02 +# Version: 2013.02.04 +# Date: 2013-02-04 03:15:01 # # Maintained by Martin Mares and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -12412,6 +12412,7 @@ 400c B404-BT Unified Wire Ethernet Controller 400d T480 Unified Wire Ethernet Controller 400e T440-LP-CR Unified Wire Ethernet Controller + 400f Amsterdam T440 Unified Wire Ethernet Controller 4080 T480-4080 T480 Unified Wire Ethernet Controller 4081 T440F-4081 T440-FCoE Unified Wire Ethernet Controller 4082 T420-4082 Unified Wire Ethernet Controller @@ -12434,6 +12435,7 @@ 440c B404-BT Unified Wire Ethernet Controller 440d T480 Unified Wire Ethernet Controller 440e T440-LP-CR Unified Wire Ethernet Controller + 440f Amsterdam T440 Unified Wire Ethernet Controller 4480 T480-4080 T480 Unified Wire Ethernet Controller 4481 T440F-4081 T440-FCoE Unified Wire Ethernet Controller 4482 T420-4082 Unified Wire Ethernet Controller @@ -12456,6 +12458,7 @@ 450c B404-BT Unified Wire Storage Controller 450d T480 Unified Wire Storage Controller 450e T440-LP-CR Unified Wire Storage Controller + 450f Amsterdam T440 Unified Wire Storage Controller 4580 T480-4080 T480 Unified Wire Storage Controller 4581 T440F-4081 T440-FCoE Unified Wire Storage Controller 4582 T420-4082 Unified Wire Storage Controller @@ -12478,6 +12481,7 @@ 460c B404-BT Unified Wire Storage Controller 460d T480 Unified Wire Storage Controller 460e T440-LP-CR Unified Wire Storage Controller + 460f Amsterdam T440 Unified Wire Storage Controller 4680 T480-4080 T480 Unified Wire Storage Controller 4681 T440F-4081 T440-FCoE Unified Wire Storage Controller 4682 T420-4082 Unified Wire Storage Controller @@ -12500,6 +12504,7 @@ 470c B404-BT Unified Wire Ethernet Controller 470d T480 Unified Wire Ethernet Controller 470e T440-LP-CR Unified Wire Ethernet Controller + 470f Amsterdam T440 Unified Wire Ethernet Controller 4780 T480-4080 T480 Unified Wire Ethernet Controller 4781 T440F-4081 T440-FCoE Unified Wire Ethernet Controller 4782 T420-4082 Unified Wire Ethernet Controller @@ -12522,6 +12527,7 @@ 480c B404-BT Unified Wire Ethernet Controller 480d T480 Unified Wire Ethernet Controller 480e T440-LP-CR Unified Wire Ethernet Controller + 480f Amsterdam T440 Unified Wire Ethernet Controller 4880 T480-4080 T480 Unified Wire Ethernet Controller 4881 T440F-4081 T440-FCoE Unified Wire Ethernet Controller 4882 T420-4082 Unified Wire Ethernet Controller @@ -12563,6 +12569,7 @@ 540c B504-BT Unified Wire Ethernet Controller 540d T580-CR Unified Wire Ethernet Controller 540e T540-LP-CR Unified Wire Ethernet Controller + 540f Amsterdam T540 Unified Wire Ethernet Controller 5410 T580-LP-CR Unified Wire Ethernet Controller 5411 T520-LL-CR Unified Wire Ethernet Controller 5412 T560-CR Unified Wire Ethernet Controller @@ -12600,6 +12607,7 @@ 560c B504-BT Unified Wire Storage Controller 560d T580-CR Unified Wire Storage Controller 560e T540-LP-CR Unified Wire Storage Controller + 560f Amsterdam T540 Unified Wire Storage Controller 5610 T580-LP-CR Unified Wire Storage Controller 5611 T520-LL-CR Unified Wire Storage Controller 5612 T560-CR Unified Wire Storage Controller @@ -12618,6 +12626,7 @@ 570c B504-BT Unified Wire Ethernet Controller 570d T580-CR Unified Wire Ethernet Controller 570e T540-LP-CR Unified Wire Ethernet Controller + 570f Amsterdam T540 Unified Wire Ethernet Controller 5710 T580-LP-CR Unified Wire Ethernet Controller 5711 T520-LL-CR Unified Wire Ethernet Controller 5712 T560-CR Unified Wire Ethernet Controller @@ -12636,6 +12645,7 @@ 580c B504-BT Unified Wire Ethernet Controller 580d T580-CR Unified Wire Ethernet Controller 580e T540-LP-CR Unified Wire Ethernet Controller + 580f Amsterdam T540 Unified Wire Ethernet Controller 5810 T580-LP-CR Unified Wire Ethernet Controller 5811 T520-LL-CR Unified Wire Ethernet Controller 5812 T560-CR Unified Wire Ethernet Controller @@ -18231,6 +18241,8 @@ 103c 2a3b Pavilion A1512X 103c 31fe ProLiant DL140 G3 103c 330b ProLiant ML150 G6 Server +# same ID possibly also on other ASUS boards + 1043 8277 P5K PRO Motherboard 1458 5000 Motherboard 15d9 9680 X7DBN Motherboard 1775 11cc CC11/CL11 @@ -19828,6 +19840,8 @@ 2940 82801I (ICH9 Family) PCI Express Port 1 1028 020d Inspiron 530 1028 0211 Optiplex 755 +# same ID possibly also on other ASUS boards + 1043 8277 P5K PRO Motherboard 8086 2940 Optiplex 755 2942 82801I (ICH9 Family) PCI Express Port 2 1028 020d Inspiron 530 @@ -19837,8 +19851,12 @@ 1028 020d Inspiron 530 2948 82801I (ICH9 Family) PCI Express Port 5 1028 020d Inspiron 530 +# same ID possibly also on other ASUS boards + 1043 8277 P5K PRO Motherboard 294a 82801I (ICH9 Family) PCI Express Port 6 1028 020d Inspiron 530 +# same ID possibly also on other ASUS boards + 1043 8277 P5K PRO Motherboard 294c 82566DC-2 Gigabit Network Connection 17aa 302e 82566DM-2 Gigabit Network Connection 2970 82946GZ/PL/GL Memory Controller Hub @@ -19898,6 +19916,8 @@ 8086 5044 Desktop Board DP35DP 29c1 82G33/G31/P35/P31 Express PCI Express Root Port 1028 020d Inspiron 530 +# same ID possibly also on other ASUS boards + 1043 8276 P5K PRO Motherboard 29c2 82G33/G31 Express Integrated Graphics Controller 1028 020d Inspiron 530 1043 82b0 P5KPL-VM Motherboard diff --git a/udev-hwdb-update.pl b/udev-hwdb-update.pl index 13596b8..5782bb5 100644 --- a/udev-hwdb-update.pl +++ b/udev-hwdb-update.pl @@ -219,6 +219,7 @@ sub oui { open(IN, "<", "iab.txt"); while (my $line = ) { + $line =~ s/^ +//; $line =~ s/\s+$//; $line =~ m/^([0-9A-F]{2})-([0-9A-F]{2})-([0-9A-F]{2})\s*\(hex\)\s*.+$/; if (defined $1) { @@ -241,6 +242,7 @@ sub oui { open(IN, "<", "oui.txt"); while (my $line = ) { + $line =~ s/^ +//; $line =~ s/\s+$//; $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.+)$/; if (defined $1) { -- 2.25.1