mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
hwdb: ID_PRODUCT_FROM_DATABASE --> ID_MODEL_FROM_DATABASE
With the conversion from pci-db + usb-db to hwdb, the property got accitentially renamed. Move the name back to the long established identifier *MODEL* instead of *PRODUCT*. $ git grep -l ID_MODEL_FROM_DATABASE hwdb/20-pci-vendor-model.hwdb hwdb/20-usb-vendor-model.hwdb hwdb/ids-update.pl man/systemd.device.xml rules/78-sound-card.rules src/core/device.c src/cryptsetup/cryptsetup.c
This commit is contained in:
Kay Sievers
parent
bb06e0f85c
commit
1d09582ab9
@ -1833,9 +1833,9 @@ dist_udevrules_DATA += \
|
||||
rules/95-udev-late.rules
|
||||
|
||||
dist_udevhwdb_DATA = \
|
||||
hwdb/20-pci-vendor-product.hwdb \
|
||||
hwdb/20-pci-vendor-model.hwdb \
|
||||
hwdb/20-pci-classes.hwdb \
|
||||
hwdb/20-usb-vendor-product.hwdb \
|
||||
hwdb/20-usb-vendor-model.hwdb \
|
||||
hwdb/20-usb-classes.hwdb \
|
||||
hwdb/20-bluetooth-vendor-product.hwdb \
|
||||
hwdb/20-acpi-vendor.hwdb \
|
||||
|
||||
@ -50785,6 +50785,9 @@ OUI:04180F*
|
||||
OUI:0418D6*
|
||||
ID_OUI_FROM_DATABASE=Ubiquiti Networks
|
||||
|
||||
OUI:041BBA*
|
||||
ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
|
||||
|
||||
OUI:041D10*
|
||||
ID_OUI_FROM_DATABASE=Dream Ware Inc.
|
||||
|
||||
@ -50884,6 +50887,9 @@ OUI:0481AE*
|
||||
OUI:04888C*
|
||||
ID_OUI_FROM_DATABASE=Eifelwerk Butler Systeme GmbH
|
||||
|
||||
OUI:0488E2*
|
||||
ID_OUI_FROM_DATABASE=Beats Electronics LLC
|
||||
|
||||
OUI:048A15*
|
||||
ID_OUI_FROM_DATABASE=Avaya, Inc
|
||||
|
||||
@ -52405,6 +52411,9 @@ OUI:181725*
|
||||
OUI:18193F*
|
||||
ID_OUI_FROM_DATABASE=Tamtron Oy
|
||||
|
||||
OUI:181EB0*
|
||||
ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
|
||||
|
||||
OUI:182032*
|
||||
ID_OUI_FROM_DATABASE=Apple, Inc.
|
||||
|
||||
@ -52429,6 +52438,9 @@ OUI:18339D*
|
||||
OUI:183451*
|
||||
ID_OUI_FROM_DATABASE=Apple, Inc.
|
||||
|
||||
OUI:1836FC*
|
||||
ID_OUI_FROM_DATABASE=Elecsys International Corporation
|
||||
|
||||
OUI:183825*
|
||||
ID_OUI_FROM_DATABASE=Wuhan Lingjiu High-tech Co.,Ltd.
|
||||
|
||||
@ -52510,6 +52522,9 @@ OUI:1886AC*
|
||||
OUI:188796*
|
||||
ID_OUI_FROM_DATABASE=HTC Corporation
|
||||
|
||||
OUI:188857*
|
||||
ID_OUI_FROM_DATABASE=Beijing Jinhong Xi-Dian Information Technology Corp.
|
||||
|
||||
OUI:188ED5*
|
||||
ID_OUI_FROM_DATABASE=Philips Innovative Application NV
|
||||
|
||||
@ -53620,6 +53635,9 @@ OUI:2C8BF2*
|
||||
OUI:2C9127*
|
||||
ID_OUI_FROM_DATABASE=Eintechno Corporation
|
||||
|
||||
OUI:2C9464*
|
||||
ID_OUI_FROM_DATABASE=Cincoze Co., Ltd.
|
||||
|
||||
OUI:2C9717*
|
||||
ID_OUI_FROM_DATABASE=I.C.Y. B.V.
|
||||
|
||||
@ -56053,6 +56071,9 @@ OUI:5C35DA*
|
||||
OUI:5C38E0*
|
||||
ID_OUI_FROM_DATABASE=Shanghai Super Electronics Technology Co.,LTD
|
||||
|
||||
OUI:5C3C27*
|
||||
ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
|
||||
|
||||
OUI:5C4058*
|
||||
ID_OUI_FROM_DATABASE=Jefferson Audio Video Systems, Inc.
|
||||
|
||||
@ -56461,6 +56482,9 @@ OUI:60FACD*
|
||||
OUI:60FB42*
|
||||
ID_OUI_FROM_DATABASE=Apple, Inc
|
||||
|
||||
OUI:60FE1E*
|
||||
ID_OUI_FROM_DATABASE=China Palms Telecom.Ltd
|
||||
|
||||
OUI:60FEC5*
|
||||
ID_OUI_FROM_DATABASE=Apple
|
||||
|
||||
@ -57565,6 +57589,9 @@ OUI:74867A*
|
||||
OUI:74888B*
|
||||
ID_OUI_FROM_DATABASE=ADB Broadband Italia
|
||||
|
||||
OUI:748E08*
|
||||
ID_OUI_FROM_DATABASE=Bestek Corp.
|
||||
|
||||
OUI:748EF8*
|
||||
ID_OUI_FROM_DATABASE=Brocade Communications Systems, Inc.
|
||||
|
||||
@ -58771,6 +58798,9 @@ OUI:8897DF*
|
||||
OUI:889821*
|
||||
ID_OUI_FROM_DATABASE=TERAON
|
||||
|
||||
OUI:889B39*
|
||||
ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
|
||||
|
||||
OUI:889FFA*
|
||||
ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
|
||||
|
||||
@ -60397,6 +60427,9 @@ OUI:A4C0E1*
|
||||
OUI:A4C2AB*
|
||||
ID_OUI_FROM_DATABASE=Hangzhou LEAD-IT Information & Technology Co.,Ltd
|
||||
|
||||
OUI:A4D094*
|
||||
ID_OUI_FROM_DATABASE=Erwin Peters Systemtechnik GmbH
|
||||
|
||||
OUI:A4D18F*
|
||||
ID_OUI_FROM_DATABASE=Shenzhen Skyee Optical Fiber Communication Technology Ltd.
|
||||
|
||||
@ -63007,6 +63040,9 @@ OUI:D4016D*
|
||||
OUI:D4024A*
|
||||
ID_OUI_FROM_DATABASE=Delphian Systems LLC
|
||||
|
||||
OUI:D40BB9*
|
||||
ID_OUI_FROM_DATABASE=Solid Semecs bv.
|
||||
|
||||
OUI:D40FB2*
|
||||
ID_OUI_FROM_DATABASE=Applied Micro Electronics AME bv
|
||||
|
||||
@ -63361,6 +63397,9 @@ OUI:D85D84*
|
||||
OUI:D862DB*
|
||||
ID_OUI_FROM_DATABASE=Eno Inc.
|
||||
|
||||
OUI:D866C6*
|
||||
ID_OUI_FROM_DATABASE=Shenzhen Daystar Technology Co.,ltd
|
||||
|
||||
OUI:D867D9*
|
||||
ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
|
||||
|
||||
@ -63982,6 +64021,9 @@ OUI:E42F26*
|
||||
OUI:E42FF6*
|
||||
ID_OUI_FROM_DATABASE=Unicore communication Inc.
|
||||
|
||||
OUI:E432CB*
|
||||
ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
|
||||
|
||||
OUI:E43593*
|
||||
ID_OUI_FROM_DATABASE=Hangzhou GoTo technology Co.Ltd
|
||||
|
||||
@ -64846,6 +64888,9 @@ OUI:F40B93*
|
||||
OUI:F40F9B*
|
||||
ID_OUI_FROM_DATABASE=WAVELINK
|
||||
|
||||
OUI:F415FD*
|
||||
ID_OUI_FROM_DATABASE=Shanghai Pateo Electronic Equipment Manufacturing Co., Ltd.
|
||||
|
||||
OUI:F41BA1*
|
||||
ID_OUI_FROM_DATABASE=Apple
|
||||
|
||||
@ -64945,6 +64990,9 @@ OUI:F47B5E*
|
||||
OUI:F47F35*
|
||||
ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
|
||||
|
||||
OUI:F48139*
|
||||
ID_OUI_FROM_DATABASE=CANON INC.
|
||||
|
||||
OUI:F48771*
|
||||
ID_OUI_FROM_DATABASE=Infoblox
|
||||
|
||||
|
||||
66354
hwdb/20-pci-vendor-model.hwdb
Normal file
66354
hwdb/20-pci-vendor-model.hwdb
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
49014
hwdb/20-usb-vendor-model.hwdb
Normal file
49014
hwdb/20-usb-vendor-model.hwdb
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -7,7 +7,7 @@ sub usb_vendor {
|
||||
my $vendor;
|
||||
|
||||
open(IN, "<", "usb.ids");
|
||||
open(OUT, ">", "20-usb-vendor-product.hwdb");
|
||||
open(OUT, ">", "20-usb-vendor-model.hwdb");
|
||||
print(OUT "# This file is part of systemd.\n" .
|
||||
"#\n" .
|
||||
"# Data imported from: http://www.linux-usb.org/usb.ids\n");
|
||||
@ -26,11 +26,11 @@ sub usb_vendor {
|
||||
|
||||
$line =~ m/^\t([0-9a-f]{4})\s*(.+)$/;
|
||||
if (defined $1) {
|
||||
my $product = uc $1;
|
||||
my $model = uc $1;
|
||||
my $text = $2;
|
||||
print(OUT "\n");
|
||||
print(OUT "usb:v" . $vendor . "p" . $product . "*\n");
|
||||
print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
|
||||
print(OUT "usb:v" . $vendor . "p" . $model . "*\n");
|
||||
print(OUT " ID_MODEL_FROM_DATABASE=" . $text . "\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ sub pci_vendor {
|
||||
my $device;
|
||||
|
||||
open(IN, "<", "pci.ids");
|
||||
open(OUT, ">", "20-pci-vendor-product.hwdb");
|
||||
open(OUT, ">", "20-pci-vendor-model.hwdb");
|
||||
print(OUT "# This file is part of systemd.\n" .
|
||||
"#\n" .
|
||||
"# Data imported from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
|
||||
@ -133,7 +133,7 @@ sub pci_vendor {
|
||||
my $text = $2;
|
||||
print(OUT "\n");
|
||||
print(OUT "pci:v0000" . $vendor . "d0000" . $device . "*\n");
|
||||
print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
|
||||
print(OUT " ID_MODEL_FROM_DATABASE=" . $text . "\n");
|
||||
next;
|
||||
}
|
||||
|
||||
@ -144,7 +144,7 @@ sub pci_vendor {
|
||||
my $text = $3;
|
||||
print(OUT "\n");
|
||||
print(OUT "pci:v0000" . $vendor . "d0000" . $device . "sv0000" . $sub_vendor . "sd0000" . $sub_device . "*\n");
|
||||
print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
|
||||
print(OUT " ID_MODEL_FROM_DATABASE=" . $text . "\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user