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

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 13596b85c..b72c41571 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -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");
                 }
         }
 
@@ -206,6 +206,73 @@ sub pci_classes {
         close(OUT);
 }
 
+sub sdio_vendor {
+        my $vendor;
+        my $device;
+
+        open(IN, "<", "sdio.ids");
+        open(OUT, ">", "20-sdio-vendor-model.hwdb");
+        print(OUT "# This file is part of systemd.\n" .
+                  "#\n" .
+                  "# Data imported from: hwdb/sdio.ids\n");
+
+        while (my $line = <IN>) {
+                $line =~ s/\s+$//;
+                $line =~ m/^([0-9a-f]{4})\s*(.+)$/;
+
+                if (defined $1) {
+                        $vendor = uc $1;
+                        my $text = $2;
+                        print(OUT "\n");
+                        print(OUT "sdio:c*v" . $vendor . "*\n");
+                        print(OUT " ID_VENDOR_FROM_DATABASE=" . $text . "\n");
+                        next;
+                }
+
+                $line =~ m/^\t([0-9a-f]{4})\s*(.+)$/;
+                if (defined $1) {
+                        $device = uc $1;
+                        my $text = $2;
+                        print(OUT "\n");
+                        print(OUT "sdio:c*v" . $vendor . "d" . $device . "*\n");
+                        print(OUT " ID_MODEL_FROM_DATABASE=" . $text . "\n");
+                        next;
+                }
+        }
+
+        close(IN);
+        close(OUT);
+}
+
+sub sdio_classes {
+        my $class;
+        my $subclass;
+        my $interface;
+
+        open(IN, "<", "sdio.ids");
+        open(OUT, ">", "20-sdio-classes.hwdb");
+        print(OUT "# This file is part of systemd.\n" .
+                  "#\n" .
+                  "# Data imported from: hwdb/sdio.ids\n");
+
+        while (my $line = <IN>) {
+                $line =~ s/\s+$//;
+
+                $line =~ m/^C\ ([0-9a-f]{2})\s*(.+)$/;
+                if (defined $1) {
+                        $class = uc $1;
+                        my $text = $2;
+                        print(OUT "\n");
+                        print(OUT "sdio:c" . $class . "v*d*\n");
+                        print(OUT " ID_SDIO_CLASS_FROM_DATABASE=" . $text . "\n");
+                        next;
+                }
+        }
+
+        close(IN);
+        close(OUT);
+}
+
 sub oui {
         my $iab_prefix;
         my %iab_prefixes = ();
@@ -219,6 +286,7 @@ sub oui {
 
         open(IN, "<", "iab.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) {
@@ -241,6 +309,7 @@ sub oui {
 
         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) {
@@ -265,4 +334,7 @@ usb_classes();
 pci_vendor();
 pci_classes();
 
+sdio_vendor();
+sdio_classes();
+
 oui();