Changeset 313

Timestamp:

03/14/99 05:09:35 (14 years ago)

Author:

mds

Message:

added fan3 for 782d, didn't realize it is just like 781d.
removed in1 and added in6 for 783s to keep compatibility
with 781d/782d. So 783s has no in1. sorry.

Location:

lm-sensors/trunk

Files:

• kernel/chips/w83781d.c (modified) (7 diffs)
• prog/sensors/chips.c (modified) (2 diffs)

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

@@ -26 +26 @@
     Chip        #vin    #fanin  #pwm    #temp   wchipid i2c     ISA
     w83781d     7       3       0       3       0x10    yes     yes
-    w83782d     9       2-3     2-4     3       0x30    yes     yes
+    w83782d     9       3       2-4     3       0x30    yes     yes
     w83783s     5-6     3       2       1-2     0x40    yes     no
 
-    To do: PWM enable, clock, duty cycle
-           782d beep 3 register
-           782d programmable pins
-           783s pin programmable for vin or temp. assume both now! no way to set.
+    To do:
+     782d/783s PWM enable, clock select, duty cycle
+     782d beep 3 register
+     782d programmable pins
+     783s pin is programmable for -5V or temp1; defaults to -5V,
+          no control in driver so temp1 doesn't work.
+     783s temp2 (labeled as temp1 in data sheet) at different location
+          than 781d/782d, not implemented yet.
 */
 
@@ -411 +415 @@
   { W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &sensors_proc_real,
     &sensors_sysctl_real, NULL, &w83781d_fan },
+  { W83781D_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &sensors_proc_real,
+    &sensors_sysctl_real, NULL, &w83781d_fan },
   { W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &sensors_proc_real,
     &sensors_sysctl_real, NULL, &w83781d_temp },
@@ -431 +437 @@
   { W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real,
     &sensors_sysctl_real, NULL, &w83781d_in },
-  { W83781D_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real,
-    &sensors_sysctl_real, NULL, &w83781d_in },
+  /* no in1 to maintain compatibility with 781d and 782d. */
   { W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real,
     &sensors_sysctl_real, NULL, &w83781d_in },
@@ -440 +445 @@
     &sensors_sysctl_real, NULL, &w83781d_in },
   { W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &sensors_proc_real,
+    &sensors_sysctl_real, NULL, &w83781d_in },
+  { W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &sensors_proc_real,
     &sensors_sysctl_real, NULL, &w83781d_in },
   { W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &sensors_proc_real,
@@ -971 +978 @@
   w83781d_write_value(client,W83781D_REG_FAN_MIN(2),
                       FAN_TO_REG(W83781D_INIT_FAN_MIN_2,2));
-  if(wchipid != W83782D_WCHIPID) {
-    w83781d_write_value(client,W83781D_REG_FAN_MIN(3),
-                        FAN_TO_REG(W83781D_INIT_FAN_MIN_3,2));
-  }
+  w83781d_write_value(client,W83781D_REG_FAN_MIN(3),
+                      FAN_TO_REG(W83781D_INIT_FAN_MIN_3,2));
 
   w83781d_write_value(client,W83781D_REG_TEMP_OVER,
@@ -1016 +1021 @@
 #endif
     for (i = 0; i <= 8; i++) {
+      if(data->wchipid == W83783S_WCHIPID  &&  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));
-      if((data->wchipid == W83783S_WCHIPID  &&  i == 5) ||
-         (data->wchipid == W83781D_WCHIPID  &&  i == 6))
+      if(data->wchipid != W83782D_WCHIPID  &&  i == 6)
         break;
     }
@@ -1026 +1032 @@
       data->fan[i-1] = w83781d_read_value(client,W83781D_REG_FAN(i));
       data->fan_min[i-1] = w83781d_read_value(client,W83781D_REG_FAN_MIN(i));
-      if(data->wchipid == W83783S_WCHIPID  &&  i == 2)
-        break;
     }
     data->temp = w83781d_read_value(client,W83781D_REG_TEMP);

lm-sensors/trunk/prog/sensors/chips.c

@@ -562 +562 @@
     printf("ERROR: Can't get IN0 data!\n");
   free_the_label(&label);
-  if (!sensors_get_label(*name,SENSORS_W83781D_IN1,&label) &&
-      !sensors_get_feature(*name,SENSORS_W83781D_IN1,&cur) &&
-      !sensors_get_feature(*name,SENSORS_W83781D_IN1_MIN,&min) &&
-      !sensors_get_feature(*name,SENSORS_W83781D_IN1_MAX,&max)) {
-    print_label(label,10);
-    printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)       %s  %s\n",
-           cur,min,max,alarms&W83781D_ALARM_IN1?"ALARM":"     ",
-           beeps&W83781D_ALARM_IN1?"(beep)":"");
-  } else
-    printf("ERROR: Can't get IN1 data!\n");
-  free_the_label(&label);
+  if (!is83s) {
+    if (!sensors_get_label(*name,SENSORS_W83781D_IN1,&label) &&
+        !sensors_get_feature(*name,SENSORS_W83781D_IN1,&cur) &&
+        !sensors_get_feature(*name,SENSORS_W83781D_IN1_MIN,&min) &&
+        !sensors_get_feature(*name,SENSORS_W83781D_IN1_MAX,&max)) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)       %s  %s\n",
+             cur,min,max,alarms&W83781D_ALARM_IN1?"ALARM":"     ",
+             beeps&W83781D_ALARM_IN1?"(beep)":"");
+    } else
+      printf("ERROR: Can't get IN1 data!\n");
+    free_the_label(&label);
+  }
   if (!sensors_get_label(*name,SENSORS_W83781D_IN2,&label) &&
       !sensors_get_feature(*name,SENSORS_W83781D_IN2,&cur) &&
@@ -677 +679 @@
     printf("ERROR: Can't get FAN2 data!\n");
   free_the_label(&label);
-  if (!is82d) {
-    if (!sensors_get_label(*name,SENSORS_W83781D_FAN3,&label) &&
-        !sensors_get_feature(*name,SENSORS_W83781D_FAN3,&cur) &&
-        !sensors_get_feature(*name,SENSORS_W83781D_FAN3_DIV,&fdiv) &&
-        !sensors_get_feature(*name,SENSORS_W83781D_FAN3_MIN,&min)) {
-      print_label(label,10);
-      printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)              %s  %s\n",
-             cur,min,fdiv, alarms&W83781D_ALARM_FAN3?"ALARM":"     ",
-             beeps&W83781D_ALARM_FAN3?"(beep)":"");
-    } else
-      printf("ERROR: Can't get FAN3 data!\n");
-  }
+  if (!sensors_get_label(*name,SENSORS_W83781D_FAN3,&label) &&
+      !sensors_get_feature(*name,SENSORS_W83781D_FAN3,&cur) &&
+      !sensors_get_feature(*name,SENSORS_W83781D_FAN3_DIV,&fdiv) &&
+      !sensors_get_feature(*name,SENSORS_W83781D_FAN3_MIN,&min)) {
+    print_label(label,10);
+    printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)              %s  %s\n",
+           cur,min,fdiv, alarms&W83781D_ALARM_FAN3?"ALARM":"     ",
+           beeps&W83781D_ALARM_FAN3?"(beep)":"");
+  } else
+    printf("ERROR: Can't get FAN3 data!\n");
   free_the_label(&label);