Changeset 12

Timestamp:

11/23/98 23:34:34 (10 years ago)

Author:

frodo

Message:

isa module added, some bugfixes

'isa.o' is roughly what was called 'sensor.o' in doc/design.

Files:

• lm-sensors/trunk/doc/design (modified) (2 diffs)
• lm-sensors/trunk/kernel/Module.mk (modified) (1 diff)
• lm-sensors/trunk/kernel/busses/i2c-isa.c (added)
• lm-sensors/trunk/kernel/include/i2c-isa.h (added)
• lm-sensors/trunk/kernel/include/isa.h (added)
• lm-sensors/trunk/kernel/include/smbus.h (modified) (2 diffs)
• lm-sensors/trunk/kernel/smbus.c (modified) (2 diffs)
• lm-sensors/trunk/src/Module.mk (modified) (1 diff)
• lm-sensors/trunk/src/isa.c (added)
• lm-sensors/trunk/src/isa.h (added)
• lm-sensors/trunk/src/smbus.c (modified) (2 diffs)
• lm-sensors/trunk/src/smbus.h (modified) (2 diffs)
• lm-sensors/trunk/version.h (modified) (1 diff)

lm-sensors/trunk/doc/design

@@ -7 +7 @@
-                 1.1, 19981111.
-                 1.2, 19981118.
+
+--> Never, ever change the driver struct with this technique! 
-
-
@@ -169 +171 @@
---------
-
-sensor
+i2c
-  char name[32];
-  int id;

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...
-
+ $(MODULE_DIR)/isa.o
-
-# Include all dependency files

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

@@ -125 +125 @@
-#define SMBUS_PIIX4 1
-
+/* Detect whether we are on an SMBus-only bus. Note that if this returns
+   false, you can still use the smbus access routines, as these emulate
+   the SMBus on I2C. Unless they are undefined on your algorithm, of
+   course. */
+#define i2c_is_smbus_client(clientptr) \
+        ((clientptr)->adapter->algo->id == ALGO_SMBUS)
+
-/* This union is used within smbus_access routines */
-union smbus_data { 
@@ -256 +263 @@
-}
-
+
-/* Next: define SMBus variants of registering. */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

lm-sensors/trunk/kernel/smbus.c

@@ -21 +21 @@
-#include <linux/kernel.h>
-
+#include "i2c.h"
-#ifdef SPINLOCK
-#include <asm/spinlock.h>
@@ -157 +158 @@
-}
-
-/* Next: define SMBus variants of registering. Very boring. To make it possible
-   to change these definitions in the future without recompiling all modules,
-   we do not define them as inline. */
-int smbus_add_algorithm(struct smbus_algorithm *algorithm)
-{
-  return i2c_add_algorithm( (struct i2c_algorithm *) algorithm);
-}
-
-int smbus_del_algorithm(struct smbus_algorithm *algorithm)
-{
-  return i2c_del_algorithm( (struct i2c_algorithm *) algorithm);
-}
-
-int smbus_add_adapter(struct smbus_adapter *adapter)
-{
-  return i2c_add_adapter( (struct i2c_adapter *) adapter);
-}
-
-int smbus_del_adapter(struct smbus_adapter *adapter)
-{
-  return i2c_del_adapter( (struct i2c_adapter *) adapter);
-}
-
-int smbus_add_driver(struct smbus_driver *driver)
-{
-  return i2c_add_driver( (struct i2c_driver *) driver);
-}
-
-int smbus_del_driver(struct smbus_driver *driver)
-{
-  return i2c_del_driver( (struct i2c_driver *) driver);
-}
-
-int smbus_attach_client(struct smbus_client *client)
-{
-  return i2c_attach_client( (struct i2c_client *) client);
-}
-
-int smbus_detach_client(struct smbus_client *client)
-{
-  return i2c_detach_client( (struct i2c_client *) client);
-}
-
-int smbus_init(void)
-{

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...
-
+ $(MODULE_DIR)/isa.o
-
-# Include all dependency files

lm-sensors/trunk/src/smbus.c

@@ -21 +21 @@
-#include <linux/kernel.h>
-
+#include "i2c.h"
-#ifdef SPINLOCK
-#include <asm/spinlock.h>
@@ -157 +158 @@
-}
-
-/* Next: define SMBus variants of registering. Very boring. To make it possible
-   to change these definitions in the future without recompiling all modules,
-   we do not define them as inline. */
-int smbus_add_algorithm(struct smbus_algorithm *algorithm)
-{
-  return i2c_add_algorithm( (struct i2c_algorithm *) algorithm);
-}
-
-int smbus_del_algorithm(struct smbus_algorithm *algorithm)
-{
-  return i2c_del_algorithm( (struct i2c_algorithm *) algorithm);
-}
-
-int smbus_add_adapter(struct smbus_adapter *adapter)
-{
-  return i2c_add_adapter( (struct i2c_adapter *) adapter);
-}
-
-int smbus_del_adapter(struct smbus_adapter *adapter)
-{
-  return i2c_del_adapter( (struct i2c_adapter *) adapter);
-}
-
-int smbus_add_driver(struct smbus_driver *driver)
-{
-  return i2c_add_driver( (struct i2c_driver *) driver);
-}
-
-int smbus_del_driver(struct smbus_driver *driver)
-{
-  return i2c_del_driver( (struct i2c_driver *) driver);
-}
-
-int smbus_attach_client(struct smbus_client *client)
-{
-  return i2c_attach_client( (struct i2c_client *) client);
-}
-
-int smbus_detach_client(struct smbus_client *client)
-{
-  return i2c_detach_client( (struct i2c_client *) client);
-}
-
-int smbus_init(void)
-{

lm-sensors/trunk/src/smbus.h

@@ -125 +125 @@
-#define SMBUS_PIIX4 1
-
+/* Detect whether we are on an SMBus-only bus. Note that if this returns
+   false, you can still use the smbus access routines, as these emulate
+   the SMBus on I2C. Unless they are undefined on your algorithm, of
+   course. */
+#define i2c_is_smbus_client(clientptr) \
+        ((clientptr)->adapter->algo->id == ALGO_SMBUS)
+
-/* This union is used within smbus_access routines */
-union smbus_data { 
@@ -256 +263 @@
-}
-
+
-/* Next: define SMBus variants of registering. */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

lm-sensors/trunk/version.h

@@ -1 @@
-03
-0
+22
+1