Changeset 4689

Timestamp:

08/19/07 17:07:05 (6 years ago)

Author:

khali

Message:

Add support for hardware monitoring chips on SPI buses.

SPI bus statements in the configuration file are not yet supported, as
SPI buses don't have a name attribute yet, it's not possible to identify
them and thus no substitution is possible.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

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

@@ -24 +24 @@
            New function sensors_snprintf_chip_name()
            Drop support for dashes in chip names
+           Add support for devices on SPI adapters
   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

@@ -323 +323 @@
         case SENSORS_BUS_TYPE_PCI:
                 return "PCI adapter";
+        /* SPI should not be here, but for now SPI adapters have no name
+           so we don't have any custom string to return. */
+        case SENSORS_BUS_TYPE_SPI:
+                return "SPI adapter";
         }
 

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

@@ -107 +107 @@
         else if (!strncmp(name, "pci", dash - name))
                 res->bus.type = SENSORS_BUS_TYPE_PCI;
+        else if (!strncmp(name, "spi", dash - name))
+                res->bus.type = SENSORS_BUS_TYPE_SPI;
         else
                 goto ERROR;
         name = dash + 1;
 
-        /* Some bus types (i2c) have an additional bus number. For these, the
-           next part is either a "*" (any bus of that type) or a decimal
-           number. */
+        /* Some bus types (i2c, spi) have an additional bus number.
+           For these, the next part is either a "*" (any bus of that type)
+           or a decimal number. */
         switch (res->bus.type) {
         case SENSORS_BUS_TYPE_I2C:
+        case SENSORS_BUS_TYPE_SPI:
                 if (!strncmp(name, "*-", 2)) {
                         res->bus.nr = SENSORS_BUS_NR_ANY;
@@ -163 +166 @@
                 return snprintf(str, size, "%s-i2c-%hd-%02x", chip->prefix,
                                 chip->bus.nr, chip->addr);
+        case SENSORS_BUS_TYPE_SPI:
+                return snprintf(str, size, "%s-spi-%hd-%x", chip->prefix,
+                                chip->bus.nr, chip->addr);
         }
 

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

@@ -34 +34 @@
 #define SENSORS_BUS_TYPE_ISA    1
 #define SENSORS_BUS_TYPE_PCI    2
+#define SENSORS_BUS_TYPE_SPI    3
 #define SENSORS_BUS_NR_ANY      (-1)
 #define SENSORS_BUS_NR_IGNORE   (-2)

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

@@ -253 +253 @@
                         }
                 }
+        } else if (sscanf(dev->name, "spi%hd.%d", &entry.chip.bus.nr,
+                          &entry.chip.addr) == 2) {
+                /* SPI */
+                entry.chip.bus.type = SENSORS_BUS_TYPE_SPI;
         } else if (sscanf(dev->name, "%*[a-z0-9_].%d", &entry.chip.addr) == 1) {
                 /* must be new ISA (platform driver) */