udev: hwdb - update usb class descriptions

diff --git a/hwdb/20-usb-classes.hwdb b/hwdb/20-usb-classes.hwdb
index 1ab4a84c994881d8cfba763a027575ee2472de24..064cf9b46642b884b4c557fb72729ecb76f74eb7 100644 (file)
--- a/hwdb/20-usb-classes.hwdb
+++ b/hwdb/20-usb-classes.hwdb
@@ -2,9 +2,6 @@
 #
 # Data imported and updated from: http://www.linux-usb.org/usb.ids
 
 #
 # Data imported and updated from: http://www.linux-usb.org/usb.ids
 

-usb:v*p*d*dc00*
- ID_USB_CLASS_FROM_DATABASE=(Defined at Interface level)
-

 usb:v*p*d*dc01*
  ID_USB_CLASS_FROM_DATABASE=Audio
 
 usb:v*p*d*dc01*
  ID_USB_CLASS_FROM_DATABASE=Audio
 


@@ -86,9 +83,6 @@ usb:v*p*d*dc02dsc0Cdp07*
 usb:v*p*d*dc03*
  ID_USB_CLASS_FROM_DATABASE=Human Interface Device
 
 usb:v*p*d*dc03*
  ID_USB_CLASS_FROM_DATABASE=Human Interface Device
 

-usb:v*p*d*dc03dsc00*
- ID_USB_SUBCLASS_FROM_DATABASE=No Subclass
-

 usb:v*p*d*dc03dsc00dp01*
  ID_USB_PROTOCOL_FROM_DATABASE=Keyboard
 
 usb:v*p*d*dc03dsc00dp01*
  ID_USB_PROTOCOL_FROM_DATABASE=Keyboard
 


@@ -248,9 +242,6 @@ usb:v*p*d*dc0D*
 usb:v*p*d*dc0E*
  ID_USB_CLASS_FROM_DATABASE=Video
 
 usb:v*p*d*dc0E*
  ID_USB_CLASS_FROM_DATABASE=Video
 

-usb:v*p*d*dc0Edsc00*
- ID_USB_SUBCLASS_FROM_DATABASE=Undefined
-

 usb:v*p*d*dc0Edsc01*
  ID_USB_SUBCLASS_FROM_DATABASE=Video Control
 
 usb:v*p*d*dc0Edsc01*
  ID_USB_SUBCLASS_FROM_DATABASE=Video Control
 

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 96db87d788c8c54f0e364a8482acead8953f7cc9..c96c95fd3bb5cdace24acc0ac00104d79fddcb9c 100755 (executable)
--- 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;
                 $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;
                         }
                                 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");
                         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;
                 $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;
                         my $text = $2;
                         if ($text =~ m/^(\?|None|Unused)$/) {
                                 next;