Changeset 33

Timestamp:

12/04/98 16:26:29 (14 years ago)

Author:

frodo

Message:

Corrected LM78 probing.

If your LM78/78-J/79 is still not detected, please recompile lm78.o with
DEBUG=1 and mail the output of dmesg. Same for Winbonds.

Location:

lm-sensors/trunk

Files:

• kernel/chips/lm78.c (modified) (2 diffs)
• src/lm78.c (modified) (2 diffs)

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

@@ -335 +335 @@
     /* Determine exact type */
     outb_p(LM78_REG_CHIPID,address + LM78_ADDR_REG_OFFSET);
-    err = inb_p(address + LM78_DATA_REG_OFFSET);
+    err = inb_p(address + LM78_DATA_REG_OFFSET) & 0xfe;
+    if (err == 0x00) {
+      type = lm78;
+      type_name = "lm78";
+      client_name = "LM78 chip";
+    } else if (err == 0x40) {
+      type = lm78j;
+      type_name = "lm78-j";
+      client_name = "LM78-J chip";
+    } else if (err == 0xc0) {
+      type = lm79;
+      type_name = "lm79";
+      client_name = "LM79 chip";
+    } else {
+#ifdef DEBUG
+      printk("lm78.o: warning: probed non-lm78 chip?!? (%x)\n",err);
+#endif
+      continue;
+    }
+
+    request_region(address, LM78_EXTENT, type_name);
+
+    /* Allocate space for a new client structure */
+    if (! (new_client = kmalloc(sizeof(struct isa_client) + 
+                                sizeof(struct lm78_data),
+                               GFP_KERNEL)))
+    {
+      err=-ENOMEM;
+      goto ERROR1;
+    } 
+
+    /* Fill the new client structure with data */
+    new_client->data = (struct lm78_data *) (new_client + 1);
+    new_client->addr = 0;
+    strcpy(new_client->name,client_name);
+    ((struct lm78_data *) (new_client->data))->type = type;
+    new_client->isa_addr = address;
+    if ((err = lm78_new_client((struct i2c_adapter *) adapter,
+                               (struct i2c_client *) new_client)))
+      goto ERROR2;
+
+    /* Tell i2c-core a new client has arrived */
+    if ((err = isa_attach_client(new_client)))
+      goto ERROR3;
+    
+    /* Register a new directory entry with module sensors */
+    if ((err = sensors_register_entry((struct i2c_client *) new_client,
+                                      type_name,
+                                      lm78_dir_table_template)) < 0)
+      goto ERROR4;
+    ((struct lm78_data *) (new_client->data)) -> sysctl_id = err;
+
+    /* Initialize the LM78 chip */
+    lm78_init_client((struct i2c_client *) new_client);
+    continue;
+
+/* OK, this is not exactly good programming practice, usually. But it is
+   very code-efficient in this case. */
+
+ERROR4:
+    isa_detach_client(new_client);
+ERROR3:
+    lm78_remove_client((struct i2c_client *) new_client);
+ERROR2:
+    kfree(new_client);
+ERROR1:
+    release_region(address, LM78_EXTENT);
+  }
+  return err;
+
+}
+
+/* Deregister and remove a LM78 client */
+int lm78_detach_isa(struct isa_client *client)
+{
+  int err,i;
+  for (i = 0; i < MAX_LM78_NR; i++)
+    if ((client == (struct isa_client *) (lm78_list[i])))
+      break;
+  if (i == MAX_LM78_NR) {
+    printk("lm78.o: Client to detach not found.\n");
+    return -ENOENT;
+  }
+
+  sensors_deregister_entry(((struct lm78_data *)(client->data))->sysctl_id);
+
+  if ((err = isa_detach_client(client))) {
+    printk("lm78.o: Client deregistration failed, client not detached.\n");
+    return err;
+  }
+  lm78_remove_client((struct i2c_client *) client);
+  release_region(client->isa_addr,LM78_EXTENT);
+  kfree(client);
+  return 0;
+}
+
+int lm78_detect_smbus(struct i2c_adapter *adapter)
+{
+  int address,err;
+  struct i2c_client *new_client;
+  enum lm78_type type;
+  const char *type_name,*client_name;
+
+  /* OK, this is no detection. I know. It will do for now, though.  */
+  err = 0;
+  for (address = 0x20; (! err) && (address <= 0x2f); address ++) {
+
+    /* Later on, we will keep a list of registered addresses for each
+       adapter, and check whether they are used here */
+
+    if (smbus_read_byte_data(adapter,address,LM78_REG_CONFIG) == 0xff) 
+      continue;
+
+    /* Real detection code goes here */
+
+    /* Determine exact type */
+    err = smbus_read_byte_data(adapter,address,LM78_REG_CHIPID) & 0xfe;
     if (err == 0x00) {
       type = lm78;
@@ -348 +464 @@
       type_name = "lm79";
       client_name = "LM79 chip";
-    }
-    else
+    } else {
+#ifdef DEBUG
+      printk("lm78.o: warning: probed non-lm78 chip?!? (%x)\n",err);
+#endif
       continue;
-      
-
-    request_region(address, LM78_EXTENT, type_name);
-
-    /* Allocate space for a new client structure */
-    if (! (new_client = kmalloc(sizeof(struct isa_client) + 
-                                sizeof(struct lm78_data),
-                               GFP_KERNEL)))
-    {
-      err=-ENOMEM;
-      goto ERROR1;
-    } 
-
-    /* Fill the new client structure with data */
-    new_client->data = (struct lm78_data *) (new_client + 1);
-    new_client->addr = 0;
-    strcpy(new_client->name,client_name);
-    ((struct lm78_data *) (new_client->data))->type = type;
-    new_client->isa_addr = address;
-    if ((err = lm78_new_client((struct i2c_adapter *) adapter,
-                               (struct i2c_client *) new_client)))
-      goto ERROR2;
-
-    /* Tell i2c-core a new client has arrived */
-    if ((err = isa_attach_client(new_client)))
-      goto ERROR3;
-    
-    /* Register a new directory entry with module sensors */
-    if ((err = sensors_register_entry((struct i2c_client *) new_client,
-                                      type_name,
-                                      lm78_dir_table_template)) < 0)
-      goto ERROR4;
-    ((struct lm78_data *) (new_client->data)) -> sysctl_id = err;
-
-    /* Initialize the LM78 chip */
-    lm78_init_client((struct i2c_client *) new_client);
-    continue;
-
-/* OK, this is not exactly good programming practice, usually. But it is
-   very code-efficient in this case. */
-
-ERROR4:
-    isa_detach_client(new_client);
-ERROR3:
-    lm78_remove_client((struct i2c_client *) new_client);
-ERROR2:
-    kfree(new_client);
-ERROR1:
-    release_region(address, LM78_EXTENT);
-  }
-  return err;
-
-}
-
-/* Deregister and remove a LM78 client */
-int lm78_detach_isa(struct isa_client *client)
-{
-  int err,i;
-  for (i = 0; i < MAX_LM78_NR; i++)
-    if ((client == (struct isa_client *) (lm78_list[i])))
-      break;
-  if (i == MAX_LM78_NR) {
-    printk("lm78.o: Client to detach not found.\n");
-    return -ENOENT;
-  }
-
-  sensors_deregister_entry(((struct lm78_data *)(client->data))->sysctl_id);
-
-  if ((err = isa_detach_client(client))) {
-    printk("lm78.o: Client deregistration failed, client not detached.\n");
-    return err;
-  }
-  lm78_remove_client((struct i2c_client *) client);
-  release_region(client->isa_addr,LM78_EXTENT);
-  kfree(client);
-  return 0;
-}
-
-int lm78_detect_smbus(struct i2c_adapter *adapter)
-{
-  int address,err;
-  struct i2c_client *new_client;
-  enum lm78_type type;
-  const char *type_name,*client_name;
-
-  /* OK, this is no detection. I know. It will do for now, though.  */
-  err = 0;
-  for (address = 0x20; (! err) && (address <= 0x2f); address ++) {
-
-    /* Later on, we will keep a list of registered addresses for each
-       adapter, and check whether they are used here */
-
-    if (smbus_read_byte_data(adapter,address,LM78_REG_CONFIG) == 0xff) 
-      continue;
-
-    /* Real detection code goes here */
-
-    /* Determine exact type */
-    err = smbus_read_byte_data(adapter,address,LM78_REG_CHIPID);
-    if (err == 0x00) {
-      type = lm78;
-      type_name = "lm78";
-      client_name = "LM78 chip";
-    } else if (err == 0x40) {
-      type = lm78j;
-      type_name = "lm78-j";
-      client_name = "LM78-J chip";
-    } else if (err == 0x80) {
-      type = lm79;
-      type_name = "lm79";
-      client_name = "LM79 chip";
-    } else
-      continue;
+    }
 
 

lm-sensors/trunk/src/lm78.c

@@ -335 +335 @@
     /* Determine exact type */
     outb_p(LM78_REG_CHIPID,address + LM78_ADDR_REG_OFFSET);
-    err = inb_p(address + LM78_DATA_REG_OFFSET);
+    err = inb_p(address + LM78_DATA_REG_OFFSET) & 0xfe;
+    if (err == 0x00) {
+      type = lm78;
+      type_name = "lm78";
+      client_name = "LM78 chip";
+    } else if (err == 0x40) {
+      type = lm78j;
+      type_name = "lm78-j";
+      client_name = "LM78-J chip";
+    } else if (err == 0xc0) {
+      type = lm79;
+      type_name = "lm79";
+      client_name = "LM79 chip";
+    } else {
+#ifdef DEBUG
+      printk("lm78.o: warning: probed non-lm78 chip?!? (%x)\n",err);
+#endif
+      continue;
+    }
+
+    request_region(address, LM78_EXTENT, type_name);
+
+    /* Allocate space for a new client structure */
+    if (! (new_client = kmalloc(sizeof(struct isa_client) + 
+                                sizeof(struct lm78_data),
+                               GFP_KERNEL)))
+    {
+      err=-ENOMEM;
+      goto ERROR1;
+    } 
+
+    /* Fill the new client structure with data */
+    new_client->data = (struct lm78_data *) (new_client + 1);
+    new_client->addr = 0;
+    strcpy(new_client->name,client_name);
+    ((struct lm78_data *) (new_client->data))->type = type;
+    new_client->isa_addr = address;
+    if ((err = lm78_new_client((struct i2c_adapter *) adapter,
+                               (struct i2c_client *) new_client)))
+      goto ERROR2;
+
+    /* Tell i2c-core a new client has arrived */
+    if ((err = isa_attach_client(new_client)))
+      goto ERROR3;
+    
+    /* Register a new directory entry with module sensors */
+    if ((err = sensors_register_entry((struct i2c_client *) new_client,
+                                      type_name,
+                                      lm78_dir_table_template)) < 0)
+      goto ERROR4;
+    ((struct lm78_data *) (new_client->data)) -> sysctl_id = err;
+
+    /* Initialize the LM78 chip */
+    lm78_init_client((struct i2c_client *) new_client);
+    continue;
+
+/* OK, this is not exactly good programming practice, usually. But it is
+   very code-efficient in this case. */
+
+ERROR4:
+    isa_detach_client(new_client);
+ERROR3:
+    lm78_remove_client((struct i2c_client *) new_client);
+ERROR2:
+    kfree(new_client);
+ERROR1:
+    release_region(address, LM78_EXTENT);
+  }
+  return err;
+
+}
+
+/* Deregister and remove a LM78 client */
+int lm78_detach_isa(struct isa_client *client)
+{
+  int err,i;
+  for (i = 0; i < MAX_LM78_NR; i++)
+    if ((client == (struct isa_client *) (lm78_list[i])))
+      break;
+  if (i == MAX_LM78_NR) {
+    printk("lm78.o: Client to detach not found.\n");
+    return -ENOENT;
+  }
+
+  sensors_deregister_entry(((struct lm78_data *)(client->data))->sysctl_id);
+
+  if ((err = isa_detach_client(client))) {
+    printk("lm78.o: Client deregistration failed, client not detached.\n");
+    return err;
+  }
+  lm78_remove_client((struct i2c_client *) client);
+  release_region(client->isa_addr,LM78_EXTENT);
+  kfree(client);
+  return 0;
+}
+
+int lm78_detect_smbus(struct i2c_adapter *adapter)
+{
+  int address,err;
+  struct i2c_client *new_client;
+  enum lm78_type type;
+  const char *type_name,*client_name;
+
+  /* OK, this is no detection. I know. It will do for now, though.  */
+  err = 0;
+  for (address = 0x20; (! err) && (address <= 0x2f); address ++) {
+
+    /* Later on, we will keep a list of registered addresses for each
+       adapter, and check whether they are used here */
+
+    if (smbus_read_byte_data(adapter,address,LM78_REG_CONFIG) == 0xff) 
+      continue;
+
+    /* Real detection code goes here */
+
+    /* Determine exact type */
+    err = smbus_read_byte_data(adapter,address,LM78_REG_CHIPID) & 0xfe;
     if (err == 0x00) {
       type = lm78;
@@ -348 +464 @@
       type_name = "lm79";
       client_name = "LM79 chip";
-    }
-    else
+    } else {
+#ifdef DEBUG
+      printk("lm78.o: warning: probed non-lm78 chip?!? (%x)\n",err);
+#endif
       continue;
-      
-
-    request_region(address, LM78_EXTENT, type_name);
-
-    /* Allocate space for a new client structure */
-    if (! (new_client = kmalloc(sizeof(struct isa_client) + 
-                                sizeof(struct lm78_data),
-                               GFP_KERNEL)))
-    {
-      err=-ENOMEM;
-      goto ERROR1;
-    } 
-
-    /* Fill the new client structure with data */
-    new_client->data = (struct lm78_data *) (new_client + 1);
-    new_client->addr = 0;
-    strcpy(new_client->name,client_name);
-    ((struct lm78_data *) (new_client->data))->type = type;
-    new_client->isa_addr = address;
-    if ((err = lm78_new_client((struct i2c_adapter *) adapter,
-                               (struct i2c_client *) new_client)))
-      goto ERROR2;
-
-    /* Tell i2c-core a new client has arrived */
-    if ((err = isa_attach_client(new_client)))
-      goto ERROR3;
-    
-    /* Register a new directory entry with module sensors */
-    if ((err = sensors_register_entry((struct i2c_client *) new_client,
-                                      type_name,
-                                      lm78_dir_table_template)) < 0)
-      goto ERROR4;
-    ((struct lm78_data *) (new_client->data)) -> sysctl_id = err;
-
-    /* Initialize the LM78 chip */
-    lm78_init_client((struct i2c_client *) new_client);
-    continue;
-
-/* OK, this is not exactly good programming practice, usually. But it is
-   very code-efficient in this case. */
-
-ERROR4:
-    isa_detach_client(new_client);
-ERROR3:
-    lm78_remove_client((struct i2c_client *) new_client);
-ERROR2:
-    kfree(new_client);
-ERROR1:
-    release_region(address, LM78_EXTENT);
-  }
-  return err;
-
-}
-
-/* Deregister and remove a LM78 client */
-int lm78_detach_isa(struct isa_client *client)
-{
-  int err,i;
-  for (i = 0; i < MAX_LM78_NR; i++)
-    if ((client == (struct isa_client *) (lm78_list[i])))
-      break;
-  if (i == MAX_LM78_NR) {
-    printk("lm78.o: Client to detach not found.\n");
-    return -ENOENT;
-  }
-
-  sensors_deregister_entry(((struct lm78_data *)(client->data))->sysctl_id);
-
-  if ((err = isa_detach_client(client))) {
-    printk("lm78.o: Client deregistration failed, client not detached.\n");
-    return err;
-  }
-  lm78_remove_client((struct i2c_client *) client);
-  release_region(client->isa_addr,LM78_EXTENT);
-  kfree(client);
-  return 0;
-}
-
-int lm78_detect_smbus(struct i2c_adapter *adapter)
-{
-  int address,err;
-  struct i2c_client *new_client;
-  enum lm78_type type;
-  const char *type_name,*client_name;
-
-  /* OK, this is no detection. I know. It will do for now, though.  */
-  err = 0;
-  for (address = 0x20; (! err) && (address <= 0x2f); address ++) {
-
-    /* Later on, we will keep a list of registered addresses for each
-       adapter, and check whether they are used here */
-
-    if (smbus_read_byte_data(adapter,address,LM78_REG_CONFIG) == 0xff) 
-      continue;
-
-    /* Real detection code goes here */
-
-    /* Determine exact type */
-    err = smbus_read_byte_data(adapter,address,LM78_REG_CHIPID);
-    if (err == 0x00) {
-      type = lm78;
-      type_name = "lm78";
-      client_name = "LM78 chip";
-    } else if (err == 0x40) {
-      type = lm78j;
-      type_name = "lm78-j";
-      client_name = "LM78-J chip";
-    } else if (err == 0x80) {
-      type = lm79;
-      type_name = "lm79";
-      client_name = "LM79 chip";
-    } else
-      continue;
+    }