diff options
Diffstat (limited to 'hwdb/ids-update.pl')
| -rwxr-xr-x | hwdb/ids-update.pl | 103 |
1 files changed, 67 insertions, 36 deletions
diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl index b21a3d8f59..37d3556382 100755 --- a/hwdb/ids-update.pl +++ b/hwdb/ids-update.pl @@ -7,14 +7,14 @@ 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 and updated from: http://www.linux-usb.org/usb.ids\n"); + "# Data imported from: http://www.linux-usb.org/usb.ids\n"); while (my $line = <IN>) { $line =~ s/\s+$//; - $line =~ m/^([0-9a-f]{4})\s*(.*)$/; + $line =~ m/^([0-9a-f]{4})\s*(.+)$/; if (defined $1) { $vendor = uc $1; my $text = $2; @@ -24,18 +24,18 @@ sub usb_vendor { next; } - $line =~ m/^\t([0-9a-f]{4})\s*(.*)$/; + $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"); } } - close(INP); - close(OUTP); + close(IN); + close(OUT); } sub usb_classes { @@ -47,12 +47,12 @@ sub usb_classes { open(OUT, ">", "20-usb-classes.hwdb"); print(OUT "# This file is part of systemd.\n" . "#\n" . - "# Data imported and updated from: http://www.linux-usb.org/usb.ids\n"); + "# Data imported from: http://www.linux-usb.org/usb.ids\n"); while (my $line = <IN>) { $line =~ s/\s+$//; - $line =~ m/^C\ ([0-9a-f]{2})\s*(.*)$/; + $line =~ m/^C\ ([0-9a-f]{2})\s*(.+)$/; if (defined $1) { $class = uc $1; if ($class =~ m/^00$/) { @@ -71,7 +71,7 @@ sub usb_classes { last; } - $line =~ m/^\t([0-9a-f]{2})\s*(.*)$/; + $line =~ m/^\t([0-9a-f]{2})\s*(.+)$/; if (defined $1) { $subclass = uc $1; if ($subclass =~ m/^00$/) { @@ -87,7 +87,7 @@ sub usb_classes { next; } - $line =~ m/^\t\t([0-9a-f]{2})\s*(.*)$/; + $line =~ m/^\t\t([0-9a-f]{2})\s*(.+)$/; if (defined $1) { $protocol = uc $1; my $text = $2; @@ -100,24 +100,23 @@ sub usb_classes { } } - close(INP); - close(OUTP); + close(IN); + close(OUT); } sub pci_vendor { my $vendor; my $device; - open(IN, "<", "usb.ids"); 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 and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n"); + "# Data imported from: http://pci-ids.ucw.cz/v2.2/pci.ids\n"); while (my $line = <IN>) { $line =~ s/\s+$//; - $line =~ m/^([0-9a-f]{4})\s*(.*)$/; + $line =~ m/^([0-9a-f]{4})\s*(.+)$/; if (defined $1) { $vendor = uc $1; @@ -128,13 +127,13 @@ sub pci_vendor { next; } - $line =~ m/^\t([0-9a-f]{4})\s*(.*)$/; + $line =~ m/^\t([0-9a-f]{4})\s*(.+)$/; if (defined $1) { $device = uc $1; 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; } @@ -145,12 +144,12 @@ 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"); } } - close(INP); - close(OUTP); + close(IN); + close(OUT); } sub pci_classes { @@ -162,12 +161,12 @@ sub pci_classes { open(OUT, ">", "20-pci-classes.hwdb"); print(OUT "# This file is part of systemd.\n" . "#\n" . - "# Data imported and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n"); + "# Data imported from: http://pci-ids.ucw.cz/v2.2/pci.ids\n"); while (my $line = <IN>) { $line =~ s/\s+$//; - $line =~ m/^C\ ([0-9a-f]{2})\s*(.*)$/; + $line =~ m/^C\ ([0-9a-f]{2})\s*(.+)$/; if (defined $1) { $class = uc $1; my $text = $2; @@ -183,7 +182,7 @@ sub pci_classes { last; } - $line =~ m/^\t([0-9a-f]{2})\s*(.*)$/; + $line =~ m/^\t([0-9a-f]{2})\s*(.+)$/; if (defined $1) { $subclass = uc $1; my $text = $2; @@ -193,7 +192,7 @@ sub pci_classes { next; } - $line =~ m/^\t\t([0-9a-f]{2})\s*(.*)$/; + $line =~ m/^\t\t([0-9a-f]{2})\s*(.+)$/; if (defined $1) { $interface = uc $1; my $text = $2; @@ -203,31 +202,63 @@ sub pci_classes { } } - close(INP); - close(OUTP); + close(IN); + close(OUT); } sub oui { - open(IN, "<", "oui.txt"); + my $iab_prefix; + my %iab_prefixes = (); + open(OUT, ">", "20-OUI.hwdb"); print(OUT "# This file is part of systemd.\n" . "#\n" . - "# Data imported and updated from: http://standards.ieee.org/develop/regauth/oui/oui.txt\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"); + open(IN, "<", "iab.txt"); while (my $line = <IN>) { + $line =~ s/^ +//; $line =~ s/\s+$//; - $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\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; + next; + } + + $line =~ m/^([0-9A-F]{3})000-\g1FFF\s*\(base 16\)\s*(.+)$/; if (defined $1) { my $vendor = uc $1; my $text = $2; + print(OUT "\n"); - print(OUT "OUI:" . $vendor . "\n"); + print(OUT "OUI:" . $iab_prefix . $vendor . "*\n"); print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n"); } } + close(IN); + + open(IN, "<", "oui.txt"); + while (my $line = <IN>) { + $line =~ s/^ +//; + $line =~ s/\s+$//; + $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.+)$/; + if (defined $1) { + my $vendor = uc $1; + my $text = $2; - close(INP); - close(OUTP); + # skip the IAB prefixes + if (! exists $iab_prefixes{ $vendor }) { + print(OUT "\n"); + print(OUT "OUI:" . $vendor . "*\n"); + print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n"); + } + } + } + close(IN); + close(OUT); } usb_vendor(); |