Changeset 496

Timestamp:

07/19/99 13:45:27 (14 years ago)

Author:

frodo

Message:

First round of lm_sensors changes for the new I2C tree

* The i2c package can no longer be compiled as part of the lm_sensors tree
* The archive of the i2c package is removed
* smbus, i2c-dev and i2c-proc modules and headers have been removed; they

are now completely integrated into the i2c package

* The fake i2c.h header has been removed; this also allowed us to remove

the ugly LM_SENSORS and TBD defines.

* A new variable I2C_HEADERS is introduced in the Makefile. This allows

us to install the i2c headers in, for example, /usr/local/include/linux.

* All files now include <linux/i2c.h> instead of "i2c.h" and "smbus.h"

Status: 'make dep' works, all the right include files are found. 'make all'

does not yet work.

Location:

lm-sensors/trunk

Files:

• Makefile (modified) (5 diffs)
• archive (deleted)
• kernel/Module.mk (modified) (1 diff)
• kernel/busses/i2c-ali15x3.c (modified) (1 diff)
• kernel/busses/i2c-hydra.c (modified) (1 diff)
• kernel/busses/i2c-isa.c (modified) (1 diff)
• kernel/busses/i2c-piix4.c (modified) (1 diff)
• kernel/busses/i2c-via.c (modified) (1 diff)
• kernel/busses/i2c-voodoo3.c (modified) (1 diff)
• kernel/chips/adm1021.c (modified) (1 diff)
• kernel/chips/adm9240.c (modified) (1 diff)
• kernel/chips/bt869.c (modified) (1 diff)
• kernel/chips/eeprom.c (modified) (1 diff)
• kernel/chips/gl518sm.c (modified) (1 diff)
• kernel/chips/icspll.c (modified) (1 diff)
• kernel/chips/lm75.c (modified) (1 diff)
• kernel/chips/lm78.c (modified) (1 diff)
• kernel/chips/lm80.c (modified) (1 diff)
• kernel/chips/ltc1710.c (modified) (1 diff)
• kernel/chips/matorb.c (modified) (1 diff)
• kernel/chips/maxilife.c (modified) (1 diff)
• kernel/chips/sis5595.c (modified) (1 diff)
• kernel/chips/w83781d.c (modified) (1 diff)
• kernel/i2c-dev.c (deleted)
• kernel/i2c-proc.c (deleted)
• kernel/include/Module.mk (modified) (1 diff)
• kernel/include/i2c-dev.h (deleted)
• kernel/include/i2c-isa.h (modified) (2 diffs)
• kernel/include/i2c.h (deleted)
• kernel/include/sensors.h (modified) (1 diff)
• kernel/include/smbus.h (deleted)
• kernel/sensors.c (modified) (1 diff)
• kernel/smbus.c (deleted)
• prog/detect/i2cdetect.c (modified) (1 diff)
• prog/dump/i2cdump.c (modified) (1 diff)

lm-sensors/trunk/Makefile

@@ -27 +27 @@
 LINUX_HEADERS=/usr/include
 
+# If you have installed the i2c header at some other place (like 
+# /usr/local/include/linux), set that directory here. Please check this out
+# if you get strange compilation errors; the default Linux i2c headers
+# may be used mistakenly.
+I2C_HEADERS=/usr/local/include
+
 # The location of linux itself. This is only used to determine whether you
 # use a SMP kernel in the magic invocation just below.
@@ -44 +50 @@
 #MODVER := 0
 #MODVER := 1
-
-# Uncomment the second line if you do not want to compile the included
-# i2c modules. WARNING! If the i2c module version does not match the 
-# smbus/sensor module versions, you will get into severe problems.
-# If you want to use a self-compiled version of the i2c modules, make
-# sure <linux/i2c.h> contains the *correct* i2c header file! The stock
-# Linux 2.1.xxx and 2.2.x modules are *not* good enough; you really need
-# Simon Vogl's version!
-I2C := 1
-#I2C := 0
 
 # Uncomment the second line if you are a developer. This will enable many
@@ -130 +126 @@
 SRCDIRS := kernel kernel/busses kernel/chips kernel/include lib prog/sensors \
            prog/dump prog/detect etc
-ifeq ($(I2C),1)
-SRCDIRS += i2c i2c/detect i2c/drivers i2c/eeprom
-endif
 
 # Some often-used commands with default options
@@ -150 +143 @@
 # ARCFLAGS are used to create archive object files (static libraries), and
 # LIBCFLAGS are for shared library objects.
-CFLAGS := -I. -Ii2c -Ikernel/include -I$(LINUX_HEADERS) -O2 -DLM_SENSORS
+CFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS) -O2 
 
 ifeq ($(DEBUG),1)
@@ -159 +152 @@
 CFLAGS += -Wall -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual \
           -Wcast-align -Wwrite-strings -Wnested-externs -Winline
-endif
-
-ifeq ($(I2C),1)
-CFLAGS += -DI2C
 endif
 

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...
-KERNELTARGETS := $(MODULE_DIR)/smbus.o \
-                 $(MODULE_DIR)/i2c-proc.o \
-                 $(MODULE_DIR)/i2c-dev.o $(MODULE_DIR)/sensors.o
+KERNELTARGETS := $(MODULE_DIR)/sensors.o
 
 # Include all dependency files

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

@@ -75 +75 @@
 #include <linux/sched.h>
 #include <linux/ioport.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "compat.h"

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

@@ -32 +32 @@
 #include <linux/types.h>
 
-#include "i2c.h"
-#include "algo-bit.h"
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
 #include "compat.h"
 

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

@@ -30 +30 @@
 #include "compat.h"
 
-#include "i2c.h"
-#ifdef I2C_SPINLOCK
-#include <asm/spinlock.h>
-#else
+#include <linux/i2c.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,0,19)
 #include <linux/sched.h>
 #else
 #include <asm/semaphore.h>
-#endif
 #endif
 

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

@@ -29 +29 @@
 #include <linux/sched.h>
 #include <linux/ioport.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "compat.h"

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

@@ -34 +34 @@
 #endif
 
-#include "i2c.h"
-#include "algo-bit.h"
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
 #include "compat.h"
 

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

@@ -37 +37 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "compat.h"

lm-sensors/trunk/kernel/chips/adm1021.c

@@ -22 +22 @@
 #include <linux/module.h>
 #include <linux/malloc.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "sensors.h"
-#include "i2c.h"
 #include "i2c-isa.h"
 #include "version.h"

lm-sensors/trunk/kernel/chips/adm9240.c

@@ -55 +55 @@
 #include <asm/io.h>
 #include <linux/types.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "i2c-isa.h"
 #include "sensors.h"
-#include "i2c.h"
 #include "compat.h"
 

lm-sensors/trunk/kernel/chips/bt869.c

@@ -24 +24 @@
 #include <linux/module.h>
 #include <linux/malloc.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "sensors.h"
-#include "i2c.h"
 #include "i2c-isa.h"
 #include "version.h"

lm-sensors/trunk/kernel/chips/eeprom.c

@@ -22 +22 @@
 #include <linux/module.h>
 #include <linux/malloc.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "sensors.h"
-#include "i2c.h"
 #include "i2c-isa.h"
 #include "version.h"

lm-sensors/trunk/kernel/chips/gl518sm.c

@@ -23 +23 @@
 #include <linux/module.h>
 #include <linux/malloc.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "sensors.h"
-#include "i2c.h"
 #include "version.h"
 #include "compat.h"

lm-sensors/trunk/kernel/chips/icspll.c

@@ -31 +31 @@
 #include <linux/module.h>
 #include <linux/malloc.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "sensors.h"
-#include "i2c.h"
 #include "i2c-isa.h"
 #include "version.h"

lm-sensors/trunk/kernel/chips/lm75.c

@@ -21 +21 @@
 #include <linux/module.h>
 #include <linux/malloc.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "sensors.h"
-#include "i2c.h"
 #include "i2c-isa.h"
 #include "version.h"

lm-sensors/trunk/kernel/chips/lm78.c

@@ -27 +27 @@
 #include <asm/io.h>
 #include <linux/types.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "i2c-isa.h"
 #include "sensors.h"
-#include "i2c.h"
 #include "compat.h"
 

lm-sensors/trunk/kernel/chips/lm80.c

@@ -28 +28 @@
 #include <asm/io.h>
 #include <linux/types.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "i2c-isa.h"
 #include "sensors.h"
-#include "i2c.h"
 #include "compat.h"
 

lm-sensors/trunk/kernel/chips/ltc1710.c

@@ -44 +44 @@
 #include <linux/module.h>
 #include <linux/malloc.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "sensors.h"
-#include "i2c.h"
 #include "i2c-isa.h"
 #include "version.h"

lm-sensors/trunk/kernel/chips/matorb.c

@@ -25 +25 @@
 #include <linux/module.h>
 #include <linux/malloc.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "sensors.h"
-#include "i2c.h"
 #include "i2c-isa.h"
 #include "version.h"

lm-sensors/trunk/kernel/chips/maxilife.c

@@ -47 +47 @@
 #include <asm/io.h>
 #include <linux/types.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "sensors.h"
-#include "i2c.h"
 #include "compat.h"
 

lm-sensors/trunk/kernel/chips/sis5595.c

@@ -33 +33 @@
 #include <asm/io.h>
 #include <linux/types.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "i2c-isa.h"
 #include "sensors.h"
-#include "i2c.h"
 #include "compat.h"
 

lm-sensors/trunk/kernel/chips/w83781d.c

@@ -39 +39 @@
 #include <asm/io.h>
 #include <linux/types.h>
-#include "smbus.h"
+#include <linux/i2c.h>
 #include "version.h"
 #include "i2c-isa.h"
 #include "sensors.h"
-#include "i2c.h"
 #include "compat.h"
 

lm-sensors/trunk/kernel/include/Module.mk

@@ -21 +21 @@
 MODULE_DIR := kernel/include
 
-KERNELINCLUDEFILES := $(MODULE_DIR)/sensors.h $(MODULE_DIR)/i2c-isa.h \
-                      $(MODULE_DIR)/smbus.h $(MODULE_DIR)/i2c-dev.h
+KERNELINCLUDEFILES := $(MODULE_DIR)/sensors.h $(MODULE_DIR)/i2c-isa.h 
+                      
 
 install-all-kernel-include:
         $(MKDIR) $(SYSINCLUDEDIR)
-        for file in $(KERNELINCLUDEFILES) ; do \
-          $(RM) $$file.install; \
-          $(GREP) -v '/\* TBD \*/' $$file > $$file.install; \
-          $(INSTALL) -o root -g root -m 644 $$file.install \
-                    $(SYSINCLUDEDIR)/`basename $$file`; \
-          $(RM) $$file.install; \
-        done
+        $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(SYSINCLUDEDIR)
+
 install :: install-all-kernel-include
 

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

@@ -18 +18 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-
-/* Important note: */                                           /* TBD */
-/* Lines like these, with the 'TBD' remark (To Be Deleted) */   /* TBD */
-/* WILL BE DELETED when this file is installed. */              /* TBD */
-/* This allows us to get rid of the ugly LM_SENSORS define */   /* TBD */
 
 
@@ -47 +42 @@
 #endif
 
-#ifdef LM_SENSORS                                       /* TBD */
-#include "i2c.h"                                        /* TBD */
-#else /* ndef LM_SENSORS */                             /* TBD */
-#include <linux/i2c.h>
-#endif /* def LM_SENSORS */                             /* TBD */
+#include <linux/i2c.h>                  
 
 /* Note that this driver is *not* built upon smbus.c, but is parallel to it.

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

@@ -18 +18 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-
-/* Important note: */                                           /* TBD */
-/* Lines like these, with the 'TBD' remark (To Be Deleted) */   /* TBD */
-/* WILL BE DELETED when this file is installed. */              /* TBD */
-/* This allows us to get rid of the ugly LM_SENSORS define */   /* TBD */
-
 
 #ifndef SENSORS_SENSORS_H

lm-sensors/trunk/kernel/sensors.c

@@ -26 +26 @@
 
 #include "version.h"
-#include "i2c.h"
+#include <linux/i2c.h>
 #include "i2c-isa.h"
 #include "sensors.h"
 #include "compat.h"
-#include "smbus.h"
 
 

lm-sensors/trunk/prog/detect/i2cdetect.c

@@ -25 +25 @@
 #include <unistd.h>
 #include <fcntl.h>
-#include "kernel/include/i2c-dev.h"
+#include <linux/i2c-dev.h>
 
 void help(void)

lm-sensors/trunk/prog/dump/i2cdump.c

@@ -24 +24 @@
 #include <unistd.h>
 #include <fcntl.h>
-#include "kernel/include/i2c-dev.h"
+#include <linux/i2c-dev.h>
 
 void help(void)