Changeset 4672

Timestamp:

08/16/07 11:54:53 (6 years ago)

Author:

khali

Message:

Drop support for "dummy" bus type. The kernel no longer supports
such fake i2c buses, so neither should we. Instead, non-i2c buses are
handled explicitly.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• lib/access.c (modified) (1 diff)
• lib/data.c (modified) (3 diffs)
• lib/sensors.h (modified) (2 diffs)
• lib/sysfs.c (modified) (1 diff)
• prog/sensors/main.c (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -21 +21 @@
            Delete sensors_do_all_sets(), unused
            Pass structures by reference
+           Drop support for dummy type
   Makefile: Drop the package and version targets
   Man page sensors.conf.5: Update the chip statement section

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -327 +327 @@
         if (bus_nr == SENSORS_CHIP_NAME_BUS_PCI)
                 return "PCI adapter";
-        if (bus_nr == SENSORS_CHIP_NAME_BUS_DUMMY)
-                return "Dummy adapter";
         for (i = 0; i < sensors_proc_bus_count; i++)
                 if (sensors_proc_bus[i].number == bus_nr)

lm-sensors/branches/lm-sensors-3.0.0/lib/data.c

@@ -172 +172 @@
       *(part2-1) = '-';
     *(part3-1) = '-';
-  } else if(part3 && part4) {
-    res->bus = SENSORS_CHIP_NAME_BUS_DUMMY;
-    if (! (res->busname = strdup(part3)))
-      sensors_fatal_error("sensors_parse_chip_name","Allocating new busname");
   } else
     goto ERROR;
@@ -203 +199 @@
   }
   if (strncmp(name,"i2c-",4)) {
-    *res = SENSORS_CHIP_NAME_BUS_DUMMY;
-    return 0;
+    return -SENSORS_ERR_BUS_NAME;
   }
   name += 4;
@@ -266 +261 @@
       if ((chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_ISA) &&
           (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_PCI) &&
-          (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_DUMMY) &&
           (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_ANY) &&
           (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_ANY_I2C))

lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h

@@ -30 +30 @@
 #define SENSORS_CHIP_NAME_BUS_ANY -2
 #define SENSORS_CHIP_NAME_BUS_ANY_I2C -3
-#define SENSORS_CHIP_NAME_BUS_DUMMY -4
 #define SENSORS_CHIP_NAME_BUS_PCI -5
 #define SENSORS_CHIP_NAME_ADDR_ANY -1
@@ -45 +44 @@
   int bus;
   int addr;
-  char *busname;        /* if dummy */
+  char *busname;
 } sensors_chip_name;
 

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -383 +383 @@
                         entry.number = SENSORS_CHIP_NAME_BUS_ISA;
                 } else if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1) {
-                        entry.number = SENSORS_CHIP_NAME_BUS_DUMMY;
+                        continue;
                 }
 

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

@@ -303 +303 @@
   else if (name->bus == SENSORS_CHIP_NAME_BUS_PCI)
     snprintf(buf, BUF_SIZE, "%s-pci-%04x", name->prefix, name->addr);
-  else if (name->bus == SENSORS_CHIP_NAME_BUS_DUMMY)
-    snprintf(buf, BUF_SIZE, "%s-%s-%04x", name->prefix, name->busname,
-             name->addr);
   else
     snprintf(buf, BUF_SIZE, "%s-i2c-%d-%02x", name->prefix, name->bus,