[systemd-commits] 2 commits - hwdb/20-pci-vendor-product.hwdb hwdb/ids-update.pl
Kay Sievers
kay at kemper.freedesktop.org
Thu Dec 6 13:46:44 PST 2012
hwdb/20-pci-vendor-product.hwdb | 50 ++++++++++++++++++++--------------------
hwdb/ids-update.pl | 23 ++++++++----------
2 files changed, 36 insertions(+), 37 deletions(-)
New commits:
commit 20155530437b6b564e60b6b8cf1a69f1bad78c37
Author: Kay Sievers <kay at vrfy.org>
Date: Thu Dec 6 22:46:22 2012 +0100
hwdb: update
diff --git a/hwdb/20-pci-vendor-product.hwdb b/hwdb/20-pci-vendor-product.hwdb
index 1d9c1eb..945a697 100644
--- a/hwdb/20-pci-vendor-product.hwdb
+++ b/hwdb/20-pci-vendor-product.hwdb
@@ -37034,12 +37034,6 @@ pci:v000014C1d00000008sv000014C1sd00000009*
pci:v000014C1d00000008sv000014C1sd0000000A*
ID_PRODUCT_FROM_DATABASE=10G-PCIE-8B
-pci:v000014C1d00000008sv000014C1sd0000000B*
- ID_PRODUCT_FROM_DATABASE=10G-PCIE-8B2
-
-pci:v000014C1d00000008sv000014C1sd0000000C*
- ID_PRODUCT_FROM_DATABASE=10G-PCIE2-8B2
-
pci:v000014C1d00008043*
ID_PRODUCT_FROM_DATABASE=Myrinet 2000 Scalable Cluster Interconnect
@@ -43926,61 +43920,67 @@ pci:v000018F7*
ID_VENDOR_FROM_DATABASE=Commtech, Inc.
pci:v000018F7d00000001*
- ID_PRODUCT_FROM_DATABASE=Fastcom ESCC-PCI-335
+ ID_PRODUCT_FROM_DATABASE=ESCC-PCI-335 Serial PCI Adapter [Fastcom]
pci:v000018F7d00000002*
- ID_PRODUCT_FROM_DATABASE=Fastcom 422/4-PCI-335
+ ID_PRODUCT_FROM_DATABASE=422/4-PCI-335 Serial PCI Adapter [Fastcom]
pci:v000018F7d00000003*
- ID_PRODUCT_FROM_DATABASE=Fastcom 232/4-1M-PCI
+ ID_PRODUCT_FROM_DATABASE=232/4-1M-PCI Serial PCI Adapter [Fastcom]
pci:v000018F7d00000004*
- ID_PRODUCT_FROM_DATABASE=Fastcom 422/2-PCI-335
+ ID_PRODUCT_FROM_DATABASE=422/2-PCI-335 Serial PCI Adapter [Fastcom]
pci:v000018F7d00000005*
- ID_PRODUCT_FROM_DATABASE=Fastcom IGESCC-PCI-ISO/1
+ ID_PRODUCT_FROM_DATABASE=IGESCC-PCI-ISO/1 Serial PCI Adapter [Fastcom]
pci:v000018F7d0000000A*
- ID_PRODUCT_FROM_DATABASE=Fastcom 232/4-PCI-335
+ ID_PRODUCT_FROM_DATABASE=232/4-PCI-335 Serial PCI Adapter [Fastcom]
pci:v000018F7d0000000B*
- ID_PRODUCT_FROM_DATABASE=Fastcom 232/8-PCI-335 Async 8-Port RS-232 Serial PCI Adapter
+ ID_PRODUCT_FROM_DATABASE=232/8-PCI-335 Serial PCI Adapter [Fastcom]
pci:v000018F7d0000000F*
- ID_PRODUCT_FROM_DATABASE=Fastcom FSCC
+ ID_PRODUCT_FROM_DATABASE=FSCC Serial PCI Adapter [Fastcom]
pci:v000018F7d00000010*
- ID_PRODUCT_FROM_DATABASE=Fastcom GSCC
+ ID_PRODUCT_FROM_DATABASE=GSCC Serial PCI Adapter [Fastcom]
pci:v000018F7d00000011*
- ID_PRODUCT_FROM_DATABASE=Fastcom QSSB
+ ID_PRODUCT_FROM_DATABASE=QSSB Serial PCI Adapter [Fastcom]
pci:v000018F7d00000014*
- ID_PRODUCT_FROM_DATABASE=SuperFSCC
+ ID_PRODUCT_FROM_DATABASE=SuperFSCC Serial PCI Adapter [Fastcom]
pci:v000018F7d00000015*
- ID_PRODUCT_FROM_DATABASE=SuperFSCC-104
+ ID_PRODUCT_FROM_DATABASE=SuperFSCC-104 Serial PCI/104+ Adapter [Fastcom]
pci:v000018F7d00000016*
- ID_PRODUCT_FROM_DATABASE=Fastcom FSCC-232 Sync/Async 2-Port RS-232 Serial PCI Adapter (F-Core)
+ ID_PRODUCT_FROM_DATABASE=FSCC-232 RS-232 Serial PCI Adapter [Fastcom]
pci:v000018F7d00000017*
- ID_PRODUCT_FROM_DATABASE=SuperFSCC-104-NOUART
+ ID_PRODUCT_FROM_DATABASE=SuperFSCC-104-NOUART Serial PCI/104+ Adapter [Fastcom]
pci:v000018F7d00000018*
- ID_PRODUCT_FROM_DATABASE=Fastcom SuperFSCC/4 Sync/Async 4-Port RS-422 Serial PCI Adapter with DMA (F-Core)
+ ID_PRODUCT_FROM_DATABASE=SuperFSCC/4 Serial PCI Adapter [Fastcom]
pci:v000018F7d00000019*
- ID_PRODUCT_FROM_DATABASE=SuperFSCC with soft UARTs
+ ID_PRODUCT_FROM_DATABASE=SuperFSCC Serial PCI Adapter [Fastcom]
pci:v000018F7d0000001A*
- ID_PRODUCT_FROM_DATABASE=Fastcom SuperFSCC-104-LVDS Sync/Async 2-Port RS-644 Serial PC/104+ Adapter with DMA (F-Core)
+ ID_PRODUCT_FROM_DATABASE=SuperFSCC-104-LVDS Serial PC/104+ Adapter [Fastcom]
pci:v000018F7d0000001B*
- ID_PRODUCT_FROM_DATABASE=Fastcom FSCC/4 Sync/Async 4-Port RS-422 Serial PCI Adapter (F-Core)
+ ID_PRODUCT_FROM_DATABASE=FSCC/4 Serial PCI Adapter [Fastcom]
pci:v000018F7d0000001C*
- ID_PRODUCT_FROM_DATABASE=Fastcom SuperFSCC/4-LVDSSync/Async 4-Port RS-644 Serial PCI Adapter with DMA (F-Core)
+ ID_PRODUCT_FROM_DATABASE=SuperFSCC/4-LVDS Serial PCI Adapter [Fastcom]
+
+pci:v000018F7d00000020*
+ ID_PRODUCT_FROM_DATABASE=422/4-PCIe Serial PCIe Adapter [Fastcom]
+
+pci:v000018F7d00000021*
+ ID_PRODUCT_FROM_DATABASE=422/8-PCIe Serial PCIe Adapter [Fastcom]
pci:v000018FB*
ID_VENDOR_FROM_DATABASE=Resilience Corporation
commit f9cd22249dbdcebe2ab54eea56c0b32e2a1c2ce5
Author: Mantas MikulÄ—nas <grawity at gmail.com>
Date: Thu Dec 6 23:34:25 2012 +0200
hwdb: ids-update: close the right file handles
The script was closing *INP and *OUTP, which never actually existed.
Also fix pci_vendor() opening usb.ids and immediately discarding the fh.
diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 869c49b..9ab754c 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -34,8 +34,8 @@ sub usb_vendor {
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ close(OUT);
}
sub usb_classes {
@@ -100,15 +100,14 @@ sub usb_classes {
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ close(OUT);
}
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" .
@@ -149,8 +148,8 @@ sub pci_vendor {
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ close(OUT);
}
sub pci_classes {
@@ -203,8 +202,8 @@ sub pci_classes {
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ close(OUT);
}
sub oui {
@@ -237,7 +236,7 @@ sub oui {
print(OUT " ID_OUI_FROM_DATABASE=" . $text . "\n");
}
}
- close(INP);
+ close(IN);
open(IN, "<", "oui.txt");
while (my $line = <IN>) {
@@ -255,8 +254,8 @@ sub oui {
}
}
}
- close(INP);
- close(OUTP);
+ close(IN);
+ close(OUT);
}
usb_vendor();
More information about the systemd-commits
mailing list