Changeset 9

Timestamp:

11/19/98 16:14:01 (15 years ago)

Author:

frodo

Message:

piix4.c basic skeleton

The real PIIX4 access code must still be written; perhaps somebody else could
do this? Most of it could be copied from the old piix4.c. But check carefully
what you are doing, as some things *have* changed (like the SMBUS_{BYTE,...}
variables!).

Location:

lm-sensors/trunk

Files:

• kernel/Module.mk (modified) (1 diff)
• kernel/busses (added)
• kernel/busses/i2c-piix4.c (added)
• kernel/include/smbus.h (modified) (2 diffs)
• kernel/smbus.c (modified) (2 diffs)
• src/Module.mk (modified) (1 diff)
• src/piix4.c (added)
• src/smbus.c (modified) (2 diffs)
• src/smbus.h (modified) (2 diffs)

lm-sensors/trunk/kernel/Module.mk

@@ -23 +23 @@
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
-SRCTARGETS := $(MODULE_DIR)/smbus.o 
+SRCTARGETS := $(MODULE_DIR)/smbus.o $(MODULE_DIR)/piix4.o
 
 # Include all dependency files

lm-sensors/trunk/kernel/include/smbus.h

@@ -110 +110 @@
   int retries;
 
-  /* Here ended i2c_algorithm */
-  s32 (* smbus_access) (__u8 addr, char read_write,
-                        __u8 command, int size, union smbus_data * data);
+  /* Here ended i2c_adapter */
+  s32 (* smbus_access) (u8 addr, char read_write,
+                        u8 command, int size, union smbus_data * data);
 };
 
@@ -122 +122 @@
 #define ALGO_SMBUS 0x40000
 
+/* SMBus Adapter ids */
+#define SMBUS_PIIX4 1
+
 /* This union is used within smbus_access routines */
 union smbus_data { 
-        __u8 byte;
-        __u16 word;
-        __u8 block[32];
+        u8 byte;
+        u16 word;
+        u8 block[32];
 };
 

lm-sensors/trunk/kernel/smbus.c

@@ -20 +20 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
+
+#ifdef SPINLOCK
+#include <asm/spinlock.h>
+#else
+#include <asm/semaphore.h>
+#endif
+
 #include "smbus.h"
 
@@ -58 +65 @@
 /* OK, so you want to access a bus using the SMBus protocols. Well, it either
    is registered as a SMBus-only adapter (like the PIIX4), or we need to
-   simulate the SMBus commands using the i2c access routines. */
+   simulate the SMBus commands using the i2c access routines. 
+   We do all locking here, so you can ignore that in the adapter-specific
+   smbus_accesss routine. */
 s32 smbus_access (struct smbus_adapter * adapter, u8 addr, char read_write,
                   u8 command, int size, union smbus_data * data)
 {
+  int res;
+#ifdef SPINLOCK
+  spin_lock_irqsave(&adapter->lock,adapter->lockflags);
+#else
+  down(&adapter->lock);
+#endif
   if (adapter->id & ALGO_SMBUS) 
-    return adapter->smbus_access(addr,read_write,command,size,data);
+    res = adapter->smbus_access(addr,read_write,command,size,data);
   else
-    return smbus_access_i2c(adapter,addr,read_write,command,size,data);
+    res = smbus_access_i2c(adapter,addr,read_write,command,size,data);
+#ifdef SPINLOCK
+  spin_unlock_irqrestore(&adapter->lock,adapter->lockflags);
+#else
+  up(&adapter->lock);
+#endif
+  return res;
 }
   

lm-sensors/trunk/src/Module.mk

@@ -23 +23 @@
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
-SRCTARGETS := $(MODULE_DIR)/smbus.o 
+SRCTARGETS := $(MODULE_DIR)/smbus.o $(MODULE_DIR)/piix4.o
 
 # Include all dependency files

lm-sensors/trunk/src/smbus.c

@@ -20 +20 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
+
+#ifdef SPINLOCK
+#include <asm/spinlock.h>
+#else
+#include <asm/semaphore.h>
+#endif
+
 #include "smbus.h"
 
@@ -58 +65 @@
 /* OK, so you want to access a bus using the SMBus protocols. Well, it either
    is registered as a SMBus-only adapter (like the PIIX4), or we need to
-   simulate the SMBus commands using the i2c access routines. */
+   simulate the SMBus commands using the i2c access routines. 
+   We do all locking here, so you can ignore that in the adapter-specific
+   smbus_accesss routine. */
 s32 smbus_access (struct smbus_adapter * adapter, u8 addr, char read_write,
                   u8 command, int size, union smbus_data * data)
 {
+  int res;
+#ifdef SPINLOCK
+  spin_lock_irqsave(&adapter->lock,adapter->lockflags);
+#else
+  down(&adapter->lock);
+#endif
   if (adapter->id & ALGO_SMBUS) 
-    return adapter->smbus_access(addr,read_write,command,size,data);
+    res = adapter->smbus_access(addr,read_write,command,size,data);
   else
-    return smbus_access_i2c(adapter,addr,read_write,command,size,data);
+    res = smbus_access_i2c(adapter,addr,read_write,command,size,data);
+#ifdef SPINLOCK
+  spin_unlock_irqrestore(&adapter->lock,adapter->lockflags);
+#else
+  up(&adapter->lock);
+#endif
+  return res;
 }
   

lm-sensors/trunk/src/smbus.h

@@ -110 +110 @@
   int retries;
 
-  /* Here ended i2c_algorithm */
-  s32 (* smbus_access) (__u8 addr, char read_write,
-                        __u8 command, int size, union smbus_data * data);
+  /* Here ended i2c_adapter */
+  s32 (* smbus_access) (u8 addr, char read_write,
+                        u8 command, int size, union smbus_data * data);
 };
 
@@ -122 +122 @@
 #define ALGO_SMBUS 0x40000
 
+/* SMBus Adapter ids */
+#define SMBUS_PIIX4 1
+
 /* This union is used within smbus_access routines */
 union smbus_data { 
-        __u8 byte;
-        __u16 word;
-        __u8 block[32];
+        u8 byte;
+        u16 word;
+        u8 block[32];
 };