Changeset 1605

Timestamp:

11/16/02 03:02:44 (11 years ago)

Author:

mds

Message:

BMC sysctl names update

Location:

lm-sensors/trunk/kernel

Files:

• chips/bmcsensors.c (modified) (3 diffs)
• include/sensors.h (modified) (1 diff)

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

@@ -292 +292 @@
                 printk(KERN_INFO "bmcsensors.o: sensor %d: using %s for upper limit\n",
                         i, threshold_text[sdrd[i].lim1]);
+/*
         else
                 printk(KERN_INFO "bmcsensors.o: sensor %d: no readable upper limit\n", i);
+*/
         if(sdrd[i].lim2 >= 0)
                 printk(KERN_INFO "bmcsensors.o: sensor %d: using %s for lower limit\n",
                         i, threshold_text[sdrd[i].lim2]);
+/*
         else
                 printk(KERN_INFO "bmcsensors.o: sensor %d: no readable lower limit\n", i);
+*/
 }
 
@@ -331 +335 @@
                 switch(sdrd[i].stype) {
                         case(STYPE_TEMP) :
-                                bmcsensors_dir_table[i].ctl_name = BMCSENSORS_SYSCTL_TEMP1 + temps;
+                                bmcsensors_dir_table[i].ctl_name = BMC_SYSCTL_TEMP1 + temps;
                                 sprintf((char *)bmcsensors_dir_table[i].procname, "temp%d", ++temps);
                                 bmcsensors_dir_table[i].extra1 = &bmcsensors_all;
                                 break;
                         case(STYPE_VOLT) :
-                                bmcsensors_dir_table[i].ctl_name = BMCSENSORS_SYSCTL_IN1 + volts;
+                                bmcsensors_dir_table[i].ctl_name = BMC_SYSCTL_IN1 + volts;
                                 sprintf((char *)bmcsensors_dir_table[i].procname, "in%d", ++volts);
                                 bmcsensors_dir_table[i].extra1 = &bmcsensors_all;
                                 break;
                         case(STYPE_CURR) :
-                                bmcsensors_dir_table[i].ctl_name = BMCSENSORS_SYSCTL_CURR1 + currs;
+                                bmcsensors_dir_table[i].ctl_name = BMC_SYSCTL_CURR1 + currs;
                                 sprintf((char *)bmcsensors_dir_table[i].procname, "curr%d", ++currs);
                                 bmcsensors_dir_table[i].extra1 = &bmcsensors_all;
                                 break;
                         case(STYPE_FAN) :
-                                bmcsensors_dir_table[i].ctl_name = BMCSENSORS_SYSCTL_FAN1 + fans;
+                                bmcsensors_dir_table[i].ctl_name = BMC_SYSCTL_FAN1 + fans;
                                 sprintf((char *)bmcsensors_dir_table[i].procname, "fan%d", ++fans);
                                 bmcsensors_dir_table[i].extra1 = &bmcsensors_all;
@@ -841 +845 @@
         int i;
         struct bmcsensors_data *data = client->data;
-        int nr = ctl_name - BMCSENSORS_SYSCTL_TEMP1 + 1;
+        int nr = ctl_name - BMC_SYSCTL_TEMP1 + 1;
 
         if((i = find_sdrd(ctl_name)) < 0) {

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

@@ -684 +684 @@
 #define SMARTBATT_SYSCTL_CHARGE 1006
 
-#define BMCSENSORS_SYSCTL_IN1 1000
-#define BMCSENSORS_SYSCTL_TEMP1 1100
-#define BMCSENSORS_SYSCTL_CURR1 1200
-#define BMCSENSORS_SYSCTL_FAN1 1300
-#define BMCSENSORS_SYSCTL_ALARMS 5000
+#define BMC_SYSCTL_IN1 1000
+#define BMC_SYSCTL_TEMP1 1100
+#define BMC_SYSCTL_CURR1 1200
+#define BMC_SYSCTL_FAN1 1300
+#define BMC_SYSCTL_ALARMS 5000