Changeset 4938 for lm-sensors/trunk/prog/sensors/chips.c

Timestamp:

10/11/07 15:42:05 (6 years ago)

Author:

jwrdegoede

Message:

Various FSC printing bug fixes

Files:

• lm-sensors/trunk/prog/sensors/chips.c (modified) (17 diffs)

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

@@ -3565 +3565 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x04)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3579 +3579 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x04)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3593 +3593 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x04)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3636 +3636 @@
 {
   char *label;
-  double voltage, temp, tempmin, tempmax, templim, state, fan;
+  double voltage, temp, templim, state, fan;
   int valid;
 
@@ -3642 +3642 @@
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP1,&temp) &&
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP1_LIM,&templim) &&
-      !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP1_MIN,&tempmin) &&
-      !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP1_MAX,&tempmax) &&
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP1_STATE,&state)) { 
     if (valid) {
       print_label(label,10);
         if((int) state & 0x01)
-          printf("\t%+6.2f C (Min = %+6.2f C, Max = %+6.2f C, Lim = %+6.2f C)\n",
-                temp,tempmin,tempmax,templim);
+          printf("\t%+6.2f C (Lim = %+6.2f C)\n", temp, templim);
         else
           printf("\tfailed\n");
@@ -3660 +3657 @@
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP2,&temp) &&
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP2_LIM,&templim) &&
-      !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP2_MIN,&tempmin) &&
-      !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP2_MAX,&tempmax) &&
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP2_STATE,&state)) { 
     if (valid) {
       print_label(label,10);
         if((int) state & 0x01)
-          printf("\t%+6.2f C (Min = %+6.2f C, Max = %+6.2f C, Lim = %+6.2f C)\n",
-                temp,tempmin,tempmax,templim);
+          printf("\t%+6.2f C (Lim = %+6.2f C)\n", temp, templim);
         else
           printf("\tfailed\n");
@@ -3678 +3672 @@
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP3,&temp) &&
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP3_LIM,&templim) &&
-      !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP3_MIN,&tempmin) &&
-      !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP3_MAX,&tempmax) &&
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP3_STATE,&state)) { 
     if (valid) {
       print_label(label,10);
         if((int) state & 0x01)
-          printf("\t%+6.2f C (Min = %+6.2f C, Max = %+6.2f C, Lim = %+6.2f C)\n",
-                temp,tempmin,tempmax,templim);
+          printf("\t%+6.2f C (Lim = %+6.2f C)\n", temp, templim);
         else
           printf("\tfailed\n");
@@ -3696 +3687 @@
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP4,&temp) &&
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP4_LIM,&templim) &&
-      !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP4_MIN,&tempmin) &&
-      !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP4_MAX,&tempmax) &&
       !sensors_get_feature(*name,SENSORS_FSCSCY_TEMP4_STATE,&state)) { 
     if (valid) {
       print_label(label,10);
         if((int) state & 0x01)
-          printf("\t%+6.2f C (Min = %+6.2f C, Max = %+6.2f C, Lim = %+6.2f C)\n",
-                temp,tempmin,tempmax,templim);
+          printf("\t%+6.2f C (Lim = %+6.2f C)\n", temp, templim);
         else
           printf("\tfailed\n");
@@ -3716 +3704 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x02)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3730 +3718 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x02)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3744 +3732 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x02)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3758 +3746 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x02)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3772 +3760 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x02)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3786 +3774 @@
     if (valid) {
       print_label(label,10);
-        if((int) state & 0x02)
+        if((int) state & 0x08)
           printf("\tfaulty\n");
         else
@@ -3879 +3867 @@
     if (valid) {
       print_label(label,10);
-      if((int) state & 0x04)
+      if((int) state & 0x08)
         printf("\tfaulty\n");
       else
@@ -3893 +3881 @@
     if (valid) {
       print_label(label,10);
-      if((int) state & 0x04)
+      if((int) state & 0x08)
         printf("\tfaulty\n");
       else
@@ -3907 +3895 @@
     if (valid) {
       print_label(label,10);
-      if((int) state & 0x04)
+      if((int) state & 0x08)
         printf("\tfaulty\n");
       else