mirror of
https://github.com/systemd/systemd.git
synced 2025-03-28 02:50:16 +03:00
hwdb: update
This commit is contained in:
parent
1aa28c9521
commit
fd5a461316
@ -6056,10 +6056,11 @@ dist: dist-check-python dist-check-compat-libs
|
||||
.PHONY: hwdb-update
|
||||
hwdb-update:
|
||||
( cd $(top_srcdir)/hwdb && \
|
||||
wget -N http://www.linux-usb.org/usb.ids \
|
||||
http://pci-ids.ucw.cz/v2.2/pci.ids \
|
||||
http://standards.ieee.org/develop/regauth/oui/oui.txt \
|
||||
http://standards.ieee.org/develop/regauth/iab/iab.txt && \
|
||||
wget -O usb.ids 'http://www.linux-usb.org/usb.ids' && \
|
||||
wget -O pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' && \
|
||||
wget -O ma-large.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-L&format=txt' && \
|
||||
wget -O ma-medium.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-M&format=txt' && \
|
||||
wget -O ma-small.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-S&format=txt' && \
|
||||
./ids-update.pl )
|
||||
|
||||
.PHONY: built-sources
|
||||
|
5
hwdb/.gitignore
vendored
5
hwdb/.gitignore
vendored
@ -1,4 +1,5 @@
|
||||
/pci.ids
|
||||
/usb.ids
|
||||
/oui.txt
|
||||
/iab.txt
|
||||
/ma-large.txt
|
||||
/ma-medium.txt
|
||||
/ma-small.txt
|
||||
|
140094
hwdb/20-OUI.hwdb
140094
hwdb/20-OUI.hwdb
File diff suppressed because it is too large
Load Diff
@ -50804,6 +50804,33 @@ usb:v2237*
|
||||
usb:v2237p4161*
|
||||
ID_MODEL_FROM_DATABASE=eReader White
|
||||
|
||||
usb:v225D*
|
||||
ID_VENDOR_FROM_DATABASE=Morpho
|
||||
|
||||
usb:v225Dp0001*
|
||||
ID_MODEL_FROM_DATABASE=FINGER VP Multimodal Biometric Sensor
|
||||
|
||||
usb:v225Dp0008*
|
||||
ID_MODEL_FROM_DATABASE=CBM-E3 Fingerprint Sensor
|
||||
|
||||
usb:v225Dp0009*
|
||||
ID_MODEL_FROM_DATABASE=CBM Fingerprint Sensor [CBM-V3]
|
||||
|
||||
usb:v225Dp000A*
|
||||
ID_MODEL_FROM_DATABASE=MSO1300-E3 Fingerprint Sensor
|
||||
|
||||
usb:v225Dp000B*
|
||||
ID_MODEL_FROM_DATABASE=MSO1300 Fingerprint Sensor [MSO1300-V3]
|
||||
|
||||
usb:v225Dp000C*
|
||||
ID_MODEL_FROM_DATABASE=MSO1350-E3 Fingerprint Sensor & SmartCard Reader
|
||||
|
||||
usb:v225Dp000D*
|
||||
ID_MODEL_FROM_DATABASE=MSO1350 Fingerprint Sensor & SmartCard Reader [MSO1350-V3]
|
||||
|
||||
usb:v225Dp000E*
|
||||
ID_MODEL_FROM_DATABASE=MorphoAccess SIGMA Biometric Access Control Terminal
|
||||
|
||||
usb:v228D*
|
||||
ID_VENDOR_FROM_DATABASE=8D Technologies inc.
|
||||
|
||||
|
@ -276,25 +276,30 @@ sub sdio_classes {
|
||||
close(OUT);
|
||||
}
|
||||
|
||||
# MAC Address Block Large/Medium/Small
|
||||
# Large MA-L 24/24 bit (OUI)
|
||||
# Medium MA-M 28/20 bit (OUI prefix owned by IEEE)
|
||||
# Small MA-S 36/12 bit (OUI prefix owned by IEEE)
|
||||
sub oui {
|
||||
my $iab_prefix;
|
||||
my %iab_prefixes = ();
|
||||
my $prefix;
|
||||
my %ieee_prefixes = ();
|
||||
|
||||
open(OUT, ">", "20-OUI.hwdb");
|
||||
print(OUT "# This file is part of systemd.\n" .
|
||||
"#\n" .
|
||||
"# Data imported from:\n" .
|
||||
"# http://standards.ieee.org/develop/regauth/oui/oui.txt\n" .
|
||||
"# http://standards.ieee.org/develop/regauth/iab/iab.txt\n");
|
||||
"# https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-L&format=txt\n" .
|
||||
"# https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-M&format=txt\n" .
|
||||
"# https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-S&format=txt\n");
|
||||
|
||||
open(IN, "<", "iab.txt");
|
||||
open(IN, "<", "ma-small.txt");
|
||||
while (my $line = <IN>) {
|
||||
$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) {
|
||||
$iab_prefix = $1 . $2 . $3;
|
||||
$iab_prefixes{ $iab_prefix } = 1;
|
||||
$prefix = $1 . $2 . $3;
|
||||
$ieee_prefixes{ $prefix } = 1;
|
||||
next;
|
||||
}
|
||||
|
||||
@ -304,13 +309,35 @@ sub oui {
|
||||
my $text = $2;
|
||||
|
||||
print(OUT "\n");
|
||||
print(OUT "OUI:" . $iab_prefix . $vendor . "*\n");
|
||||
print(OUT "OUI:" . $prefix . $vendor . "*\n");
|
||||
print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
|
||||
}
|
||||
}
|
||||
close(IN);
|
||||
|
||||
open(IN, "<", "oui.txt");
|
||||
open(IN, "<", "ma-medium.txt");
|
||||
while (my $line = <IN>) {
|
||||
$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) {
|
||||
$prefix = $1 . $2 . $3;
|
||||
$ieee_prefixes{ $prefix } = 1;
|
||||
next;
|
||||
}
|
||||
|
||||
$line =~ m/^([0-9A-F])00000-\g1FFFFF\s*\(base 16\)\s*(.+)$/;
|
||||
if (defined $1) {
|
||||
my $vendor = uc $1;
|
||||
my $text = $2;
|
||||
|
||||
print(OUT "\n");
|
||||
print(OUT "OUI:" . $prefix . $vendor . "*\n");
|
||||
print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
|
||||
}
|
||||
}
|
||||
|
||||
open(IN, "<", "ma-large.txt");
|
||||
while (my $line = <IN>) {
|
||||
$line =~ s/^ +//;
|
||||
$line =~ s/\s+$//;
|
||||
@ -319,8 +346,12 @@ sub oui {
|
||||
my $vendor = uc $1;
|
||||
my $text = $2;
|
||||
|
||||
# skip the IAB prefixes
|
||||
if (! exists $iab_prefixes{ $vendor }) {
|
||||
if ($text =~ m/^IEEE REGISTRATION AUTHORITY/) {
|
||||
next;
|
||||
}
|
||||
|
||||
# skip the IEEE owned prefixes
|
||||
if (! exists $ieee_prefixes{ $vendor }) {
|
||||
print(OUT "\n");
|
||||
print(OUT "OUI:" . $vendor . "*\n");
|
||||
print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
|
||||
@ -328,6 +359,7 @@ sub oui {
|
||||
}
|
||||
}
|
||||
close(IN);
|
||||
|
||||
close(OUT);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user