wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-02 13:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support more bus types (part 2 of 2). Originally libsensors was very

Browse Source 
i2c-centric. Make it more neutral so that we can cleanly support
additional bus types such as SPI or One-Wire.

This second part updates sensors_bus to use sensors_bus_id. Thanks
to Mark M. Hoffman for showing me how the configuration file
parser could be modified to support that change.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4687 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-08-19 15:04:29 +00:00
1 parent 7ee15371df
commit a74addb5d4
5 files changed
+24 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/data.c
+8 -7
View File
@@ -167,7 +167,7 @@ int sensors_snprintf_chip_name(char *str, size_t size,
return -SENSORS_ERR_CHIP_NAME;
}
int sensors_parse_i2cbus_name(const char *name, int *res)
int sensors_parse_bus_id(const char *name, sensors_bus_id *bus)
{
char *endptr;
@@ -175,8 +175,9 @@ int sensors_parse_i2cbus_name(const char *name, int *res)
return -SENSORS_ERR_BUS_NAME;
}
name += 4;
*res = strtoul(name, &endptr, 10);
if (*name == '\0' || *endptr != '\0' || *res < 0)
bus->type = SENSORS_BUS_TYPE_I2C;
bus->nr = strtoul(name, &endptr, 10);
if (*name == '\0' || *endptr != '\0' || bus->nr < 0)
return -SENSORS_ERR_BUS_NAME;
return 0;
}
@@ -185,12 +186,12 @@ int sensors_substitute_chip(sensors_chip_name *name, int lineno)
{
int i, j;
for (i = 0; i < sensors_config_busses_count; i++)
if (name->bus.type == SENSORS_BUS_TYPE_I2C &&
sensors_config_busses[i].number == name->bus.nr)
if (sensors_config_busses[i].bus.type == name->bus.type &&
sensors_config_busses[i].bus.nr == name->bus.nr)
break;
if (i == sensors_config_busses_count) {
sensors_parse_error("Undeclared i2c bus referenced", lineno);
sensors_parse_error("Undeclared bus id referenced", lineno);
name->bus.nr = sensors_proc_bus_count;
return -SENSORS_ERR_BUS_NAME;
}
@@ -199,7 +200,7 @@ int sensors_substitute_chip(sensors_chip_name *name, int lineno)
for (j = 0; j < sensors_proc_bus_count; j++) {
if (!strcmp(sensors_config_busses[i].adapter,
sensors_proc_bus[j].adapter)) {
name->bus.nr = sensors_proc_bus[j].number;
name->bus.nr = sensors_proc_bus[j].bus.nr;
return 0;
}
}