Changeset 4098

Timestamp:

08/19/06 17:23:10 (7 years ago)

Author:

ruik

Message:

Add PCI bus support

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/lib/access.c

@@ -45 +45 @@
                 if ((chip1.bus == SENSORS_CHIP_NAME_BUS_ISA) ||
                     (chip2.bus == SENSORS_CHIP_NAME_BUS_ISA))
+                        return 0;
+
+                if ((chip1.bus == SENSORS_CHIP_NAME_BUS_PCI) ||
+                    (chip2.bus == SENSORS_CHIP_NAME_BUS_PCI))
                         return 0;
 
@@ -304 +308 @@
         if (bus_nr == SENSORS_CHIP_NAME_BUS_ISA)
                 return "ISA adapter";
+        if (bus_nr == SENSORS_CHIP_NAME_BUS_PCI)
+                return "PCI adapter";
         if (bus_nr == SENSORS_CHIP_NAME_BUS_DUMMY)
                 return "Dummy adapter";
@@ -318 +324 @@
         if (bus_nr == SENSORS_CHIP_NAME_BUS_ISA)
                 return "ISA algorithm";
+        if (bus_nr == SENSORS_CHIP_NAME_BUS_PCI)
+                return "PCI algorithm";
         if (bus_nr == SENSORS_CHIP_NAME_BUS_DUMMY)
                 return "Dummy algorithm";

lm-sensors/trunk/lib/data.c

@@ -143 +143 @@
   } else if (!strcmp(part3,"isa")) {
     res->bus = SENSORS_CHIP_NAME_BUS_ISA;
+    if (part2)
+      *(part2-1) = '-';
+  } else if (!strcmp(part3,"pci")) {
+    res->bus = SENSORS_CHIP_NAME_BUS_PCI;
     if (part2)
       *(part2-1) = '-';
@@ -264 +268 @@
     for(j = 0; j < chips->fits_count; j++)
       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) &&

lm-sensors/trunk/lib/sensors.h

@@ -30 +30 @@
 #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
 

lm-sensors/trunk/lib/sysfs.c

@@ -47 +47 @@
 static int sensors_read_one_sysfs_chip(struct sysfs_device *dev)
 {
+        int domain, bus, slot, fn;
         struct sysfs_attribute *attr, *bus_attr;
         char bus_path[SYSFS_PATH_MAX];
@@ -91 +92 @@
                 /* must be new ISA (platform driver) */
                 entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA;
+        } else if (sscanf(dev->name, "%x:%x:%x.%x", &domain, &bus, &slot, &fn) == 4) {
+                /* PCI */
+                entry.name.addr = (domain << 16) + (bus << 8) + (slot << 3) + fn;
+                entry.name.bus = SENSORS_CHIP_NAME_BUS_PCI;
         } else
                 return -SENSORS_ERR_PARSE;

lm-sensors/trunk/prog/sensord/sense.c

@@ -77 +77 @@
   if (chip->bus == SENSORS_CHIP_NAME_BUS_ISA)
     sprintf (buffer, "%s-isa-%04x", chip->prefix, chip->addr);
+  else if (chip->bus == SENSORS_CHIP_NAME_BUS_PCI)
+            sprintf (buffer, "%s-pci-%04x", chip->prefix, chip->addr);
   else
     sprintf (buffer, "%s-i2c-%d-%02x", chip->prefix, chip->bus, chip->addr);