Update vendor table, include vendor information in input devices

2 files changed, 27 insertions, 9 deletions

diff --git a/hardinfo2/arch/linux/common/inputdevices.h b/hardinfo2/arch/linux/common/inputdevices.h
index 44a109ca..a3fb3e4a 100644
--- a/hardinfo2/arch/linux/common/inputdevices.h
+++ b/hardinfo2/arch/linux/common/inputdevices.h
@@ -103,14 +103,30 @@ scan_inputdevices(void)
 	    gchar *strhash = g_strdup_printf("[Device Information]\n"
 					     "Name=%s\n"
 					     "Type=%s\n"
-					     "Bus=0x%x\n"
-					     "Vendor=0x%x\n"
-					     "Product=0x%x\n"
-					     "Version=0x%x\n"
-					     "Connected to=%s\n",
-					     name, input_devices[d].name,
-					     bus, vendor, product,
-					     version, phys);
+					     "Bus=0x%x\n",
+					     name,
+					     input_devices[d].name,
+					     bus);
+
+	    const gchar *url = vendor_get_url(name);
+	    if (url) {
+	    	strhash = g_strdup_printf("%s"
+					  "Vendor=%s (%s)\n",
+					  strhash,
+					  vendor_get_name(name),
+					  url);
+	    } else {
+	    	strhash = g_strdup_printf("%s"
+					  "Vendor=%x\n",
+					  strhash,
+					  vendor);
+	    }
+
+	    strhash = g_strdup_printf("%s"
+				      "Product=0x%x\n"
+				      "Version=0x%x\n"
+				      "Connected to=%s\n",
+				      strhash, product, version, phys);
 	    g_hash_table_insert(devices, tmp, strhash);
 
 	    g_free(phys);
diff --git a/hardinfo2/vendor.c b/hardinfo2/vendor.c
index 82d40b58..c534d1ff 100644
--- a/hardinfo2/vendor.c
+++ b/hardinfo2/vendor.c
@@ -39,7 +39,7 @@ static const Vendor vendors[] = {
     { "TOSHIBA",		"TOSHIBA",		"www.toshiba.com" },
     { "LITE-ON",		"LITE-ON",		"www.liteonit.com" },
     { "WDC",			"Western Digital",	"www.wdc.com" },
-    { "GSA",			"LG Electronics",	"www.lge.com" },
+    { "HL-DT-ST",		"LG Electronics",	"www.lge.com" },
     { "ST",			"SEAGATE",		"www.seagate.com" },
     { "Lexmark",		"Lexmark",		"www.lexmark.com" },
     { "_NEC",			"NEC Corporation",	"www.nec.com" },
@@ -52,6 +52,8 @@ static const Vendor vendors[] = {
     { "Broadcom",		"Broadcom Corp.",	"www.broadcom.com" },
     { "Apple",			"Apple Computer, Inc.",	"www.apple.com" },
     { "IBM",			"IBM Corp.",		"www.ibm.com" },
+    { "Dell",			"Dell Computer Corp.",	"www.dell.com" },
+    { "Logitech",		"Logitech International SA", "www.logitech.com" },
     { NULL,			NULL,			NULL },
 };