Changeset 15

Timestamp:

11/27/98 01:26:51 (14 years ago)

Author:

frodo

Message:

Start of i2c-bus, a module for displaying i2c bus information in /proc

Nothing much here yet, except some code to create /proc/bus/i2c. Should work
for kernels 2.0 and 2.1 (please test).

Other notable things:

printk statements in all modules made to have to same 'look'.

Location:

lm-sensors/trunk

Files:

• kernel/Module.mk (modified) (1 diff)
• kernel/busses/i2c-isa.c (modified) (7 diffs)
• kernel/busses/i2c-piix4.c (modified) (2 diffs)
• kernel/compat.h (added)
• kernel/include/compat.h (added)
• kernel/smbus.c (modified) (5 diffs)
• src/Module.mk (modified) (1 diff)
• src/compat.h (added)
• src/i2c-bus.c (added)
• src/isa.c (modified) (7 diffs)
• src/piix4.c (modified) (2 diffs)
• src/smbus.c (modified) (5 diffs)
• version.h (modified) (1 diff)

lm-sensors/trunk/kernel/Module.mk

@@ -24 +24 @@
 # defined value verbatim into the command-list of rules...
 SRCTARGETS := $(MODULE_DIR)/smbus.o $(MODULE_DIR)/piix4.o $(MODULE_DIR)/isa.o \
-              $(MODULE_DIR)/lm78.o
+              $(MODULE_DIR)/lm78.o $(MODULE_DIR)/i2c-bus.o
 
 # Include all dependency files

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

@@ -76 +76 @@
                      int num)
 {
-  printk("isa_master_xfer called for adapter `%s' "
+  printk("isa.o: isa_master_xfer called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -85 +85 @@
 int isa_slave_send (struct isa_adapter *adap, char *data, int len)
 {
-  printk("isa_slave_send called for adapter `%s' "
+  printk("isa.o: isa_slave_send called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -94 +94 @@
 int isa_slave_recv (struct isa_adapter *adap, char *data, int len)
 {
-  printk("isa_slave_recv called for adapter `%s' "
+  printk("isa.o: isa_slave_recv called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -132 +132 @@
   isa_initialized = 0;
   if ((res = isa_add_algorithm(&isa_algorithm))) {
-    printk("isa.o: Algorithm registration failed, module isa.o not inserted\n");
+    printk("isa.o: Algorithm registration failed, module not inserted.\n");
     isa_cleanup();
     return res;
@@ -142 +142 @@
   if ((res = isa_add_adapter(&isa_adapter))) {
     printk("isa.o: Adapter registration failed, "
-           "module isa.o is not inserted\n");
+           "module isa.o is not inserted\n.");
     isa_cleanup();
     return res;
   }
   isa_initialized++;
-  printk("isa.o: ISA bus access for i2c modules initialized\n");
+  printk("isa.o: ISA bus access for i2c modules initialized.\n");
   return 0;
 }
@@ -157 +157 @@
   {
     if ((res = isa_del_adapter(&isa_adapter))) {
-      printk("isa.o: isa_del_adapter failed, module not removed\n");
+      printk("isa.o: Adapter deregistration failed, module not removed.\n");
       return res;
     } else
@@ -165 +165 @@
   {
     if ((res = isa_del_algorithm(&isa_algorithm))) {
-      printk("isa.o: isa_del_algorithm failed, module not removed\n");
+      printk("isa.o: Algorithm deregistration failed, module not removed.\n");
       return res;
     } else

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

@@ -66 +66 @@
   piix4_initialized = 0;
   if ((res = piix4_setup())) {
-    printk("piix4.o: PIIX4 not detected, module not inserted\n");
+    printk("piix4.o: PIIX4 not detected, module not inserted.\n");
     piix4_cleanup();
     return res;
@@ -76 +76 @@
   piix4_adapter.smbus_access = &piix4_access;
   if ((res = smbus_add_adapter(&piix4_adapter))) {
-    printk("piix4.o: smbus_add_adapter failed, module not inserted\n");
+    printk("piix4.o: Adapter registration failed, module not inserted.\n");
     piix4_cleanup();
     return res;

lm-sensors/trunk/kernel/smbus.c

@@ -115 +115 @@
                        int num)
 {
-  printk("smbus_master_xfer called for adapter `%s' "
+  printk("smbus.o: smbus_master_xfer called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -124 +124 @@
 int smbus_slave_send (struct smbus_adapter *adap, char *data, int len)
 {
-  printk("smbus_slave_send called for adapter `%s' "
+  printk("smbus.o: smbus_slave_send called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -133 +133 @@
 int smbus_slave_recv (struct smbus_adapter *adap, char *data, int len)
 {
-  printk("smbus_slave_recv called for adapter `%s' "
+  printk("smbus.o: smbus_slave_recv called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -164 +164 @@
   printk("smbus.o version %s (%s)\n",LM_VERSION,LM_DATE);
   if ((res = smbus_add_algorithm(&smbus_algorithm)))
-    printk("Module smbus.o not inserted!\n");
+    printk("smbus.o: Algorithm registration failed, module not inserted.\n");
   else
     printk("smbus.o initialized\n");
@@ -174 +174 @@
   int res;
   if ((res = smbus_del_algorithm(&smbus_algorithm)))
-    printk("Module smbus.o could not be removed cleanly!\n");
+    printk("smbus.o: Algorithm deregistration failed, module not removed\n");
   return res;
 }

lm-sensors/trunk/src/Module.mk

@@ -24 +24 @@
 # defined value verbatim into the command-list of rules...
 SRCTARGETS := $(MODULE_DIR)/smbus.o $(MODULE_DIR)/piix4.o $(MODULE_DIR)/isa.o \
-              $(MODULE_DIR)/lm78.o
+              $(MODULE_DIR)/lm78.o $(MODULE_DIR)/i2c-bus.o
 
 # Include all dependency files

lm-sensors/trunk/src/isa.c

@@ -76 +76 @@
                      int num)
 {
-  printk("isa_master_xfer called for adapter `%s' "
+  printk("isa.o: isa_master_xfer called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -85 +85 @@
 int isa_slave_send (struct isa_adapter *adap, char *data, int len)
 {
-  printk("isa_slave_send called for adapter `%s' "
+  printk("isa.o: isa_slave_send called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -94 +94 @@
 int isa_slave_recv (struct isa_adapter *adap, char *data, int len)
 {
-  printk("isa_slave_recv called for adapter `%s' "
+  printk("isa.o: isa_slave_recv called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -132 +132 @@
   isa_initialized = 0;
   if ((res = isa_add_algorithm(&isa_algorithm))) {
-    printk("isa.o: Algorithm registration failed, module isa.o not inserted\n");
+    printk("isa.o: Algorithm registration failed, module not inserted.\n");
     isa_cleanup();
     return res;
@@ -142 +142 @@
   if ((res = isa_add_adapter(&isa_adapter))) {
     printk("isa.o: Adapter registration failed, "
-           "module isa.o is not inserted\n");
+           "module isa.o is not inserted\n.");
     isa_cleanup();
     return res;
   }
   isa_initialized++;
-  printk("isa.o: ISA bus access for i2c modules initialized\n");
+  printk("isa.o: ISA bus access for i2c modules initialized.\n");
   return 0;
 }
@@ -157 +157 @@
   {
     if ((res = isa_del_adapter(&isa_adapter))) {
-      printk("isa.o: isa_del_adapter failed, module not removed\n");
+      printk("isa.o: Adapter deregistration failed, module not removed.\n");
       return res;
     } else
@@ -165 +165 @@
   {
     if ((res = isa_del_algorithm(&isa_algorithm))) {
-      printk("isa.o: isa_del_algorithm failed, module not removed\n");
+      printk("isa.o: Algorithm deregistration failed, module not removed.\n");
       return res;
     } else

lm-sensors/trunk/src/piix4.c

@@ -66 +66 @@
   piix4_initialized = 0;
   if ((res = piix4_setup())) {
-    printk("piix4.o: PIIX4 not detected, module not inserted\n");
+    printk("piix4.o: PIIX4 not detected, module not inserted.\n");
     piix4_cleanup();
     return res;
@@ -76 +76 @@
   piix4_adapter.smbus_access = &piix4_access;
   if ((res = smbus_add_adapter(&piix4_adapter))) {
-    printk("piix4.o: smbus_add_adapter failed, module not inserted\n");
+    printk("piix4.o: Adapter registration failed, module not inserted.\n");
     piix4_cleanup();
     return res;

lm-sensors/trunk/src/smbus.c

@@ -115 +115 @@
                        int num)
 {
-  printk("smbus_master_xfer called for adapter `%s' "
+  printk("smbus.o: smbus_master_xfer called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -124 +124 @@
 int smbus_slave_send (struct smbus_adapter *adap, char *data, int len)
 {
-  printk("smbus_slave_send called for adapter `%s' "
+  printk("smbus.o: smbus_slave_send called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -133 +133 @@
 int smbus_slave_recv (struct smbus_adapter *adap, char *data, int len)
 {
-  printk("smbus_slave_recv called for adapter `%s' "
+  printk("smbus.o: smbus_slave_recv called for adapter `%s' "
          "(no i2c level access possible!)\n",
          adap->name);
@@ -164 +164 @@
   printk("smbus.o version %s (%s)\n",LM_VERSION,LM_DATE);
   if ((res = smbus_add_algorithm(&smbus_algorithm)))
-    printk("Module smbus.o not inserted!\n");
+    printk("smbus.o: Algorithm registration failed, module not inserted.\n");
   else
     printk("smbus.o initialized\n");
@@ -174 +174 @@
   int res;
   if ((res = smbus_del_algorithm(&smbus_algorithm)))
-    printk("Module smbus.o could not be removed cleanly!\n");
+    printk("smbus.o: Algorithm deregistration failed, module not removed\n");
   return res;
 }

lm-sensors/trunk/version.h

@@ -1 @@
-#define LM_DATE "19981122"
-#define LM_VERSION "2.0.0pre1"
+#define LM_DATE "19981127"
+#define LM_VERSION "2.0.0pre2"