Changeset 21

Timestamp:

12/02/98 16:11:18 (14 years ago)

Author:

frodo

Message:

Cleaned up the i2c files

* 'cvs admin -ko i2c' should disable all RCS keyword substitutions from now

on

* Put all EXPORT stuff between #ifdef LM_SENSORS #endif statements.

Location:

lm-sensors/trunk

Files:

• Makefile (modified) (1 diff)
• i2c/algo-bit.c (modified) (3 diffs)
• i2c/bit-lp.c (modified) (2 diffs)
• i2c/i2c-core.c (modified) (5 diffs)
• i2c/i2c-dev.c (modified) (2 diffs)

lm-sensors/trunk/Makefile

@@ -84 +84 @@
 # CFLAGS is to create in-kernel object files (modules); EXCFLAGS is to create
 # non-kernel object files (which are linked into executables).
-CFLAGS := -D__KERNEL__ -DMODULE -I. -Ii2c -O2 -fomit-frame-pointer
-EXCFLAGS := -I. -O2 -Ii2c
+CFLAGS := -D__KERNEL__ -DMODULE -I. -Ii2c -O2 -fomit-frame-pointer -DLM_SENSORS
+EXCFLAGS := -I. -O2 -Ii2c -D LM_SENSORS
 
 ifeq ($(DEBUG),1)

lm-sensors/trunk/i2c/algo-bit.c

@@ -18 +18 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-static char alg_rcsid[] = "$Id: algo-bit.c,v 1.2 1998/11/03 03:48:44 phil Exp $";
+static char alg_rcsid[] = "$Id: algo-bit.c,v 1.7 1998/09/28 06:45:38 i2c Exp i2c $";
 
 #include <linux/kernel.h>
@@ -640 +640 @@
 
 
+#ifndef LM_SENSORS
+EXPORT_SYMBOL(i2c_bit_add_bus);
+EXPORT_SYMBOL(i2c_bit_del_bus);
+#endif
+
+
 int init_module(void) 
 {
@@ -650 +656 @@
 }
 #endif
+
+
+
+
+
+
+
+
+
+

lm-sensors/trunk/i2c/bit-lp.c

@@ -18 +18 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-static char rcsid[] = "$Id: bit-lp.c,v 1.1 1998/11/02 20:29:27 frodo Exp $";
+static char rcsid[] = "$Id: bit-lp.c,v 1.5 1998/09/28 06:45:38 i2c Exp i2c $";
 /* ------------------------------------------------------------------------- */
 
@@ -152 +152 @@
 MODULE_PARM(base, "i");
 
+#ifndef LM_SENSORS
+EXPORT_NO_SYMBOLS;
+#endif
+
 int init_module(void) 
 {

lm-sensors/trunk/i2c/i2c-core.c

@@ -18 +18 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-#define RCSID "$Id: i2c-core.c,v 1.5 1998/12/01 21:11:32 frodo Exp $"
+#define RCSID "$Id: i2c.c,v 1.7 1998/09/28 06:45:38 i2c Exp i2c $"
 /* ------------------------------------------------------------------------- */
 
@@ -174 +174 @@
                          * must be deleted, as this would cause invalid states.
                          */
+                        /* i2c_detach_client(client); */
                         client->driver->detach_client(client);
         }
@@ -249 +250 @@
                                 DEB2(printk("i2c:   detaching client %s:\n",
                                         client->name));
-                                /* i2c_detach_client(client); */
+                                /*i2c_detach_client(client);*/
                                 driver->detach_client(client);
                         }
@@ -446 +447 @@
 
 
+
 #ifdef MODULE
 MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
@@ -452 +454 @@
 MODULE_PARM_DESC(i2c_debug,"debug level");
 
+#ifndef LM_SENSORS
+EXPORT_SYMBOL(i2c_add_algorithm);
+EXPORT_SYMBOL(i2c_del_algorithm);
+EXPORT_SYMBOL(i2c_add_adapter);
+EXPORT_SYMBOL(i2c_del_adapter);
+EXPORT_SYMBOL(i2c_add_driver);
+EXPORT_SYMBOL(i2c_del_driver);
+EXPORT_SYMBOL(i2c_attach_client);
+EXPORT_SYMBOL(i2c_detach_client);
+
+EXPORT_SYMBOL(i2c_master_send);
+EXPORT_SYMBOL(i2c_master_recv);
+EXPORT_SYMBOL(i2c_control);
+EXPORT_SYMBOL(i2c_transfer);
+#endif
+
+
 int init_module(void) 
 {

lm-sensors/trunk/i2c/i2c-dev.c

@@ -18 +18 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-#define RCSID "$Id: i2c-dev.c,v 1.1 1998/11/02 20:29:27 frodo Exp $"
+#define RCSID "$Id: i2c-dev.c,v 1.6 1998/09/28 06:45:38 i2c Exp i2c $"
 /* ------------------------------------------------------------------------- */
 
@@ -338 +338 @@
 MODULE_DESCRIPTION("I2C-Bus character device interface");
 
+#ifndef LM_SENSORS
+EXPORT_NO_SYMBOLS;
+#endif
+
 int init_module(void) 
 {