Changeset 2423

Timestamp:

04/07/04 20:36:19 (5 years ago)

Author:

khali

Message:

Move IBM detection into dmi_scan.c.

Delete dmi_scan.h, now useless.

Files:

• lm-sensors/trunk/kernel/busses/dmi_scan.c (modified) (4 diffs)
• lm-sensors/trunk/kernel/busses/dmi_scan.h (deleted)
• lm-sensors/trunk/kernel/busses/i2c-piix4.c (modified) (2 diffs)
• lm-sensors/trunk/mkpatch/FILES (modified) (1 diff)
• lm-sensors/trunk/mkpatch/INCLUDES (modified) (1 diff)

lm-sensors/trunk/kernel/busses/dmi_scan.c

@@ -17 +17 @@
-#include <asm/system.h>
-#include "version.h"
-
+
+
+
-
-struct dmi_header
@@ -24 +26 @@
-        u8      length;
-        u16     handle;
+};
+
+enum
+{
+        DMI_BIOS_VENDOR,
+        DMI_BIOS_VERSION,
+        DMI_BIOS_DATE,
+        DMI_SYS_VENDOR,
+        DMI_PRODUCT_NAME,
+        DMI_PRODUCT_VERSION,
+        DMI_BOARD_VENDOR,
+        DMI_BOARD_NAME,
+        DMI_BOARD_VERSION,
+        DMI_STRING_MAX
-};
-
@@ -212 +228 @@
-}
-
-void
+int
-{
-        int err;
@@ -221 +237 @@
-        else
-                printk("dmi_scan.o: SM BIOS found\n");
+
+        if(dmi_ident[DMI_SYS_VENDOR] != NULL
+        && strncmp(dmi_ident[DMI_SYS_VENDOR], "IBM", 3) == 0)
+                is_unsafe_smbus = 1;
+        return 0;
-}
-
-MODULE_DESCRIPTION("SM BIOS DMI Scanner");
-MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL
+
+module_init

lm-sensors/trunk/kernel/busses/i2c-piix4.c

@@ -42 +42 @@
-#include <asm/io.h>
-#include "version.h"
-#include "dmi_scan.h"
-
-
@@ -117 +116 @@
- * Get DMI information.
- */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,34)
-void dmi_scan_mach(void);
-#endif
-
-static int __devinit ibm_dmi_probe(void)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)
-        extern int is_unsafe_smbus;
-        return is_unsafe_smbus;
-#else
-#define IBM_SIGNATURE           "IBM"
-        dmi_scan_mach();
-        if(dmi_ident[DMI_SYS_VENDOR] == NULL)
-                return 0;
-        if(strncmp(dmi_ident[DMI_SYS_VENDOR], IBM_SIGNATURE,
-                   strlen(IBM_SIGNATURE)) == 0)
-                return 1;
-        return 0;
-#endif
-}
-#endif

lm-sensors/trunk/mkpatch/FILES

@@ -1 +1 @@
-kernel/busses/dmi_scan.c        drivers/i2c/dmi_scan.c
-kernel/busses/dmi_scan.h        include/linux/dmi_scan.h
-kernel/busses/i2c-ali1535.c     drivers/i2c/i2c-ali1535.c
-kernel/busses/i2c-ali15x3.c     drivers/i2c/i2c-ali15x3.c

lm-sensors/trunk/mkpatch/INCLUDES

@@ -1 @@
-"dmi_scan.h"            <linux/dmi_scan.h>
-"sensors_compat.h"      <linux/sensors_compat.h>
-"sensors_vid.h"         <linux/sensors_vid.h>