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 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;
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 $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");
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ close(OUT);
}
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;
- 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");
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$/) {
+ next;
+ }
my $text = $2;
if ($text =~ m/^(\?|None|Unused)$/) {
next;
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;
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ close(OUT);
}
sub pci_vendor {
my $vendor;
my $device;
+ my $device_text;
- open(IN, "<", "usb.ids");
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 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;
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;
+ $device_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=" . $device_text . "\n");
next;
}
if (defined $1) {
my $sub_vendor = uc $1;
my $sub_device = uc $2;
- my $text = $3;
+ my $sub_text = $3;
+ $sub_text =~ s/^\Q$device_text\E\s*//;
+ $sub_text =~ s/(.+)/\ ($1)/;
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=" . $device_text . $sub_text . "\n");
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ close(OUT);
}
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;
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;
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;
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ 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 {
- 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/^ +//;
$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/^ +//;
+ $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();
pci_vendor();
pci_classes();
+sdio_vendor();
+sdio_classes();
+
oui();