Changeset 4674

Timestamp:

08/16/07 11:57:56 (6 years ago)

Author:

khali

Message:

Don't handle the isa bus in sensors_parse_i2cbus_name(). We really
don't need to, as there is a single ISA bus, there's no need for
substituting anything.

Location:

lm-sensors/branches/lm-sensors-3.0.0/lib

Files:

• data.c (modified) (1 diff)
• sysfs.c (modified) (1 diff)

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

@@ -191 +191 @@
   int i;
 
-  if (! strcmp(name,"isa")) {
-    *res = SENSORS_CHIP_NAME_BUS_ISA;
-    return 0;
-  }
   if (strncmp(name,"i2c-",4)) {
     return -SENSORS_ERR_BUS_NAME;

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

@@ -375 +375 @@
                         continue;
 
+                if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1 ||
+                    entry.number == 9191) /* legacy ISA */
+                        continue;
+
                 /* NB: attr->value[attr->len-1] == '\n'; chop that off */
                 entry.adapter = strndup(attr->value, attr->len - 1);
                 if (!entry.adapter)
                         sensors_fatal_error(__FUNCTION__, "out of memory");
-
-                if (!strncmp(entry.adapter, "ISA ", 4)) {
-                        entry.number = SENSORS_CHIP_NAME_BUS_ISA;
-                } else if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1) {
-                        continue;
-                }
 
                 sensors_add_proc_bus(&entry);