X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=hwdb%2Fids-update.pl;h=b21a3d8f5939d47a8b5ba7cc89f80a71081afa5c;hb=43f9cc65c2caa679019c3cfbd1aff66c6c59d410;hp=96db87d788c8c54f0e364a8482acead8953f7cc9;hpb=8db6dcfd3c3d19d35767f04884a99368f6c64b36;p=elogind.git

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 96db87d78..b21a3d8f5 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -55,10 +55,10 @@ sub usb_classes {
                 $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");
@@ -74,6 +74,9 @@ sub usb_classes {
                 $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;
@@ -110,7 +113,7 @@ sub pci_vendor {
         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 and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -159,7 +162,7 @@ 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 and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;