Changeset 13

Timestamp:

11/26/98 11:16:08 (14 years ago)

Author:

frodo

Message:

Example lm_sensors-2 driver

Though it is called the LM78 driver, there is not too much LM78 specific
code in it; it can better be seen as an example code skeleton for other
drivers. Right now, it creats a file /proc/sensors-test, which contains
a list of busses it registered itself on. Stupid, but very useful for
testing purposes!

You need a 2.0 kernel for lm78.o to insert (or hack the /proc system
specific parts; see lm78.c of lm_sensors version 1 how to do this).
Other parts of lm_sensors-2 are not tested for 2.1 kernels either, but
I am certain it won't work in this case :-).

See the TODO list to get some idea what is left to do, choose something
and implement it. Or not :-). But please, send a note to the mailing
list when you start on something, to avoid duplicate work...

Other notable changes:

the smbus_access routines now use (the more logical) i2c_adapter
structure, instead of smbus_adapter.

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/TODO

@@ -1 +1 @@
 Many, many things. Most notably:
 
-* Write s32 smbus_access_i2c in smbus.c
-* Check out whether we can use the dev interface for smbus (like i2c)
-* Write all other modules
+* Write smbus_access_i2c in smbus.c
+* Write piix4_* in piix4.c
+* Complete lm78 driver
+* Extend dev interface for SMBus
+* Create entries in /proc/bus: a list of all registered busses, and for
+  each bus, a file with registered clients.
+* Write all other drivers
+* How to make drivers detect thing *not*; for example, if a Winbond is 
+  present, the LM75 driver should not try to access its simulated
+  LM75 chips!
+* Write a userland-library for SMBus/i2c access (through the /dev interface)
+* Write a userland detection program for busses (clients are less important;
+  but perhaps needed too).
+* Bring doc/design up-to-date (it is horribly out of date right now)

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 $(MODULE_DIR)/piix4.o $(MODULE_DIR)/isa.o
+SRCTARGETS := $(MODULE_DIR)/smbus.o $(MODULE_DIR)/piix4.o $(MODULE_DIR)/isa.o \
+              $(MODULE_DIR)/lm78.o
 
 # Include all dependency files

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

@@ -50 +50 @@
 {
   /* TO BE WRITTEN! */
+  return -1;
 }
 
@@ -90 +91 @@
   {
     if ((res = smbus_del_adapter(&piix4_adapter))) {
-      printk("piix4.o: smbus_del_adapter failed, module not removed");
+      printk("piix4.o: smbus_del_adapter failed, module not removed\n");
       return res;
-    }
-    else
+    } else
       piix4_initialized--;
   }

lm-sensors/trunk/kernel/include/i2c-isa.h

@@ -78 +78 @@
 
   /* Here ended i2c_client */
-  unsigned int full_address;
+  unsigned int isa_addr;
 };
 
@@ -128 +128 @@
 #define i2c_is_isa_client(clientptr) \
         ((clientptr)->adapter->algo->id == ALGO_ISA)
+#define i2c_is_isa_adapter(adapptr) \
+        ((adapptr)->algo->id == ALGO_ISA)
 
 /* Next: define ISA variants of registering. */

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

@@ -78 +78 @@
 
   /* Here ended i2c_client */
-  unsigned int full_address;
+  unsigned int isa_addr;
 };
 
@@ -128 +128 @@
 #define i2c_is_isa_client(clientptr) \
         ((clientptr)->adapter->algo->id == ALGO_ISA)
+#define i2c_is_isa_adapter(adapptr) \
+        ((adapptr)->algo->id == ALGO_ISA)
 
 /* Next: define ISA variants of registering. */

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

@@ -131 +131 @@
 #define i2c_is_smbus_client(clientptr) \
         ((clientptr)->adapter->algo->id == ALGO_SMBUS)
+#define i2c_is_smbus_adapter(adapptr) \
+        ((adapptr)->algo->id == ALGO_SMBUS)
 
 /* This union is used within smbus_access routines */
@@ -158 +160 @@
 /* This is the very generalized SMBus access routine. You probably do not
    want to use this, though; one of the functions below may be much easier,
-   and probably just as fast. */
-extern s32 smbus_access (struct smbus_adapter * adapter, u8 addr, 
+   and probably just as fast. 
+   Note that we use i2c_adapter here, because you do not need a specific
+   smbus adapter to call this function. */
+extern s32 smbus_access (struct i2c_adapter * adapter, u8 addr, 
                          char read_write, u8 command, int size,
                          union smbus_data * data);
@@ -166 +170 @@
    conventions of smbus_access. */
 
-extern inline s32 smbus_write_quick(struct smbus_adapter * adapter, u8 addr, 
+extern inline s32 smbus_write_quick(struct i2c_adapter * adapter, u8 addr, 
                                     u8 value)
 {
@@ -172 +176 @@
 }
 
-extern inline s32 smbus_read_byte(struct smbus_adapter * adapter,u8 addr)
+extern inline s32 smbus_read_byte(struct i2c_adapter * adapter,u8 addr)
 {
   union smbus_data data;
@@ -181 +185 @@
 }
 
-extern inline s32 smbus_write_byte(struct smbus_adapter * adapter, u8 addr, 
+extern inline s32 smbus_write_byte(struct i2c_adapter * adapter, u8 addr, 
                                    u8 value)
 {
@@ -187 +191 @@
 }
 
-extern inline s32 smbus_read_byte_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_read_byte_data(struct i2c_adapter * adapter,
                                        u8 addr, u8 command)
 {
@@ -197 +201 @@
 }
 
-extern inline s32 smbus_write_byte_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_write_byte_data(struct i2c_adapter * adapter,
                                         u8 addr, u8 command, u8 value)
 {
@@ -205 +209 @@
 }
 
-extern inline s32 smbus_read_word_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_read_word_data(struct i2c_adapter * adapter,
                                        u8 addr, u8 command)
 {
@@ -215 +219 @@
 }
 
-extern inline s32 smbus_write_word_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_write_word_data(struct i2c_adapter * adapter,
                                         u8 addr, u8 command, u16 value)
 {
@@ -223 +227 @@
 }
 
-extern inline s32 smbus_process_call(struct smbus_adapter * adapter,
+extern inline s32 smbus_process_call(struct i2c_adapter * adapter,
                                      u8 addr, u8 command, u16 value)
 {
@@ -235 +239 @@
 
 /* Returns the number of read bytes */
-extern inline s32 smbus_read_block_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_read_block_data(struct i2c_adapter * adapter,
                                         u8 addr, u8 command, u8 *values)
 {
@@ -249 +253 @@
 }
 
-extern inline int smbus_write_block_data(struct smbus_adapter * adapter,
+extern inline int smbus_write_block_data(struct i2c_adapter * adapter,
                                          u8 addr, u8 command, u8 length,
                                          u8 *values)

lm-sensors/trunk/kernel/smbus.c

@@ -31 +31 @@
 #include "smbus.h"
 
-static s32 smbus_access_i2c (struct smbus_adapter * adapter, u8 addr,
+static s32 smbus_access_i2c (struct i2c_adapter * adapter, u8 addr,
                              char read_write, u8 command, int size,
                              union smbus_data * data);
@@ -70 +70 @@
    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,
+s32 smbus_access (struct i2c_adapter * adapter, u8 addr, char read_write,
                   u8 command, int size, union smbus_data * data)
 {
@@ -80 +80 @@
 #endif
   if (adapter->id & ALGO_SMBUS) 
-    res = adapter->smbus_access(addr,read_write,command,size,data);
+    res = ((struct smbus_adapter *) adapter) -> 
+           smbus_access(addr,read_write,command,size,data);
   else
     res = smbus_access_i2c(adapter,addr,read_write,command,size,data);
@@ -96 +97 @@
    For SMBUS_BYTE: Use addr, read_write, command 
    ....  */
-s32 smbus_access_i2c(struct smbus_adapter * adapter, u8 addr, char read_write,
+s32 smbus_access_i2c(struct i2c_adapter * adapter, u8 addr, char read_write,
                      u8 command, int size, union smbus_data * data)
 {

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 $(MODULE_DIR)/piix4.o $(MODULE_DIR)/isa.o
+SRCTARGETS := $(MODULE_DIR)/smbus.o $(MODULE_DIR)/piix4.o $(MODULE_DIR)/isa.o \
+              $(MODULE_DIR)/lm78.o
 
 # Include all dependency files

lm-sensors/trunk/src/isa.h

@@ -78 +78 @@
 
   /* Here ended i2c_client */
-  unsigned int full_address;
+  unsigned int isa_addr;
 };
 
@@ -128 +128 @@
 #define i2c_is_isa_client(clientptr) \
         ((clientptr)->adapter->algo->id == ALGO_ISA)
+#define i2c_is_isa_adapter(adapptr) \
+        ((adapptr)->algo->id == ALGO_ISA)
 
 /* Next: define ISA variants of registering. */

lm-sensors/trunk/src/piix4.c

@@ -50 +50 @@
 {
   /* TO BE WRITTEN! */
+  return -1;
 }
 
@@ -90 +91 @@
   {
     if ((res = smbus_del_adapter(&piix4_adapter))) {
-      printk("piix4.o: smbus_del_adapter failed, module not removed");
+      printk("piix4.o: smbus_del_adapter failed, module not removed\n");
       return res;
-    }
-    else
+    } else
       piix4_initialized--;
   }

lm-sensors/trunk/src/smbus.c

@@ -31 +31 @@
 #include "smbus.h"
 
-static s32 smbus_access_i2c (struct smbus_adapter * adapter, u8 addr,
+static s32 smbus_access_i2c (struct i2c_adapter * adapter, u8 addr,
                              char read_write, u8 command, int size,
                              union smbus_data * data);
@@ -70 +70 @@
    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,
+s32 smbus_access (struct i2c_adapter * adapter, u8 addr, char read_write,
                   u8 command, int size, union smbus_data * data)
 {
@@ -80 +80 @@
 #endif
   if (adapter->id & ALGO_SMBUS) 
-    res = adapter->smbus_access(addr,read_write,command,size,data);
+    res = ((struct smbus_adapter *) adapter) -> 
+           smbus_access(addr,read_write,command,size,data);
   else
     res = smbus_access_i2c(adapter,addr,read_write,command,size,data);
@@ -96 +97 @@
    For SMBUS_BYTE: Use addr, read_write, command 
    ....  */
-s32 smbus_access_i2c(struct smbus_adapter * adapter, u8 addr, char read_write,
+s32 smbus_access_i2c(struct i2c_adapter * adapter, u8 addr, char read_write,
                      u8 command, int size, union smbus_data * data)
 {

lm-sensors/trunk/src/smbus.h

@@ -131 +131 @@
 #define i2c_is_smbus_client(clientptr) \
         ((clientptr)->adapter->algo->id == ALGO_SMBUS)
+#define i2c_is_smbus_adapter(adapptr) \
+        ((adapptr)->algo->id == ALGO_SMBUS)
 
 /* This union is used within smbus_access routines */
@@ -158 +160 @@
 /* This is the very generalized SMBus access routine. You probably do not
    want to use this, though; one of the functions below may be much easier,
-   and probably just as fast. */
-extern s32 smbus_access (struct smbus_adapter * adapter, u8 addr, 
+   and probably just as fast. 
+   Note that we use i2c_adapter here, because you do not need a specific
+   smbus adapter to call this function. */
+extern s32 smbus_access (struct i2c_adapter * adapter, u8 addr, 
                          char read_write, u8 command, int size,
                          union smbus_data * data);
@@ -166 +170 @@
    conventions of smbus_access. */
 
-extern inline s32 smbus_write_quick(struct smbus_adapter * adapter, u8 addr, 
+extern inline s32 smbus_write_quick(struct i2c_adapter * adapter, u8 addr, 
                                     u8 value)
 {
@@ -172 +176 @@
 }
 
-extern inline s32 smbus_read_byte(struct smbus_adapter * adapter,u8 addr)
+extern inline s32 smbus_read_byte(struct i2c_adapter * adapter,u8 addr)
 {
   union smbus_data data;
@@ -181 +185 @@
 }
 
-extern inline s32 smbus_write_byte(struct smbus_adapter * adapter, u8 addr, 
+extern inline s32 smbus_write_byte(struct i2c_adapter * adapter, u8 addr, 
                                    u8 value)
 {
@@ -187 +191 @@
 }
 
-extern inline s32 smbus_read_byte_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_read_byte_data(struct i2c_adapter * adapter,
                                        u8 addr, u8 command)
 {
@@ -197 +201 @@
 }
 
-extern inline s32 smbus_write_byte_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_write_byte_data(struct i2c_adapter * adapter,
                                         u8 addr, u8 command, u8 value)
 {
@@ -205 +209 @@
 }
 
-extern inline s32 smbus_read_word_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_read_word_data(struct i2c_adapter * adapter,
                                        u8 addr, u8 command)
 {
@@ -215 +219 @@
 }
 
-extern inline s32 smbus_write_word_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_write_word_data(struct i2c_adapter * adapter,
                                         u8 addr, u8 command, u16 value)
 {
@@ -223 +227 @@
 }
 
-extern inline s32 smbus_process_call(struct smbus_adapter * adapter,
+extern inline s32 smbus_process_call(struct i2c_adapter * adapter,
                                      u8 addr, u8 command, u16 value)
 {
@@ -235 +239 @@
 
 /* Returns the number of read bytes */
-extern inline s32 smbus_read_block_data(struct smbus_adapter * adapter,
+extern inline s32 smbus_read_block_data(struct i2c_adapter * adapter,
                                         u8 addr, u8 command, u8 *values)
 {
@@ -249 +253 @@
 }
 
-extern inline int smbus_write_block_data(struct smbus_adapter * adapter,
+extern inline int smbus_write_block_data(struct i2c_adapter * adapter,
                                          u8 addr, u8 command, u8 length,
                                          u8 *values)