X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=hwdb%2Fids-update.pl;h=d51f2208f7a32d026a01c6ec3a7f91132325ec0f;hp=b23224a91cc818d6b86d0184af45ece0cb2e7599;hb=cf7ebcea78223b95b2676b97e1d2aad16caa3c86;hpb=a660c63c551b88136ac6176855b5907cc533e848

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index b23224a91..d51f2208f 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -3,98 +3,166 @@
 use strict;
 use warnings;
 
-my $vendor;
-
-open(IN, "<", "usb.ids");
-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");
-
-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 "usb:v" . $vendor . "*\n");
-                print(OUT " ID_VENDOR_FROM_DATABASE=" . $text . "\n");
-                next;
-        }
-
-        $line =~ m/^\t([0-9a-f]{4})\s*(.*)$/;
-        if (defined $1) {
-                my $product = uc $1;
-                my $text = $2;
-                print(OUT "\n");
-                print(OUT "usb:v" . $vendor . "p" . $product . "*\n");
-                print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
-        }
+sub usb_vendor {
+	my $vendor;
+
+	open(IN, "<", "usb.ids");
+	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");
+
+	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 "usb:v" . $vendor . "*\n");
+	                print(OUT " ID_VENDOR_FROM_DATABASE=" . $text . "\n");
+	                next;
+	        }
+
+	        $line =~ m/^\t([0-9a-f]{4})\s*(.*)$/;
+	        if (defined $1) {
+	                my $product = uc $1;
+	                my $text = $2;
+	                print(OUT "\n");
+	                print(OUT "usb:v" . $vendor . "p" . $product . "*\n");
+	                print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
+	        }
+	}
+
+	close(INP);
+	close(OUTP);
+}
+
+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");
+
+	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 "pci:v0000" . $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 "pci:v0000" . $vendor . "d0000" . $device . "*\n");
+	                print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
+	                next;
+	        }
+
+	        $line =~ m/^\t\t([0-9a-f]{4})\s*([0-9a-f]{4})\s*(.*)$/;
+	        if (defined $1) {
+	                my $sub_vendor = uc $1;
+	                my $sub_device = uc $2;
+	                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");
+	        }
+	}
+
+	close(INP);
+	close(OUTP);
 }
-close(INP);
-close(OUTP);
-
-
-my $device;
-
-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");
-
-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 "pci:v0000" . $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 "pci:v0000" . $vendor . "d0000" . $device . "*\n");
-                print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
-                next;
-        }
-
-        $line =~ m/^\t\t([0-9a-f]{4})\s*([0-9a-f]{4})\s*(.*)$/;
-        if (defined $1) {
-                my $sub_vendor = uc $1;
-                my $sub_device = uc $2;
-                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");
-        }
+
+sub pci_classes {
+	my $class;
+	my $subclass;
+	my $interface;
+
+	open(IN, "<", "pci.ids");
+	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");
+
+	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 "pci:v*d*sv*sd*bc" . $class . "*\n");
+	                print(OUT " ID_PCI_CLASS_FROM_DATABASE=" . $text . "\n");
+	                next;
+	        }
+
+	        if (not defined $class) {
+	                next;
+	        }
+
+	        $line =~ m/^\t([0-9a-f]{2})\s*(.*)$/;
+	        if (defined $1) {
+	                $subclass = uc $1;
+	                my $text = $2;
+	                print(OUT "\n");
+	                print(OUT "pci:v*d*sv*sd*bc" . $class . "sc" . $subclass . "*\n");
+	                print(OUT " ID_PCI_SUBCLASS_FROM_DATABASE=" . $text . "\n");
+	                next;
+	        }
+
+	        $line =~ m/^\t\t([0-9a-f]{2})\s*(.*)$/;
+	        if (defined $1) {
+	                $interface = uc $1;
+	                my $text = $2;
+	                print(OUT "\n");
+	                print(OUT "pci:v*d*sv*sd*bc" .  $class . "sc" . $subclass . "i" . $interface . "*\n");
+	                print(OUT " ID_PCI_INTERFACE_FROM_DATABASE=" . $text . "\n");
+	        }
+	}
+
+	close(INP);
+	close(OUTP);
 }
-close(INP);
-close(OUTP);
-
-open(IN, "<", "oui.txt");
-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");
-
-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;
-                print(OUT "\n");
-                print(OUT "OUI:" . $vendor . "\n");
-                print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
-        }
+
+sub oui {
+	open(IN, "<", "oui.txt");
+	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");
+
+	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;
+	                print(OUT "\n");
+	                print(OUT "OUI:" . $vendor . "\n");
+	                print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
+	        }
+	}
+
+	close(INP);
+	close(OUTP);
 }
-close(INP);
-close(OUTP);
+
+usb_vendor();
+pci_vendor();
+pci_classes();
+oui();