X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=hwdb%2Fids-update.pl;h=5782bb51ef6a6fcf7b5569037b966780e0e1b240;hp=96db87d788c8c54f0e364a8482acead8953f7cc9;hb=c170f3a41bc69ad1eab2dba40cede865f2532bbc;hpb=8db6dcfd3c3d19d35767f04884a99368f6c64b36

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 96db87d78..5782bb51e 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -10,11 +10,11 @@ sub usb_vendor {
         open(OUT, ">", "20-usb-vendor-product.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,7 +24,7 @@ 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 $text = $2;
@@ -34,8 +34,8 @@ sub usb_vendor {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub usb_classes {
@@ -47,18 +47,18 @@ 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;
-                        my $text = $2;
-                        if ($text =~ m/^(\?|None|Unused)$/) {
+                        if ($class =~ m/^00$/) {
                                 next;
                         }
+                        my $text = $2;
                         print(OUT "\n");
                         print(OUT "usb:v*p*d*dc" . $class . "*\n");
                         print(OUT " ID_USB_CLASS_FROM_DATABASE=" . $text . "\n");
@@ -71,9 +71,12 @@ 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$/) {
+                                next;
+                        }
                         my $text = $2;
                         if ($text =~ m/^(\?|None|Unused)$/) {
                                 next;
@@ -84,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;
@@ -97,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");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://pciids.sourceforge.net/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;
@@ -125,7 +127,7 @@ 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;
@@ -146,8 +148,8 @@ sub pci_vendor {
                 }
         }
 
-        close(INP);
-        close(OUTP);
+        close(IN);
+        close(OUT);
 }
 
 sub pci_classes {
@@ -159,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://pciids.sourceforge.net/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;
@@ -180,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;
@@ -190,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;
@@ -200,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);
 
-        close(INP);
-        close(OUTP);
+        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;
+
+                        # 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();