Changeset 4474

Timestamp:

06/26/07 13:33:09 (6 years ago)

Author:

khali

Message:

struct sensors_proc_chips_entry now has a single member, so we may
as well use this member directly for slightly more simple code.

Location:

lm-sensors/branches/lm-sensors-3.0.0/lib

Files:

• access.c (modified) (1 diff)
• data.c (modified) (1 diff)
• data.h (modified) (3 diffs)
• init.c (modified) (3 diffs)
• sysfs.c (modified) (5 diffs)

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -305 +305 @@
         const sensors_chip_name *res;
         res = (*nr >= sensors_proc_chips_count ?
-                        NULL : &sensors_proc_chips[*nr].name);
+                        NULL : &sensors_proc_chips[*nr]);
         (*nr)++;
         return res;

lm-sensors/branches/lm-sensors-3.0.0/lib/data.c

@@ -37 +37 @@
 int sensors_config_busses_max = 0;
 
-sensors_proc_chips_entry *sensors_proc_chips = NULL;
+sensors_chip_name *sensors_proc_chips = NULL;
 int sensors_proc_chips_count = 0;
 int sensors_proc_chips_max = 0;

lm-sensors/branches/lm-sensors-3.0.0/lib/data.h

@@ -119 +119 @@
 } sensors_bus;
 
-/* /proc/sys/dev/sensors/chips line representation */
-typedef struct sensors_proc_chips_entry {
-  sensors_chip_name name;
-} sensors_proc_chips_entry;
-
 /* Internal data about a single chip feature.
    name is the string name used to refer to this feature (both in config
@@ -165 +160 @@
 extern int sensors_config_busses_max;
 
-extern sensors_proc_chips_entry *sensors_proc_chips;
+extern sensors_chip_name *sensors_proc_chips;
 extern int sensors_proc_chips_count;
 extern int sensors_proc_chips_max;
@@ -171 +166 @@
 #define sensors_add_proc_chips(el) sensors_add_array_el( \
         (el), &sensors_proc_chips, &sensors_proc_chips_count,\
-        &sensors_proc_chips_max, sizeof(struct sensors_proc_chips_entry))
+        &sensors_proc_chips_max, sizeof(struct sensors_chip_name))
 
 extern sensors_bus *sensors_proc_bus;

lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

@@ -28 +28 @@
 #include "scanner.h"
 
-static void free_proc_chips_entry(sensors_proc_chips_entry entry);
 static void free_chip_name(sensors_chip_name name);
 static void free_bus(sensors_bus bus);
@@ -62 +61 @@
 
   for (i = 0; i < sensors_proc_chips_count; i++)
-    free_proc_chips_entry(sensors_proc_chips[i]);
+    free_chip_name(sensors_proc_chips[i]);
   free(sensors_proc_chips);
   sensors_proc_chips = NULL;
@@ -84 +83 @@
   sensors_proc_bus = NULL;
   sensors_proc_bus_count = sensors_proc_bus_max = 0;
-}
-
-void free_proc_chips_entry(sensors_proc_chips_entry entry)
-{
-    free_chip_name(entry.name);
 }
 

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -220 +220 @@
         struct sysfs_attribute *attr, *bus_attr;
         char bus_path[SYSFS_PATH_MAX];
-        sensors_proc_chips_entry entry;
+        sensors_chip_name name;
 
         /* ignore any device without name attribute */
@@ -232 +232 @@
 
         /* NB: attr->value[attr->len-1] == '\n'; chop that off */
-        entry.name.prefix = strndup(attr->value, attr->len - 1);
-        if (!entry.name.prefix)
+        name.prefix = strndup(attr->value, attr->len - 1);
+        if (!name.prefix)
                 sensors_fatal_error(__FUNCTION__, "out of memory");
 
-        entry.name.busname = strdup(dev->path);
-        if (!entry.name.busname)
+        name.busname = strdup(dev->path);
+        if (!name.busname)
                 sensors_fatal_error(__FUNCTION__, "out of memory");
 
-        if (sscanf(dev->name, "%d-%x", &entry.name.bus, &entry.name.addr) == 2) {
+        if (sscanf(dev->name, "%d-%x", &name.bus, &name.addr) == 2) {
                 /* find out if legacy ISA or not */
-                if (entry.name.bus == 9191)
-                        entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA;
+                if (name.bus == 9191)
+                        name.bus = SENSORS_CHIP_NAME_BUS_ISA;
                 else {
                         snprintf(bus_path, sizeof(bus_path),
                                 "%s/class/i2c-adapter/i2c-%d/device/name",
-                                sensors_sysfs_mount, entry.name.bus);
+                                sensors_sysfs_mount, name.bus);
 
                         if ((bus_attr = sysfs_open_attribute(bus_path))) {
@@ -255 +255 @@
                                 if (bus_attr->value
                                  && !strncmp(bus_attr->value, "ISA ", 4))
-                                        entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA;
+                                        name.bus = SENSORS_CHIP_NAME_BUS_ISA;
 
                                 sysfs_close_attribute(bus_attr);
                         }
                 }
-        } else if (sscanf(dev->name, "%*[a-z0-9_].%d", &entry.name.addr) == 1) {
+        } else if (sscanf(dev->name, "%*[a-z0-9_].%d", &name.addr) == 1) {
                 /* must be new ISA (platform driver) */
-                entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA;
+                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;
+                name.addr = (domain << 16) + (bus << 8) + (slot << 3) + fn;
+                name.bus = SENSORS_CHIP_NAME_BUS_PCI;
         } else
                 return -SENSORS_ERR_PARSE;
@@ -272 +272 @@
         /* check whether this chip is known in the static list */ 
         for (i = 0; sensors_chip_features_list[i].prefix; i++)
-                if (!strcasecmp(sensors_chip_features_list[i].prefix, entry.name.prefix))
+                if (!strcasecmp(sensors_chip_features_list[i].prefix, name.prefix))
                         break;
 
@@ -288 +288 @@
         }
                 
-        sensors_add_proc_chips(&entry);
+        sensors_add_proc_chips(&name);
 
         return 0;