diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-06-21 00:45:20 +0000 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-06-21 00:45:20 +0000 |
| commit | 179894d3dc9511c2a6d9d74e0af812e5378b3a42 (patch) | |
| tree | a494717a1602388b3af6f80c1ed2e1959328eeb7 /hardinfo2/arch/linux/common | |
| parent | 9f4da1891acbb7ae581285a9cd55171b10459de1 (diff) | |
Show vendor full name and URL in USB, storage and PCI device info
Diffstat (limited to 'hardinfo2/arch/linux/common')
| -rw-r--r-- | hardinfo2/arch/linux/common/pci.h | 11 | ||||
| -rw-r--r-- | hardinfo2/arch/linux/common/storage.h | 11 | ||||
| -rw-r--r-- | hardinfo2/arch/linux/common/usb.h | 7 |
3 files changed, 28 insertions, 1 deletions
diff --git a/hardinfo2/arch/linux/common/pci.h b/hardinfo2/arch/linux/common/pci.h index f8c9d319..e7c940bb 100644 --- a/hardinfo2/arch/linux/common/pci.h +++ b/hardinfo2/arch/linux/common/pci.h @@ -171,6 +171,17 @@ scan_pci(void) "Bus, device, function=%d, %d, %d\n", name, category, domain, bus, device, function); + + const gchar *url = vendor_get_url(name); + if (url) { + strdevice = g_strdup_printf("%s" + "Vendor=%s (%s)\n", + strdevice, + vendor_get_name(name), + url); + } + + pci_list = g_strdup_printf("%s$PCI%d$%s=%s\n", pci_list, n, category, name); diff --git a/hardinfo2/arch/linux/common/storage.h b/hardinfo2/arch/linux/common/storage.h index 4fb682a9..7321f70e 100644 --- a/hardinfo2/arch/linux/common/storage.h +++ b/hardinfo2/arch/linux/common/storage.h @@ -120,6 +120,7 @@ scan_scsi(void) gchar *strhash = g_strdup_printf("[Device Information]\n" "Model=%s\n" + "Vendor=%s (%s)\n" "Type=%s\n" "Revision=%s\n" "[SCSI Controller]\n" @@ -127,6 +128,8 @@ scan_scsi(void) "Channel=%d\n" "ID=%d\n" "LUN=%d\n", model, + vendor_get_name(model), + vendor_get_url(model), type, revision, scsi_controller, @@ -242,9 +245,15 @@ scan_ide(void) gchar *strhash = g_strdup_printf("[Device Information]\n" "Model=%s\n" + "Vendor=%s (%s)\n" "Device Name=hd%c\n" "Media=%s\n" "Cache=%dkb\n", - model, iface, media, cache); + model, + vendor_get_name(model), + vendor_get_url(model), + iface, + media, + cache); if (pgeometry && lgeometry) strhash = g_strdup_printf("%s[Geometry]\n" "Physical=%s\n" diff --git a/hardinfo2/arch/linux/common/usb.h b/hardinfo2/arch/linux/common/usb.h index a52be2cb..4fd6ee21 100644 --- a/hardinfo2/arch/linux/common/usb.h +++ b/hardinfo2/arch/linux/common/usb.h @@ -100,6 +100,13 @@ scan_usb(void) usb_list = g_strdup_printf("%s$%s$%s=\n", usb_list, tmp, product); + const gchar *url = vendor_get_url(manuf); + if (url) { + gchar *tmp = g_strdup_printf("%s (%s)", manuf, url); + g_free(manuf); + manuf = tmp; + } + gchar *strhash = g_strdup_printf("[Device Information]\n" "Product=%s\n" "Manufacturer=%s\n" |