diff --git a/CHANGES b/CHANGES index 1f96ce99..50c5006b 100644 --- a/CHANGES +++ b/CHANGES @@ -20,6 +20,7 @@ SVN HEAD No longer export sensors_chip_name_has_wildcards() Delete sensors_do_all_sets(), unused Pass structures by reference + Drop support for dummy type Makefile: Drop the package and version targets Man page sensors.conf.5: Update the chip statement section Programs doc/*: Delete, obsolete diff --git a/lib/access.c b/lib/access.c index fa5544a3..66b6e986 100644 --- a/lib/access.c +++ b/lib/access.c @@ -326,8 +326,6 @@ const char *sensors_get_adapter_name(int bus_nr) 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++) if (sensors_proc_bus[i].number == bus_nr) return sensors_proc_bus[i].adapter; diff --git a/lib/data.c b/lib/data.c index d5e23523..a62ffaa7 100644 --- a/lib/data.c +++ b/lib/data.c @@ -171,10 +171,6 @@ DONE2:; if (part2) *(part2-1) = '-'; *(part3-1) = '-'; - } else if(part3 && part4) { - res->bus = SENSORS_CHIP_NAME_BUS_DUMMY; - if (! (res->busname = strdup(part3))) - sensors_fatal_error("sensors_parse_chip_name","Allocating new busname"); } else goto ERROR; @@ -202,8 +198,7 @@ int sensors_parse_i2cbus_name(const char *name, int *res) return 0; } if (strncmp(name,"i2c-",4)) { - *res = SENSORS_CHIP_NAME_BUS_DUMMY; - return 0; + return -SENSORS_ERR_BUS_NAME; } name += 4; if ((strlen(name) > 3) || (strlen(name) == 0)) @@ -265,7 +260,6 @@ int sensors_substitute_busses(void) 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)) if ((err = sensors_substitute_chip(chips->fits+j, lineno))) diff --git a/lib/sensors.h b/lib/sensors.h index 966b9d62..5f0e0e87 100644 --- a/lib/sensors.h +++ b/lib/sensors.h @@ -29,7 +29,6 @@ #define SENSORS_CHIP_NAME_BUS_ISA -1 #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 @@ -44,7 +43,7 @@ typedef struct sensors_chip_name { char *prefix; int bus; int addr; - char *busname; /* if dummy */ + char *busname; } sensors_chip_name; /* (Re)load the configuration file and the detected chips list. If this diff --git a/lib/sysfs.c b/lib/sysfs.c index 285b671c..dc3ef2bb 100644 --- a/lib/sysfs.c +++ b/lib/sysfs.c @@ -382,7 +382,7 @@ int sensors_read_sysfs_bus(void) if (!strncmp(entry.adapter, "ISA ", 4)) { entry.number = SENSORS_CHIP_NAME_BUS_ISA; } else if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1) { - entry.number = SENSORS_CHIP_NAME_BUS_DUMMY; + continue; } sensors_add_proc_bus(&entry); diff --git a/prog/sensors/main.c b/prog/sensors/main.c index 9171a056..929db027 100644 --- a/prog/sensors/main.c +++ b/prog/sensors/main.c @@ -302,9 +302,6 @@ const char *sprintf_chip_name(const sensors_chip_name *name) snprintf(buf, BUF_SIZE, "%s-isa-%04x", name->prefix, name->addr); else if (name->bus == SENSORS_CHIP_NAME_BUS_PCI) snprintf(buf, BUF_SIZE, "%s-pci-%04x", name->prefix, name->addr); - else if (name->bus == SENSORS_CHIP_NAME_BUS_DUMMY) - snprintf(buf, BUF_SIZE, "%s-%s-%04x", name->prefix, name->busname, - name->addr); else snprintf(buf, BUF_SIZE, "%s-i2c-%d-%02x", name->prefix, name->bus, name->addr);