Changeset 3094

Timestamp:

09/18/05 22:37:42 (8 years ago)

Author:

mmh

Message:

(mmh)
This patch replaces the I2C bus enumeration (through sysfs) in lib/proc.c
with a new function in lib/sysfs (using libsysfs). The patch also updates
the init code accordingly.

Location:

lm-sensors/trunk/lib

Files:

• init.c (modified) (1 diff)
• proc.c (modified) (1 diff)
• sysfs.c (modified) (2 diffs)
• sysfs.h (modified) (1 diff)

lm-sensors/trunk/lib/init.c

@@ -42 +42 @@
   int res;
   sensors_cleanup();
-  sensors_init_sysfs();
   if ((res = sensors_read_proc_chips()))
     return res;
-  if ((res = sensors_read_proc_bus()))
-    return res;
+  if (sensors_init_sysfs()) {
+    if ((res = sensors_read_sysfs_bus()))
+      return res;
+  } else {
+    if ((res = sensors_read_proc_bus()))
+      return res;
+  }
   sensors_yyin = input;
   if ((res = sensors_yyparse()))

lm-sensors/trunk/lib/proc.c

@@ -215 +215 @@
 int sensors_read_proc_bus(void)
 {
-        struct dirent *de;
-        DIR *dir;
-        FILE *f;
-        char line[255];
-        char *border;
-        sensors_bus entry;
-        int lineno;
-        char sysfs[NAME_MAX], n[NAME_MAX];
-        char dirname[NAME_MAX];
-
-        if (sensors_found_sysfs) {
-                strncpy(sysfs, sensors_sysfs_mount, sizeof(sysfs) - 1);
-                sysfs[sizeof(sysfs) - 1] = 0;
-                strncat(sysfs, "/class/i2c-adapter",
-                                sizeof(sysfs) - strlen(sysfs) - 1);
-
-                /* Then read from it */
-                dir = opendir(sysfs);
-                if (! dir)
-                        goto proc;
-
-                while ((de = readdir(dir)) != NULL) {
-                        if (!strcmp(de->d_name, "."))
-                                continue;
-                        if (!strcmp(de->d_name, ".."))
-                                continue;
-
-                        strcpy(n, sysfs);
-                        strcat(n, "/");
-                        strcat(n, de->d_name);
-                        strcpy(dirname, n);
-                        strcat(n, "/device/name");
-
-                        if ((f = fopen(n, "r")) != NULL) {
-                                char    x[120];
-                                fgets(x, 120, f);
-                                fclose(f);
-                                if((border = index(x, '\n')) != NULL)
-                                        *border = 0;
-                                entry.adapter=strdup(x);
-                                if(!strncmp(x, "ISA ", 4)) {
-                                        entry.number = SENSORS_CHIP_NAME_BUS_ISA;
-                                        entry.algorithm = strdup("ISA bus algorithm");
-                                } else if(!sscanf(de->d_name, "i2c-%d", &entry.number)) {
-                                        entry.number = SENSORS_CHIP_NAME_BUS_DUMMY;
-                                        entry.algorithm = strdup("Dummy bus algorithm");
-                                } else
-                                        entry.algorithm = strdup("Unavailable from sysfs");
-                                if (entry.algorithm == NULL)
-                                        goto FAT_ERROR_SYS;
-                                sensors_add_proc_bus(&entry);
-                        }
-                }
-                closedir(dir);
-                return 0;
-FAT_ERROR_SYS:
-                sensors_fatal_error("sensors_read_proc_bus", "Allocating entry");
-                closedir(dir);
-                return -SENSORS_ERR_PROC;
-        }
-
-proc:
+  FILE *f;
+  char line[255];
+  char *border;
+  sensors_bus entry;
+  int lineno;
 
   f = fopen("/proc/bus/i2c","r");

lm-sensors/trunk/lib/sysfs.c

@@ -21 +21 @@
 #include <limits.h>
 #include <sysfs/libsysfs.h>
+#include "data.h"
+#include "error.h"
+#include "access.h"
+#include "general.h"
 #include "sysfs.h"
 
@@ -35 +39 @@
         return sensors_found_sysfs;
 }
+
+/* returns 0 if successful, !0 otherwise */
+int sensors_read_sysfs_bus(void)
+{
+        struct sysfs_class *cls;
+        struct dlist *clsdevs;
+        struct sysfs_class_device *clsdev;
+        sensors_bus entry;
+        int ret = 0;
+
+        if (!(cls = sysfs_open_class("i2c-adapter"))) {
+                ret = -SENSORS_ERR_PROC;
+                goto exit0;
+        }
+
+        if (!(clsdevs = sysfs_get_class_devices(cls))) {
+                ret = -SENSORS_ERR_PROC;
+                goto exit1;
+        }
+
+        dlist_for_each_data(clsdevs, clsdev, struct sysfs_class_device) {
+                struct sysfs_device *dev;
+                struct sysfs_attribute *attr;
+
+                if (!(dev = sysfs_get_classdev_device(clsdev)))
+                        continue;
+                if (!(attr = sysfs_get_device_attr(dev, "name")))
+                        continue;
+
+                entry.adapter = strdup(attr->value);
+                if (!entry.adapter)
+                        sensors_fatal_error(__FUNCTION__, "out of memory");
+
+                if (!strncmp(entry.adapter, "ISA ", 4)) {
+                        entry.number = SENSORS_CHIP_NAME_BUS_ISA;
+                        entry.algorithm = strdup("ISA bus algorithm");
+                } else if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1) {
+                        entry.number = SENSORS_CHIP_NAME_BUS_DUMMY;
+                        entry.algorithm = strdup("Dummy bus algorithm");
+                } else
+                        entry.algorithm = strdup("Unavailable from sysfs");
+
+                if (!entry.algorithm)
+                        sensors_fatal_error(__FUNCTION__, "out of memory");
+
+                sensors_add_proc_bus(&entry);
+        }
+
+exit1:
+        /* this frees *cls _and_ *clsdevs */
+        sysfs_close_class(cls);
+
+exit0:
+        return ret;
+}
+

lm-sensors/trunk/lib/sysfs.h

@@ -27 +27 @@
 extern int sensors_init_sysfs(void);
 
+extern int sensors_read_sysfs_bus(void);
+
 #endif /* !SENSORS_LIB_SYSFS_H */