From 3027d75a129d6e41257ed578473785a38675925e Mon Sep 17 00:00:00 2001 From: Rudolf Marek Date: Sat, 19 Aug 2006 15:23:10 +0000 Subject: [PATCH] Add PCI bus support git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4098 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/access.c | 8 ++++++++ lib/data.c | 5 +++++ lib/sensors.h | 1 + lib/sysfs.c | 5 +++++ prog/sensord/sense.c | 2 ++ 5 files changed, 21 insertions(+) diff --git a/lib/access.c b/lib/access.c index 7ae5986c..b8e97d20 100644 --- a/lib/access.c +++ b/lib/access.c @@ -46,6 +46,10 @@ int sensors_match_chip(sensors_chip_name chip1, sensors_chip_name chip2) (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; + if ((chip1.bus != SENSORS_CHIP_NAME_BUS_ANY_I2C) && (chip2.bus != SENSORS_CHIP_NAME_BUS_ANY_I2C)) return 0; @@ -303,6 +307,8 @@ const char *sensors_get_adapter_name(int bus_nr) 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"; for (i = 0; i < sensors_proc_bus_count; i++) @@ -317,6 +323,8 @@ const char *sensors_get_algorithm_name(int bus_nr) 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"; for (i = 0; i < sensors_proc_bus_count; i++) diff --git a/lib/data.c b/lib/data.c index 5038f2e7..3954df0b 100644 --- a/lib/data.c +++ b/lib/data.c @@ -144,6 +144,10 @@ DONE:; 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) = '-'; } else if (part2 && !strcmp(part2,"i2c") && !strcmp(part3,"*")) res->bus = SENSORS_CHIP_NAME_BUS_ANY_I2C; else if (part2 && !strcmp(part2,"i2c")) { @@ -263,6 +267,7 @@ int sensors_substitute_busses(void) chips = &sensors_config_chips[i].chips; 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) && (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_ANY_I2C)) diff --git a/lib/sensors.h b/lib/sensors.h index 1222d8bc..a9df87e8 100644 --- a/lib/sensors.h +++ b/lib/sensors.h @@ -29,6 +29,7 @@ #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 #ifdef __cplusplus diff --git a/lib/sysfs.c b/lib/sysfs.c index 8cc18be4..ed94ebe7 100644 --- a/lib/sysfs.c +++ b/lib/sysfs.c @@ -46,6 +46,7 @@ int sensors_init_sysfs(void) /* returns: 0 if successful, !0 otherwise */ 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]; sensors_proc_chips_entry entry; @@ -90,6 +91,10 @@ static int sensors_read_one_sysfs_chip(struct sysfs_device *dev) } else if (sscanf(dev->name, "%*[a-z0-9_].%d", &entry.name.addr) == 1) { /* 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; diff --git a/prog/sensord/sense.c b/prog/sensord/sense.c index 4ec550a0..49058e39 100644 --- a/prog/sensord/sense.c +++ b/prog/sensord/sense.c @@ -76,6 +76,8 @@ chipName static char buffer[256]; 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); return buffer;