Changeset 5092

Timestamp:

01/05/08 13:31:55 (11 months ago)

Author:

khali

Message:

Get the device type from the subsystem symlink, rather than
guessing it from how the device identifier looks like. For kernels
<= 2.6.17, we use the bus symlink instead. For kernels <= 2.6.11,
neither symlink exist so we fallback to the old type guessing
approach. It doesn't really matter as all hwmon devices were
i2c devices back then.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/CHANGES (modified) (1 diff)
• lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c (modified) (4 diffs)

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

@@ -4 +4 @@
-SVN
-  documentation: Update the application writing guidelines
-
+
+
-  Makefile: No warnings about ld configuration for staged installations
-  pwmconfig: Really hide errors on sysfs writes

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

@@ -462 +462 @@
-        char *bus_attr;
-        char bus_path[NAME_MAX];
+        char linkpath[NAME_MAX];
+        char subsys_path[NAME_MAX], *subsys;
+        int sub_len;
-        sensors_chip_features entry;
-
@@ -472 +475 @@
-                sensors_fatal_error(__FUNCTION__, "out of memory");
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                /* find out if legacy ISA or not */
-                if (entry.chip.bus.nr == 9191) {
@@ -492 +517 @@
-                        }
-                }
-
-
+
+
+
+
-                /* SPI */
-                entry.chip.bus.type = SENSORS_BUS_TYPE_SPI;
-
+
+
-                /* must be new ISA (platform driver) */
+                if (sscanf(dev_name, "%*[a-z0-9_].%d", &entry.chip.addr) != 1)
+                        entry.chip.addr = 0;
-                entry.chip.bus.type = SENSORS_BUS_TYPE_ISA;
-                entry.chip.bus.nr = 0;
-
+
+
+
-                /* PCI */
-                entry.chip.addr = (domain << 16) + (bus << 8) + (slot << 3) + fn;
@@ -506 +538 @@
-                entry.chip.bus.nr = 0;
-        } else {
-
-
-
-
+
+
+
-        }
-