X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=hwdb%2Fids-update.pl;h=13596b85c31913720c84ca2bc6ddb30dfa0aa643;hp=c96c95fd3bb5cdace24acc0ac00104d79fddcb9c;hb=378cf88f72a9cda84baf703ed24f54c8c539fdcf;hpb=09d8f5d757515122d7b726218e249621e564157c

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index c96c95fd3..13596b85c 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,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");
         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;
@@ -128,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;
@@ -149,8 +148,8 @@ sub pci_vendor {
                 }
         }
 
-        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://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;
@@ -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,61 @@ 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/\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/\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();