Changeset 341

Timestamp:

03/24/99 22:28:22 (10 years ago)

Author:

frodo

Message:

Taught the w83781d module about insmod parameters

Also fixed a small lm78 problem and synchronised the detect script with
the Winbond detection.

Files:

• lm-sensors/trunk/kernel/chips/lm78.c (modified) (2 diffs)
• lm-sensors/trunk/kernel/chips/w83781d.c (modified) (35 diffs)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (6 diffs)

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

@@ -42 +42 @@
-/* Insmod parameters */
-SENSORS_INSMOD_3(lm78,lm78j,lm79);
+
-/* Many LM78 constants specified below */
-
@@ -323 +324 @@
-      /* We need the timeouts for at least some LM78-like chips. But only
-         if we read 'undefined' registers. */
-      if (check_region(address,LM78_EXTENT))
-        goto ERROR0;
-      i = inb_p(address + 1);
-      if (inb_p(address + 2) != i)

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

@@ -49 +49 @@
-#undef W83781D_RT
-
+/* Addresses to scan */
+static unsigned short normal_i2c[] = {SENSORS_I2C_END};
+static unsigned short normal_i2c_range[] = {0x20,0x2f,SENSORS_I2C_END};
+static unsigned int normal_isa[] = {0x0290,SENSORS_ISA_END};
+static unsigned int normal_isa_range[] = {SENSORS_ISA_END};
+
+/* Insmod parameters */
+SENSORS_INSMOD_3(w83781d,w83782d,w83783s);
+
-/* Many W83781D constants specified below */
-
@@ -106 +115 @@
-#define W83781D_REG_PWMCLK12 0x5C
-#define W83781D_REG_PWMCLK34 0x45C
-
+
+
-#define W83781D_REG_PWM(nr) (regpwm[(nr) - 1])
+
+#define W83781D_REG_I2C_ADDR 0x48
-
-/* The following are undocumented in the data sheets however we
@@ -121 +133 @@
-#define W83781D_REG_RT_IDX 0x50
-#define W83781D_REG_RT_VAL 0x51
-
-#define W83781D_WCHIPID 0x10
-#define W83782D_WCHIPID 0x30
-#define W83783S_WCHIPID 0x40
-
-
-/* Conversions. Rounding is only done on the TO_REG variants. */
@@ -291 +298 @@
-         struct semaphore lock;
-         int sysctl_id;
+         enum chips type;
-
-         struct semaphore update_lock;
@@ -296 +304 @@
-         unsigned long last_updated; /* In jiffies */
-
-and
-and
-and
+&
+&
+&
-         u8 fan[3];                  /* Register value */
-         u8 fan_min[3];              /* Register value */
@@ -304 +312 @@
-         u8 temp_over;               /* Register value */
-         u8 temp_hyst;               /* Register value */
- 
+
-         u16 temp_add_over[2];       /* Register value */
-         u16 temp_add_hyst[2];       /* Register value */
@@ -312 +320 @@
-         u16 beeps;                  /* Register encoding, combined */
-         u8 beep_enable;             /* Boolean */
-         u8 wchipid;                 /* Register value */
-         u8 pwm[4];                  /* Register value */                               
-         u16 sens[3];                /* 782D/783S only.
-                                        1 = pentium diode; 2 = 3904 diode;
-                                        3000-5000 = thermistor beta.
-
+
+
-#ifdef W83781D_RT
-         u8 rt[3][32];               /* Register value */
@@ -328 +336 @@
-
-static int w83781d_attach_adapter(struct i2c_adapter *adapter);
-
-
+
-static int w83781d_detach_client(struct i2c_client *client);
-static int w83781d_detach_isa(struct isa_client *client);
-static int w83781d_detach_smbus(struct i2c_client *client);
-static int w83781d_new_client(struct i2c_adapter *adapter,
-                           struct i2c_client *new_client);
-static void w83781d_remove_client(struct i2c_client *client);
-static int w83781d_command(struct i2c_client *client, unsigned int cmd, 
-                        void *arg);
@@ -376 +378 @@
-   allocation could also be used; the code needed for this would probably
-   take more memory than the datastructure takes now. */
-4
+8
-static struct i2c_client *w83781d_list[MAX_W83781D_NR];
-
@@ -607 +609 @@
-int w83781d_attach_adapter(struct i2c_adapter *adapter)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /* mask off lower bit, not reliable */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    request_region(address, W83781D_EXTENT, type_name);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  for(i = 0; i < MAX_W83781D_NR; i++)
-    if (! w83781d_list[i])
@@ -888 +750 @@
-    printk("w83781d.o: No empty slots left, recompile and heighten "
-           "MAX_W83781D_NR!\n");
-return
-}
-
+err =
+  goto ERROR2;
+}
-  w83781d_list[i] = new_client;
-  new_client->id = i;
-  new_client->adapter = adapter;
-  new_client->driver = &w83781d_driver;
-  data = new_client->data;
-  data->valid = 0;
-  data->lock = MUTEX;
-  data->update_lock = MUTEX;
+
+  /* Tell the I2C layer a new client has arrived */
+  if ((err = i2c_attach_client(new_client)))
+    goto ERROR3;
+
+  /* Register a new directory entry with module sensors */
+  if ((i = sensors_register_entry((struct i2c_client *) new_client,
+                                  type_name,
+                                  kind == w83781d?w83781d_dir_table_template:
+                                  kind == w83783s?w83783s_dir_table_template:
+                                  is_isa?w83782d_i2c_dir_table_template:
+                                         w83782d_isa_dir_table_template)) < 0) {
+    err = i;
+    goto ERROR4;
+  }
+  data->sysctl_id = i;
+
+  /* Initialize the Winbond chip */
+  w83781d_init_client(new_client);
-  return 0;
-
-
-
-
-
-
+
+
+
+
+
+
+
-  for (i = 0; i < MAX_W83781D_NR; i++)
-client == w83781d_list[i]) 
+new_client == w83781d_list[i])
-      w83781d_list[i] = NULL;
+ERROR2:
+  if (is_isa)
+    release_region(address,W83781D_EXTENT);
+ERROR1:
+  kfree(new_client);
+ERROR0:
+  return err;
+}
+
+int w83781d_detach_client(struct i2c_client *client)
+{
+  int err,i;
+
+  sensors_deregister_entry(((struct w83781d_data *)(client->data))->sysctl_id);
+
+  if ((err = i2c_detach_client(client))) {
+    printk("w83781d.o: Client deregistration failed, client not detached.\n");
+    return err;
+  }
+
+  for (i = 0; i < MAX_W83781D_NR; i++)
+    if (client == w83781d_list[i])
+      break;
+  if (i == MAX_W83781D_NR) {
+    printk("w83781d.o: Client to detach not found.\n");
+    return -ENOENT;
+  }
+  w83781d_list[i] = NULL;
+
+  if i2c_is_isa_client(client)
+    release_region(((struct isa_client *)client)->isa_addr,W83781D_EXTENT);
+  kfree(client);
+
+  return 0;
-}
-
@@ -931 +843 @@
-}
- 
-
-/* The SMBus locks itself, usually, but nothing may access the Winbond between
-   bank switches. ISA access must always be locked explicitely! 
@@ -946 +857 @@
-                                  ((reg & 0x00ff) == 0x53) || 
-                                  ((reg & 0x00ff) == 0x55));
-(struct semaphore *) (client->data
+& (((struct w83781d_data *) (client->data)) -> lock
-  if (i2c_is_isa_client(client)) {
-    if (reg & 0xff00) {
@@ -981 +892 @@
-      smbus_write_byte_data(client->adapter,client->addr,W83781D_REG_BANK,0);
-  }
-(struct semaphore *) (client->data
+ & (((struct w83781d_data *) (client->data)) -> lock
-  return res;
-}
@@ -999 +910 @@
-                                  ((reg & 0x00ff) == 0x53) || 
-                                  ((reg & 0x00ff) == 0x55));
-(struct semaphore *) (client->data
+ & (((struct w83781d_data *) (client->data)) -> lock
-  if (i2c_is_isa_client(client)) {
-    if (reg & 0xff00) {
@@ -1035 +946 @@
-      smbus_write_byte_data(client->adapter,client->addr,W83781D_REG_BANK,0);
-  }
-(struct semaphore *) (client->data
+ & (((struct w83781d_data *) (client->data)) -> lock
-  return 0;
-}
@@ -1043 +954 @@
-{
-  struct w83781d_data *data = client->data;
-wchipid
-i
+i
+type = data->type
-  u8 tmp;
-
-  wchipid = data->wchipid;
-  /* Reset all except Watchdog values and last conversion values
-     This sets fan-divs to 2, among others */
@@ -1056 +966 @@
-  vid = VID_FROM_REG(vid);
-
-(wchipid != W83781D_WCHIPID
+ (type != w83781d
-    tmp = w83781d_read_value(client,W83781D_REG_SCFG1);
-    for (i = 1; i <= 3; i++) {
@@ -1067 +977 @@
-          data->sens[i-1] = 2;
-      }
-data->wchipid == W83783S_WCHIPID && i == 2
+(type == w83783s) && (i == 2)
-        break;
-    }
@@ -1081 +991 @@
-*/
-
-wchipid == W83781D_WCHIPID
+type == w83781d
-    u16 k = 0;
-/*
@@ -1101 +1011 @@
-  w83781d_write_value(client,W83781D_REG_IN_MAX(0),
-                      IN_TO_REG(W83781D_INIT_IN_MAX_0,0));
-wchipid != W83783S_WCHIPID
+type != w83783s
-    w83781d_write_value(client,W83781D_REG_IN_MIN(1),
-                        IN_TO_REG(W83781D_INIT_IN_MIN_1,1));
@@ -1107 +1017 @@
-                        IN_TO_REG(W83781D_INIT_IN_MAX_1,1));
-  }
+
-  w83781d_write_value(client,W83781D_REG_IN_MIN(2),
-                      IN_TO_REG(W83781D_INIT_IN_MIN_2,2));
@@ -1119 +1030 @@
-  w83781d_write_value(client,W83781D_REG_IN_MAX(4),
-                      IN_TO_REG(W83781D_INIT_IN_MAX_4,4));
-(wchipid == W83781D_WCHIPID
+ (type == w83781d
-    w83781d_write_value(client,W83781D_REG_IN_MIN(5),
-                        IN_TO_REG(W83781D_INIT_IN_MIN_5,5));
@@ -1130 +1041 @@
-                        IN_TO_REG(W83782D_INIT_IN_MAX_5,5));
-  }
-(wchipid == W83781D_WCHIPID
+ (type == w83781d
-    w83781d_write_value(client,W83781D_REG_IN_MIN(6),
-                        IN_TO_REG(W83781D_INIT_IN_MIN_6,6));
@@ -1141 +1052 @@
-                        IN_TO_REG(W83782D_INIT_IN_MAX_6,6));
-  }
-(wchipid == W83782D_WCHIPID
+ (type == w83782d
-    w83781d_write_value(client,W83781D_REG_IN_MIN(7),
-                        IN_TO_REG(W83781D_INIT_IN_MIN_7,7));
@@ -1170 +1081 @@
-  w83781d_write_value(client,W83781D_REG_TEMP2_CONFIG,0x00);
-
-(wchipid != W83783S_WCHIPID
+ (type != w83783s
-    w83781d_write_value(client,W83781D_REG_TEMP3_OVER,
-                        TEMP_ADD_TO_REG(W83781D_INIT_TEMP3_OVER));
@@ -1198 +1109 @@
-#endif
-    for (i = 0; i <= 8; i++) {
-data->wchipid == W83783S_WCHIPID  &&  i == 1
+(data->type == w83783s)  &&  (i == 1)
-        continue; /* 783S has no in1 */
-      data->in[i]     = w83781d_read_value(client,W83781D_REG_IN(i));
-      data->in_min[i] = w83781d_read_value(client,W83781D_REG_IN_MIN(i));
-      data->in_max[i] = w83781d_read_value(client,W83781D_REG_IN_MAX(i));
-data->wchipid != W83782D_WCHIPID  &&  i == 6
+(data->type != w83782d)  &&  (i == 6)
-        break;
-    }
@@ -1210 +1121 @@
-      data->fan_min[i-1] = w83781d_read_value(client,W83781D_REG_FAN_MIN(i));
-    }
-wchipid != W83781D_WCHIPID
+type != w83781d
-      for (i = 1; i <= 4; i++) {
-        data->pwm[i-1] = w83781d_read_value(client,W83781D_REG_PWM(i));
-data->wchipid == W83783S_WCHIPID
-data->wchipid == W83782D_WCHIPID
+(data->type == w83783s)
+(data->type == w83782d)
-          &&  i == 2)
-          break;
-      }
-    }
+
-    data->temp = w83781d_read_value(client,W83781D_REG_TEMP);
-    data->temp_over = w83781d_read_value(client,W83781D_REG_TEMP_OVER);
@@ -1233 +1145 @@
-    data->fan_div[0] = (i >> 4) & 0x03;
-    data->fan_div[1] = i >> 6;
-
-
+
+
+
-    }
-    data->alarms = w83781d_read_value(client,W83781D_REG_ALARM1) +
-                   (w83781d_read_value(client,W83781D_REG_ALARM2) << 8);
-(data->wchipid == W83782D_WCHIPID
+ (data->type == w83782d
-      data->alarms |= w83781d_read_value(client,W83781D_REG_ALARM3) << 16;
-    }
@@ -1316 +1229 @@
-}
-
-
-void w83781d_temp(struct i2c_client *client, int operation, int ctl_name,
-               int *nrels_mag, long *results)
@@ -1340 +1252 @@
-  }
-}
-
-
-void w83781d_temp_add(struct i2c_client *client, int operation, int ctl_name,
@@ -1495 +1406 @@
-    if (*nrels_mag >= 1) {
-      switch(results[0]) {
-                                
+                         
-          tmp = w83781d_read_value(client,W83781D_REG_SCFG1);
-          w83781d_write_value(client,W83781D_REG_SCFG1, tmp | BIT_SCFG2[nr-1]);
@@ -1502 +1413 @@
-          data->sens[nr-1] = results[0];
-          break;
-                                
+                         
-          tmp = w83781d_read_value(client,W83781D_REG_SCFG1);
-          w83781d_write_value(client,W83781D_REG_SCFG1, tmp | BIT_SCFG2[nr-1]);
-          tmp = w83781d_read_value(client,W83781D_REG_SCFG2);
-
+
+
-          data->sens[nr-1] = results[0];
-          break;
-    
+     
-          tmp = w83781d_read_value(client,W83781D_REG_SCFG1);
-
+
+
-          data->sens[nr-1] = results[0];
-          break;
-        default:
-
+
+
-          break;
-      }
@@ -1574 +1488 @@
-#ifdef MODULE
-
-
+
+
-MODULE_DESCRIPTION("W83781D driver");
-
@@ -1589 +1504 @@
-#endif /* MODULE */
-
+
+
+    

lm-sensors/trunk/prog/detect/sensors-detect

@@ -157 +157 @@
-       i2c_addrs => [0x00..0x7f], 
-       i2c_detect => sub { w83781d_detect 0, @_},
+       i2c_driver_addrs => [0x20..0x2f], 
-       isa_addrs => [0x290],
-       isa_detect => sub { w83781d_isa_detect 0, @_ },
@@ -165 +166 @@
-       driver => "w83781d",
-       i2c_addrs => [0x00..0x7f], 
+       i2c_driver_addrs => [0x20..0x2f], 
-       i2c_detect => sub { w83781d_detect 1, @_},
-     } ,
@@ -171 +173 @@
-       driver => "w83781d",
-       i2c_addrs => [0x00..0x7f], 
+       i2c_driver_addrs => [0x20..0x2f], 
-       i2c_detect => sub { w83781d_detect 2, @_},
-       isa_addrs => [0x290],
@@ -1175 +1178 @@
-                (($reg1 & 0x80) == 0x80 and $reg2 == 0x5c);
-  return unless ($reg1 & 0x07) == 0x00;
-
+ 
-  return if $chip == 0 and  $reg1 != 0x10;
-  return if $chip == 1 and  $reg1 != 0x30;
@@ -1208 +1211 @@
-{
-  my ($chip,$addr) = @_ ;
-  my ($reg1,$reg2);
-  my $val = inb ($addr + 1);
- 
+
-            inb ($addr + 7) != $val;
-
@@ -1226 +1228 @@
-                (($reg1 & 0x80) == 0x80 and $reg2 == 0x5c);
-  return unless ($reg1 & 0x07) == 0x00;
-
-($reg1 & 0xfe)
+ & 0xfe
+$reg1
-  return if $chip == 1 and  $reg1 != 0x30;
-  return if $chip == 2 and  $reg1 != 0x40;