Changeset 505

Timestamp:

07/22/99 00:04:34 (9 years ago)

Author:

frodo

Message:

ISA changes

* i2c-isa simplified, by using the addr field in the client structure,

instead of a new field. This means we do not need `struct isa_*'
anymore

* All clients changed to reflect the new isa code. Many are much

simplified now.

Files:

• lm-sensors/trunk/TODO (modified) (1 diff)
• lm-sensors/trunk/kernel/busses/i2c-isa.c (modified) (7 diffs)
• lm-sensors/trunk/kernel/chips/adm9240.c (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/lm78.c (modified) (6 diffs)
• lm-sensors/trunk/kernel/chips/lm80.c (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/sis5595.c (modified) (5 diffs)
• lm-sensors/trunk/kernel/chips/w83781d.c (modified) (6 diffs)
• lm-sensors/trunk/kernel/include/i2c-isa.h (modified) (1 diff)
• lm-sensors/trunk/kernel/sensors.c (modified) (1 diff)
• lm-sensors/trunk/prog/dump/isadump.c (modified) (1 diff)

lm-sensors/trunk/TODO

@@ -7 +7 @@
-* Add code and supporting files to compile modules into the main kernel
-* Write a mkpatch script, as in the i2c tree
-
+
+
-
-KERNEL MODULES

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

@@ -28 +28 @@
-#include <linux/kernel.h>
-
-#include "compat.h"
-
-#include <linux/i2c.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,0,19)
-#include <linux/sched.h>
-#else
-#include <asm/semaphore.h>
-#endif
-
-#include "version.h"
-#include "i2c-isa.h"
-
-
-
-
-
-
-
-
-
+
+
-
-static int isa_init(void);
@@ -58 +45 @@
-
-/* This is the actual algorithm we define */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-};
-
-/* There can only be one... */
-
+
+
+
+
+
+
+
+
+
+
-
-/* Used in isa_init/cleanup */
-static int isa_initialized;
-
-
-
-
+
-{
-
-
-
-
+
+
-#endif
-  return -1;
-}
-
-
-
+
-{
-
-
-
-
+
+
-#endif
-  return -1;
-}
-
-/* Algorithm slave_recv call-back implementation. Can't do that... */
-int isa_slave_recv (struct isa_adapter *adap, char *data, int len)
-{
-#ifdef DEBUG
-  printk("i2c-isa.o: isa_slave_recv called for adapter `%s' "
-         "(no i2c level access possible!)\n",
-         adap->name);
-#endif
-  return -1;
-}
-
-/* Here we can put additional calls to modify the workings of the algorithm.
-   But right now, there is no need for that. */
-int isa_algo_control (struct isa_adapter *adap, unsigned int cmd,
-                       unsigned long arg)
-{
-  return 0;
-}
-
-/* Ehm... This is called when a client is registered to an adapter. We could
-   do all kinds of neat stuff here like, ehm - returning success? */
-int isa_client_register (struct isa_client *client)
-{
-  return 0;
-}
-
-int isa_client_unregister (struct isa_client *client)
-{
-  return 0;
-}
-
@@ -132 +86 @@
-{
-  int res;
-
+2c-i
-#ifdef DEBUG
-  if (isa_initialized) {
@@ -140 +94 @@
-#endif
-  isa_initialized = 0;
-sa
+2c
-    printk("i2c-isa.o: Algorithm registration failed, module not inserted.\n");
-    isa_cleanup();
@@ -146 +100 @@
-  }
-  isa_initialized++;
-
-
-
-
+
-    printk("i2c-isa.o: Adapter registration failed, "
-           "module isa.o is not inserted\n.");
@@ -165 +116 @@
-  if (isa_initialized >= 2)
-  {
-sa
+2c
-      printk("i2c-isa.o: Adapter deregistration failed, module not removed.\n");
-      return res;
@@ -173 +124 @@
-  if (isa_initialized >= 1)
-  {
-sa
+2c
-      printk("i2c-isa.o: Algorithm deregistration failed, module not removed.\n");
-      return res;

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

@@ -272 +272 @@
-static struct i2c_client *adm9240_list[MAX_ADM9240_NR];
-
-/* The driver. I choose to use type i2c_driver, as at is identical to both
-   smbus_driver and isa_driver, and clients could be of either kind */
-static struct i2c_driver adm9240_driver = {
-  /* name */            "ADM9240 sensor driver",

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

@@ -232 +232 @@
-static struct i2c_client *lm78_list[MAX_LM78_NR];
-
-/* The driver. I choose to use type i2c_driver, as at is identical to both
-   smbus_driver and isa_driver, and clients could be of either kind */
-static struct i2c_driver lm78_driver = {
-  /* name */            "LM78(-J) and LM79 sensor driver",
@@ -345 +343 @@
-     But it allows us to access lm78_{read,write}_value. */
-
-sa
+2c
-                                      sizeof(struct i2c_client)) + 
-                              sizeof(struct lm78_data),
@@ -353 +351 @@
-  }
-
-
-
-
-
+
+
-    init_MUTEX(&data->lock);
-
-
-
-
+
-  new_client->data = data;
-  new_client->adapter = adapter;
@@ -486 +479 @@
-
-  if i2c_is_isa_client(client)
-((struct isa_client *)client)->isa_
+client->
-  kfree(client);
-
@@ -527 +520 @@
-  if (i2c_is_isa_client(client)) {
-    down(& (((struct lm78_data *) (client->data)) -> lock));
-(((struct isa_client *) client)->isa_addr)
+client->addr
-               LM78_ADDR_REG_OFFSET);
-(((struct isa_client *) client)->isa_addr)
+client->addr
-                LM78_DATA_REG_OFFSET);
-    up( & (((struct lm78_data *) (client->data)) -> lock));
@@ -548 +541 @@
-  if (i2c_is_isa_client(client)) {
-    down(&(((struct lm78_data *) (client->data)) -> lock));
-((struct isa_client *) client)->isa_
-((struct isa_client *) client)->isa_
+client->
+client->
-    up(&(((struct lm78_data *) (client->data)) -> lock));
-    return 0;

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

@@ -225 +225 @@
-static struct i2c_client *lm80_list[MAX_LM80_NR];
-
-/* The driver. I choose to use type i2c_driver, as at is identical to both
-   smbus_driver and isa_driver, and clients could be of either kind */
-static struct i2c_driver lm80_driver = {
-  /* name */            "LM80 sensor driver",

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

@@ -348 +348 @@
-     But it allows us to access sis5595_{read,write}_value. */
-
-sa
+2c
-                              sizeof(struct sis5595_data),
-                              GFP_KERNEL))) {
@@ -355 +355 @@
-  }
-
-
-
-
+
+
-  init_MUTEX(&data->lock);
-  new_client->data = data;
@@ -458 +457 @@
-  sis5595_list[i] = NULL;
-
-((struct isa_client *)client)->isa_
+client->
-  kfree(client);
-
@@ -496 +495 @@
-    down((struct semaphore *) (client->data));
-    down(& (((struct sis5595_data *) (client->data)) -> lock));
-
-
-
-
+
+
-    up( & (((struct sis5595_data *) (client->data)) -> lock));
-    return res;
@@ -510 +507 @@
-{
-    down(& (((struct sis5595_data *) (client->data)) -> lock));
-((struct isa_client *) client)->isa_
-((struct isa_client *) client)->isa_
+client->
+client->
-    up( & (((struct sis5595_data *) (client->data)) -> lock));
-    return 0;

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

@@ -398 +398 @@
-static struct i2c_client *w83781d_list[MAX_W83781D_NR];
-
-/* The driver. I choose to use type i2c_driver, as at is identical to both
-   smbus_driver and isa_driver, and clients could be of either kind */
-static struct i2c_driver w83781d_driver = {
-  /* name */            "W83781D sensor driver",
@@ -677 +675 @@
-     But it allows us to access w83781d_{read,write}_value. */
-
-
-
+
-                              sizeof(struct w83781d_data),
-                              GFP_KERNEL))) {
@@ -685 +682 @@
-  }
-
-
-
-
-
-
-
-
-
+
+
-  init_MUTEX(&data->lock);
-  new_client->data = data;
@@ -838 +829 @@
-
-  if i2c_is_isa_client(client)
-((struct isa_client *)client)->isa_
+client->
-  kfree(client);
-
@@ -881 +872 @@
-  if (i2c_is_isa_client(client)) {
-    if (reg & 0xff00) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    if (word_sized) {
-
-
-
-
+
+
-    }
-    if (reg & 0xff00) {
-
-
-
-
+
+
-    }
-  } else {
@@ -934 +917 @@
-  if (i2c_is_isa_client(client)) {
-    if (reg & 0xff00) {
-
-
-
-
-
-
-
+
+
+
+
-    if (word_sized) {
-
-
-
-
-
-
-
+
+
+
+
-    if (reg & 0xff00) {
-
-
-
-
+
+
-    }
-  } else {

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

@@ -20 +20 @@
-
-
-
-
+S_ISA
+S_ISA
-
-#ifdef __KERNEL__
-
-/* This file must interface with Simon Vogl's i2c driver. Version 19981006 is
-   OK, earlier versions are not; later versions will probably give problems
-   too. 
-*/
-#include <asm/types.h>
-
-/* I2C_SPINLOCK is defined in i2c.h. */
-#ifdef I2C_SPINLOCK
-#include <asm/spinlock.h>
-#else
-#if LINUX_VERSION_CODE < 0x020019
-#include <linux/sched.h>
-#else
-#include <asm/semaphore.h>
-#endif
-#endif
-
-#include <linux/i2c.h>                  
-
-/* Note that this driver is *not* built upon smbus.c, but is parallel to it.
-   We do not need SMBus facilities if we are on the ISA bus, after all */
-
-/* Declarations, to keep the compiler happy */
-struct isa_driver;
-struct isa_client;
-struct isa_algorithm;
-struct isa_adapter;
-
-/* A driver tells us how we should handle a specific kind of chip.
-   A specific instance of such a chip is called a client.  
-   This structure is essentially the same as i2c_driver. */
-struct isa_driver {
-  char name[32];
-  int id;
-  unsigned int flags;
-  int (* attach_adapter) (struct isa_adapter *);
-  int (* detach_client) (struct isa_client *);
-  int (* command) (struct isa_client *, unsigned int cmd, void *arg);
-  void (* inc_use) (struct isa_client *);
-  void (* dec_use) (struct isa_client *);
-};
-
-/* A client is a specifc instance of a chip: for each detected chip, there will
-   be a client. Its operation is controlled by a driver.
-   This structure is an extension of i2c_client. */
-struct isa_client {
-  char name[32];
-  int id;
-  unsigned int flags;
-  unsigned char addr;
-  struct isa_adapter *adapter;
-  struct isa_driver *driver;
-  void *data;
-
-  /* Here ended i2c_client */
-  unsigned int isa_addr;
-};
-
-/* An algorithm describes how a certain class of busses can be accessed.
-   A specific instance of sucj a bus is called an adapter.
-   This structure is essentially the same as i2c_adapter. */
-struct isa_algorithm {
-  char name[32];
-  unsigned int id;
-  int (* master_xfer) (struct isa_adapter *adap, struct i2c_msg msgs[],
-                       int num);
-  int (* slave_send) (struct isa_adapter *,char *, int);
-  int (* slave_recv) (struct isa_adapter *,char *, int);
-  int (* algo_control) (struct isa_adapter *, unsigned int, unsigned long);
-  int (* client_register) (struct isa_client *);
-  int (* client_unregister) (struct isa_client *);
-};
-
-/* An adapter is a specifc instance of a bus: for each detected bus, there will
-   be an adapter. Its operation is controlled by an algorithm.
-   I2C_SPINLOCK must be the same as declared in i2c.h.
-   This structure is essentially the same as i2c_algorithm. */
-struct isa_adapter {
-  char name[32];
-  unsigned int id;
-  struct isa_algorithm *algo;
-  void *data;
-#ifdef I2C_SPINLOCK
-  spinlock_t lock;
-  unsigned long lockflags;
-#else
-  struct semaphore lock;
-#endif
-  unsigned int flags;
-  struct isa_client *clients[I2C_CLIENT_MAX];
-  int client_count;
-  int timeout;
-  int retries;
-};
-
-
-/* Detect whether we are on the isa bus. If this returns true, all i2c
-
+ 
-#define i2c_is_isa_client(clientptr) \
-
+I2C_
-#define i2c_is_isa_adapter(adapptr) \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-#endif /* def __KERNEL__ */
-
-/* We need to mark ISA algorithms in the algorithm structure. */
-#define ALGO_ISA 0x50000
-
-/* ISA Adapter ids */
-#define ISA_MAIN 1
-
-#endif /* ndef SENSORS_ISA_H */

lm-sensors/trunk/kernel/sensors.c

@@ -129 +129 @@
-
-  if ((res = sensors_create_name(&name,prefix,client->adapter,
-                                 i2c_is_isa_client(client)?
-                                 ((struct isa_client *) client)->isa_addr:
-                                 client->addr)))
-    return res;

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

@@ -25 +25 @@
-
-/* To keep glibc2 happy */
-=
+>
-#include <sys/perm.h>
-#endif