Changeset 4672

Show
Ignore:
Timestamp:
08/16/07 11:54:53 (7 years ago)
Author:
khali
Message:

Drop support for "dummy" bus type. The kernel no longer supports
such fake i2c buses, so neither should we. Instead, non-i2c buses are
handled explicitly.

Location:
lm-sensors/branches/lm-sensors-3.0.0
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/branches/lm-sensors-3.0.0/CHANGES

    r4666 r4672  
    2121           Delete sensors_do_all_sets(), unused 
    2222           Pass structures by reference 
     23           Drop support for dummy type 
    2324  Makefile: Drop the package and version targets 
    2425  Man page sensors.conf.5: Update the chip statement section 
  • lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

    r4667 r4672  
    327327        if (bus_nr == SENSORS_CHIP_NAME_BUS_PCI) 
    328328                return "PCI adapter"; 
    329         if (bus_nr == SENSORS_CHIP_NAME_BUS_DUMMY) 
    330                 return "Dummy adapter"; 
    331329        for (i = 0; i < sensors_proc_bus_count; i++) 
    332330                if (sensors_proc_bus[i].number == bus_nr) 
  • lm-sensors/branches/lm-sensors-3.0.0/lib/data.c

    r4601 r4672  
    172172      *(part2-1) = '-'; 
    173173    *(part3-1) = '-'; 
    174   } else if(part3 && part4) { 
    175     res->bus = SENSORS_CHIP_NAME_BUS_DUMMY; 
    176     if (! (res->busname = strdup(part3))) 
    177       sensors_fatal_error("sensors_parse_chip_name","Allocating new busname"); 
    178174  } else 
    179175    goto ERROR; 
     
    203199  } 
    204200  if (strncmp(name,"i2c-",4)) { 
    205     *res = SENSORS_CHIP_NAME_BUS_DUMMY; 
    206     return 0; 
     201    return -SENSORS_ERR_BUS_NAME; 
    207202  } 
    208203  name += 4; 
     
    266261      if ((chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_ISA) && 
    267262          (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_PCI) && 
    268           (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_DUMMY) && 
    269263          (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_ANY) && 
    270264          (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_ANY_I2C)) 
  • lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h

    r4666 r4672  
    3030#define SENSORS_CHIP_NAME_BUS_ANY -2 
    3131#define SENSORS_CHIP_NAME_BUS_ANY_I2C -3 
    32 #define SENSORS_CHIP_NAME_BUS_DUMMY -4 
    3332#define SENSORS_CHIP_NAME_BUS_PCI -5 
    3433#define SENSORS_CHIP_NAME_ADDR_ANY -1 
     
    4544  int bus; 
    4645  int addr; 
    47   char *busname;        /* if dummy */ 
     46  char *busname; 
    4847} sensors_chip_name; 
    4948 
  • lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

    r4667 r4672  
    383383                        entry.number = SENSORS_CHIP_NAME_BUS_ISA; 
    384384                } else if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1) { 
    385                         entry.number = SENSORS_CHIP_NAME_BUS_DUMMY; 
     385                        continue; 
    386386                } 
    387387 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

    r4668 r4672  
    303303  else if (name->bus == SENSORS_CHIP_NAME_BUS_PCI) 
    304304    snprintf(buf, BUF_SIZE, "%s-pci-%04x", name->prefix, name->addr); 
    305   else if (name->bus == SENSORS_CHIP_NAME_BUS_DUMMY) 
    306     snprintf(buf, BUF_SIZE, "%s-%s-%04x", name->prefix, name->busname, 
    307              name->addr); 
    308305  else 
    309306    snprintf(buf, BUF_SIZE, "%s-i2c-%d-%02x", name->prefix, name->bus,