Changeset 3527

Timestamp:

02/04/01 23:21:19 (12 years ago)

Author:

mds

Message:

Copy sensors.c and sensors.h from the lm_sensors package and

name them i2c-proc.c and i2c-proc.h.
Add DEVICEID's from sensors.h to i2c-id.h.
Add #defines from i2c-isa.h in lm_sensors to i2c.h.
Update mkpatch for i2c-proc.[ch].

Location:

i2c/trunk

Files:

• kernel/Makefile (modified) (3 diffs)
• kernel/Module.mk (modified) (1 diff)
• kernel/i2c-id.h (modified) (1 diff)
• kernel/i2c-proc.c (added)
• kernel/i2c-proc.h (added)
• kernel/i2c.h (modified) (1 diff)
• mkpatch/Config.in (modified) (1 diff)
• mkpatch/FILES (modified) (2 diffs)
• mkpatch/INCLUDES (modified) (1 diff)
• mkpatch/mkpatch.pl (modified) (2 diffs)

i2c/trunk/kernel/Makefile

@@ -4 +4 @@
 CURRENT=$(shell uname -r)
 I2CINCLUDES := i2c.h i2c-dev.h i2c-algo-bit.h i2c-algo-pcf.h \
-               i2c-elektor.h i2c-pcf8584.h i2c-id.h
+               i2c-elektor.h i2c-pcf8584.h i2c-id.h i2c-proc.h
 I2CKERNELDIR := /usr/include/linux
 I2CMODDIR := /lib/modules/$(CURRENT)/misc
@@ -13 +13 @@
 
 MOD_SUB_DIRS =
-MX_OBJS       = i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o
+MX_OBJS       = i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o i2c-proc.o
 
 M_OBJS      = i2c-dev.o i2c-philips-par.o i2c-elv.o i2c-velleman.o i2c-elektor.o
@@ -35 +35 @@
         insmod bit-lp.o base=0x278
         insmod i2c-dev.o
-        insmod drivers/eeprom.o test=1
+        insmod i2c-proc.o
 
 down:
-        -rmmod eeprom
+        -rmmod i2c-proc.o
         -rmmod i2c-dev
         -rmmod bit-lp

i2c/trunk/kernel/Module.mk

@@ -57 +57 @@
 KERNELINCLUDES += $(MODULE_DIR)/i2c-elektor.h $(MODULE_DIR)/i2c-pcf8584.h
 endif
+ifneq ($(shell if grep -q '^CONFIG_I2C_PROC=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELTARGETS += $(MODULE_DIR)/i2c-proc.o
+KERNELINCLUDES += $(MODULE_DIR)/i2c-proc.h
+endif
 
 # Include all dependency files

i2c/trunk/kernel/i2c-id.h

@@ -94 +94 @@
 #define I2C_DRIVERID_I2CPROC    901
 
+/* IDs --   Use DRIVERIDs 1000-1999 for sensors. 
+   These were originally in sensors.h in the lm_sensors package */
+#define I2C_DRIVERID_LM78 1002
+#define I2C_DRIVERID_LM75 1003
+#define I2C_DRIVERID_GL518 1004
+#define I2C_DRIVERID_EEPROM 1005
+#define I2C_DRIVERID_W83781D 1006
+#define I2C_DRIVERID_LM80 1007
+#define I2C_DRIVERID_ADM1021 1008
+#define I2C_DRIVERID_ADM9240 1009
+#define I2C_DRIVERID_LTC1710 1010
+#define I2C_DRIVERID_SIS5595 1011
+#define I2C_DRIVERID_ICSPLL 1012
+#define I2C_DRIVERID_BT869 1013
+#define I2C_DRIVERID_MAXILIFE 1014
+#define I2C_DRIVERID_MATORB 1015
+#define I2C_DRIVERID_GL520 1016
+#define I2C_DRIVERID_THMC50 1017
+#define I2C_DRIVERID_DDCMON 1018
+#define I2C_DRIVERID_VIA686A 1019
+#define I2C_DRIVERID_ADM1025 1020
+#define I2C_DRIVERID_LM87 1021
+#define I2C_DRIVERID_PCF8574 1022
+#define I2C_DRIVERID_MTP008 1023
+#define I2C_DRIVERID_DS1621 1024
+
 /*
  * ---- Adapter types ----------------------------------------------------

i2c/trunk/kernel/i2c.h

@@ -550 +550 @@
                                         force}
 
+/* Detect whether we are on the isa bus. If this returns true, all i2c
+   access will fail! */
+#define i2c_is_isa_client(clientptr) \
+        ((clientptr)->adapter->algo->id == I2C_ALGO_ISA)
+#define i2c_is_isa_adapter(adapptr) \
+        ((adapptr)->algo->id == I2C_ALGO_ISA)
+
 #endif /* def __KERNEL__ */
 #endif /* I2C_H */

i2c/trunk/mkpatch/Config.in

@@ -26 +26 @@
    dep_tristate 'I2C device interface' CONFIG_I2C_CHARDEV $CONFIG_I2C
 
+   dep_tristate 'I2C /proc interface' CONFIG_I2C_PROC $CONFIG_I2C
+
 fi
 endmenu

i2c/trunk/mkpatch/FILES

@@ -7 +7 @@
 kernel/i2c-philips-par.c        drivers/i2c/i2c-philips-par.c
 kernel/i2c-velleman.c           drivers/i2c/i2c-velleman.c
+kernel/i2c-proc.c               drivers/i2c/i2c-proc.c
 kernel/i2c-pcf8584.h            drivers/i2c/i2c-pcf8584.h
 kernel/i2c.h                    include/linux/i2c.h
@@ -14 +15 @@
 kernel/i2c-elektor.h            include/linux/i2c-elektor.h
 kernel/i2c-id.h                 include/linux/i2c-id.h
+kernel/i2c-proc.h               include/linux/i2c-proc.h
 mkpatch/Config.in               drivers/i2c/Config.in
 doc/proc-interface              Documentation/i2c/proc-interface

i2c/trunk/mkpatch/INCLUDES

@@ -5 +5 @@
 "i2c-elektor.h"         <linux/i2c-elektor.h>
 "i2c-id.h"              <linux/i2c-id.h>
+"i2c-proc.h"            <linux/i2c-proc.h>

i2c/trunk/mkpatch/mkpatch.pl

@@ -258 +258 @@
   module will be called i2c-dev.o.
 
+I2C /proc support
+CONFIG_I2C_PROC
+  This provides support for i2c device entries in the /proc filesystem.
+  The entries will be found in /proc/sys/dev/sensors.
+
+  This code is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called i2c-dev.o.
+
 EOF
       $printed = 1;
@@ -506 +515 @@
   ifeq ($(CONFIG_I2C_CHARDEV),m)
     M_OBJS += i2c-dev.o
+  endif
+endif
+
+ifeq ($(CONFIG_I2C_PROC),y)
+  L_OBJS += i2c-proc.o
+else
+  ifeq ($(CONFIG_I2C_PROC),m)
+    M_OBJS += i2c-proc.o
   endif
 endif