chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unicode: treat cute symbol block as fullwidth
[elogind.git]
/
hwdb
/
ids-update.pl
diff --git
a/hwdb/ids-update.pl
b/hwdb/ids-update.pl
index 13596b85c31913720c84ca2bc6ddb30dfa0aa643..37d3556382f4b4e1e1c543e23af339520413dfa3 100755
(executable)
--- a/
hwdb/ids-update.pl
+++ b/
hwdb/ids-update.pl
@@
-7,7
+7,7
@@
sub usb_vendor {
my $vendor;
open(IN, "<", "usb.ids");
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");
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) {
$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");
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");
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");
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");
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;
}
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");
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");
}
}
}
}
@@
-219,6
+219,7
@@
sub oui {
open(IN, "<", "iab.txt");
while (my $line = <IN>) {
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) {
$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
+242,7
@@
sub oui {
open(IN, "<", "oui.txt");
while (my $line = <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) {
$line =~ s/\s+$//;
$line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.+)$/;
if (defined $1) {