Changeset 4362

Timestamp:

04/09/07 16:43:29 (6 years ago)

Author:

jwrdegoede

Message:

generic chip printing routine for sensors prog, by Bob Schlarmann and Luuk Kleiweg

Location:

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors

Files:

• Module.mk (modified) (1 diff)
• main.c (modified) (7 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/Module.mk

@@ -28 +28 @@
 # defined value verbatim into the command-list of rules...
 PROGSENSORSTARGETS := $(MODULE_DIR)/sensors
-PROGSENSORSSOURCES := $(MODULE_DIR)/main.c $(MODULE_DIR)/chips.c
+PROGSENSORSSOURCES := $(MODULE_DIR)/main.c $(MODULE_DIR)/chips.c $(MODULE_DIR)/chips_generic.c
 
 # Include all dependency files. We use '.rd' to indicate this will create

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

@@ -35 +35 @@
 #include "chips.h"
 #include "version.h"
+#include "chips_generic.h"
 
 #define PROGRAM "sensors"
@@ -55 +56 @@
 sensors_chip_name chips[CHIPS_MAX];
 int chips_count=0;
-int do_sets, do_unknown, fahrenheit, hide_adapter, hide_unknown;
+int do_sets, do_unknown, fahrenheit, hide_adapter, hide_unknown, do_generic;
 
 char degstr[5]; /* store the correct string to print degrees */
@@ -75 +76 @@
   printf("  -u, --unknown         Treat chips as unknown ones (testing only)\n");
   printf("  -v, --version         Display the program version\n");
+  printf("  -g, --generic         Use generic printing routine for all chips (testing only)\n"); 
   printf("\n");
   printf("Use `-' after `-c' to read the config file from stdin.\n");
@@ -162 +164 @@
     /* next option accepted for compatibility, but otherwise ignored */
     { "algorithm", no_argument, NULL, 'a' },
+    { "generic", no_argument, NULL, 'g'},
     { 0,0,0,0 }
   };
@@ -171 +174 @@
   hide_adapter = 0;
   hide_unknown = 0;
+  do_generic = 0;
   while (1) {
-    c = getopt_long(argc,argv,"hsvfaAUc:u",long_opts,NULL);
+    c = getopt_long(argc,argv,"hsvfaAUc:ug",long_opts,NULL);
     if (c == EOF)
       break;
@@ -206 +210 @@
     case 'a':
       /* Ignore for compatibility */
+      break;
+    case 'g':
+      do_generic = 1;
       break;
     default:
@@ -448 +455 @@
   if (do_unknown)
     print_unknown_chip(&name);
+  else if(do_generic)
+    print_generic_chip(&name);
   else {
     if(m->prefix == NULL)
-        print_unknown_chip(&name);
+        print_generic_chip(&name);
     else
         m->fn(&name);