Changeset 101

Timestamp:

12/22/98 02:25:25 (10 years ago)

Author:

frodo

Message:

More libary stuff

The bus translation functions.

Files:

• lm-sensors/trunk/lib/access.h (modified) (1 diff)
• lm-sensors/trunk/lib/conf-parse.y (modified) (1 diff)
• lm-sensors/trunk/lib/data.c (modified) (2 diffs)
• lm-sensors/trunk/lib/error.h (modified) (1 diff)
• lm-sensors/trunk/lib/general.c (modified) (1 diff)
• lm-sensors/trunk/lib/general.h (modified) (1 diff)
• lm-sensors/trunk/lib/init.c (modified) (1 diff)
• lm-sensors/trunk/lib/proc.c (modified) (2 diffs)
• lm-sensors/trunk/lib/proc.h (modified) (1 diff)
• lm-sensors/trunk/lib/sensors.h (modified) (1 diff)

lm-sensors/trunk/lib/access.h

@@ -71 +71 @@
-                                                         const char *feature);
-
+/* Substitute configuration bus numbers with real-world /proc bus numbers
+   in the chips lists */
+extern int sensors_substitute_busses(void);
+
-#endif /* def LIB_SENSORS_ACCESS_H */

lm-sensors/trunk/lib/conf-parse.y

@@ -262 +262 @@
-
-adapter_name:     NAME
-
+
+
-;
-
-algorithm_name:   NAME
-
+
+
-;
-

lm-sensors/trunk/lib/data.c

@@ -33 +33 @@
-int sensors_config_busses_max = 0;
-
+static int sensors_substitute_chip(sensors_chip_name *name,int lineno);
-
-/* Wow, this must be one of the ugliest functions I have ever written.
@@ -240 +241 @@
-  return 0;
-}
+
+int sensors_substitute_chip(sensors_chip_name *name,int lineno)
+{
+  int i,j;
+  for (i = 0; i < sensors_config_busses_count; i++)
+    if (sensors_config_busses[i].number == name->bus)
+      break;
+
+  if (i == sensors_config_busses_count) {
+    sensors_parse_error("Undeclared i2c bus referenced",lineno);
+    name->bus = sensors_proc_bus_count;
+    return -SENSORS_ERR_BUS_NAME;
+  }
+
+  for (j = 0; j < sensors_proc_bus_count; j++) {
+    if (!strcmp(sensors_config_busses[i].adapter,
+                sensors_proc_bus[j].adapter) &&
+        !strcmp(sensors_config_busses[i].algorithm,
+                sensors_proc_bus[j].algorithm)) 
+      break;
+  }
+
+  /* Well, if we did not find anything, j - sensors_proc_bus_count; so if
+     we set this chip's bus number to j, it will never be matched. Good. */
+  name->bus = j;
+  return 0;
+}
+
-      
+int sensors_substitute_busses(void)
+{
+  int err,i,j,lineno;
+  sensors_chip_name_list *chips;
+  int res=0;
-  
+  for(i = 0; i < sensors_config_chips_count; i++) {
+    lineno = sensors_config_chips[i].lineno;
+    chips = &sensors_config_chips[i].chips;
+    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_ANY) &&
+          (chips->fits[j].bus != SENSORS_CHIP_NAME_BUS_ANY_I2C))
+        if ((err = sensors_substitute_chip(chips->fits+j, lineno)))
+          res = err;
+  }
+  return res;
+}

lm-sensors/trunk/lib/error.h

@@ -37 +37 @@
-/* This function is called when a parse error is detected. Give it a new
-   value, and your own function is called instead of the default (which
-
+
+
-extern void (*sensors_parse_error) (const char *err, int lineno);
-

lm-sensors/trunk/lib/general.c

@@ -75 +75 @@
-  *num_el += nr_els;
-}
+
+/* Strip a string of all terminating spaces */
+void sensors_strip_of_spaces(char *name)
+{
+  int i;
+  for (i = strlen(name)-1; (i>=0) && (name[i] == ' '); i--);
+  name[i+1] = '\0';
+}

lm-sensors/trunk/lib/general.h

@@ -34 +34 @@
-                                  int *num_el, int *max_el, int el_size);
-
+/* Strip a string of all terminating spaces */
+extern void sensors_strip_of_spaces(char *name);
+
-#endif /* LIB_SENSORS_GENERAL */

lm-sensors/trunk/lib/init.c

@@ -47 +47 @@
-  sensors_yyin = input;
-  if ((res = sensors_yyparse()))
-
+
+
+
-  return 0;
-}

lm-sensors/trunk/lib/proc.c

@@ -96 +96 @@
-    return -SENSORS_ERR_PROC;
-  while (fgets(line,255,f)) {
+    if (strlen(line) > 0)
+      line[strlen(line)-1] = '\0';
-    if (! (border = rindex(line,'\t')))
-      goto ERROR;
@@ -113 +115 @@
-    if (sensors_parse_i2cbus_name(line,&entry.number))
-      goto ERROR;
+    sensors_strip_of_spaces(entry.algorithm);
+    sensors_strip_of_spaces(entry.adapter);
-    add_bus(&entry);
-  }

lm-sensors/trunk/lib/proc.h

@@ -24 +24 @@
-extern int sensors_read_proc_chips(void);
-
+/* Read /proc/bus/i2c */
+extern int sensors_read_proc_bus(void);
+
-/* Read a value out of a /proc file */
-extern int sensors_read_proc(sensors_chip_name name, int feature, 

lm-sensors/trunk/lib/sensors.h

@@ -37 +37 @@
-} sensors_chip_name;
-
-
+
+
+
-extern int sensors_init(FILE *input);
-