Changeset 5593 for lm-sensors/branches
- Timestamp:
- 01/13/09 09:06:32 (3 years ago)
- Location:
- lm-sensors/branches/lm-sensors-3.0.0
- Files:
-
- 5 modified
-
doc/libsensors-API.txt (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)
Legend:
- Unmodified
- Added
- Removed
-
lm-sensors/branches/lm-sensors-3.0.0/doc/libsensors-API.txt
r5582 r5593 8 8 9 9 0x402 lm-sensors SVN 10 * Added bus type "acpi": 11 #define SENSORS_BUS_TYPE_ACPI 10 12 * Added support for instantaneous power sensors 11 13 enum sensors_subfeature_type SENSORS_SUBFEATURE_POWER_INPUT -
lm-sensors/branches/lm-sensors-3.0.0/lib/access.c
r5582 r5593 363 363 case SENSORS_BUS_TYPE_VIRTUAL: 364 364 return "Virtual device"; 365 case SENSORS_BUS_TYPE_ACPI: 366 return "ACPI interface"; 365 367 } 366 368 -
lm-sensors/branches/lm-sensors-3.0.0/lib/data.c
r5583 r5593 110 110 else if (!strncmp(name, "virtual", dash - name)) 111 111 res->bus.type = SENSORS_BUS_TYPE_VIRTUAL; 112 else if (!strncmp(name, "acpi", dash - name)) 113 res->bus.type = SENSORS_BUS_TYPE_ACPI; 112 114 else 113 115 goto ERROR; … … 173 175 return snprintf(str, size, "%s-virtual-%x", chip->prefix, 174 176 chip->addr); 177 case SENSORS_BUS_TYPE_ACPI: 178 return snprintf(str, size, "%s-acpi-%x", chip->prefix, 179 chip->addr); 175 180 } 176 181 -
lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h
r5379 r5593 43 43 #define SENSORS_BUS_TYPE_SPI 3 44 44 #define SENSORS_BUS_TYPE_VIRTUAL 4 45 #define SENSORS_BUS_TYPE_ACPI 5 45 46 #define SENSORS_BUS_NR_ANY (-1) 46 47 #define SENSORS_BUS_NR_IGNORE (-2) -
lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c
r5379 r5593 597 597 entry.chip.bus.type = SENSORS_BUS_TYPE_ISA; 598 598 entry.chip.bus.nr = 0; 599 } else if (subsys && !strcmp(subsys, "acpi")) { 600 entry.chip.bus.type = SENSORS_BUS_TYPE_ACPI; 601 /* For now we assume that acpi devices are unique */ 602 entry.chip.bus.nr = 0; 603 entry.chip.addr = 0; 599 604 } else { 600 605 /* Ignore unknown device */
