From e05f8494126c999ae6227195442126cbb7d630c5 Mon Sep 17 00:00:00 2001
From: hasufell <julian.ospald@googlemail.com>
Date: Wed, 30 May 2012 01:52:10 +0200
Subject: Split x86 and x86_64 arches

lib suffix in hardinfo/binreloc.c is already supported
and will be respected now
---
 modules/devices.c      | 12 ++++++------
 modules/devices/x86_64 |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 120000 modules/devices/x86_64

(limited to 'modules')

diff --git a/modules/devices.c b/modules/devices.c
index 5f1e61d5..6c6343d5 100644
--- a/modules/devices.c
+++ b/modules/devices.c
@@ -47,7 +47,7 @@ gchar *callback_printers();
 gchar *callback_storage();
 gchar *callback_input();
 gchar *callback_usb();
-#if defined(ARCH_x86)
+#if defined(ARCH_x86) || defined(ARCH_x86_64)
 gchar *callback_dmi();
 gchar *callback_spd();
 #endif
@@ -62,7 +62,7 @@ void scan_printers(gboolean reload);
 void scan_storage(gboolean reload);
 void scan_input(gboolean reload);
 void scan_usb(gboolean reload);
-#if defined(ARCH_x86)
+#if defined(ARCH_x86) || defined(ARCH_x86_64)
 void scan_dmi(gboolean reload);
 void scan_spd(gboolean reload);
 #endif
@@ -80,7 +80,7 @@ static ModuleEntry entries[] = {
     {"Sensors", "therm.png", callback_sensors, scan_sensors, MODULE_FLAG_NONE},
     {"Input Devices", "inputdevices.png", callback_input, scan_input, MODULE_FLAG_NONE},
     {"Storage", "hdd.png", callback_storage, scan_storage, MODULE_FLAG_NONE},
-#if defined(ARCH_x86)
+#if defined(ARCH_x86) || defined(ARCH_x86_64)
     {"DMI", "computer.png", callback_dmi, scan_dmi, MODULE_FLAG_NONE},
     {"Memory SPD", "memory.png", callback_spd, scan_spd, MODULE_FLAG_NONE},
 #endif	/* x86 or x86_64 */
@@ -235,7 +235,7 @@ gchar *hi_get_field(gchar * field)
     return g_strdup(field);
 }
 
-#if defined(ARCH_x86)
+#if defined(ARCH_x86) || defined(ARCH_x86_64)
 void scan_dmi(gboolean reload)
 {
     SCAN_START();
@@ -324,7 +324,7 @@ gchar *callback_processors()
     return processor_get_info(processors);
 }
 
-#if defined(ARCH_x86)
+#if defined(ARCH_x86) || defined(ARCH_x86_64)
 gchar *callback_dmi()
 {
     return g_strdup(dmi_info);
@@ -430,7 +430,7 @@ void hi_module_init(void)
         sync_manager_add_entry(&se);
     }
 
-#if defined(ARCH_x86)
+#if defined(ARCH_x86) || defined(ARCH_x86_64)
     {
       static SyncEntry se = {
         .fancy_name = "Update CPU feature database",
diff --git a/modules/devices/x86_64 b/modules/devices/x86_64
new file mode 120000
index 00000000..de1ff735
--- /dev/null
+++ b/modules/devices/x86_64
@@ -0,0 +1 @@
+./x86
\ No newline at end of file
-- 
cgit v1.2.3