Changeset 2675

Timestamp:

08/28/04 22:42:49 (9 years ago)

Author:

khali

Message:

Refactor i2c device opening.

Location:

lm-sensors/trunk/prog

Files:

• detect/i2cdetect.c (modified) (4 diffs)
• dump/i2cbusses.c (modified) (2 diffs)
• dump/i2cdump.c (modified) (4 diffs)
• dump/i2cset.c (modified) (3 diffs)

lm-sensors/trunk/prog/detect/i2cdetect.c

@@ -26 +26 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
+#include "../dump/i2cbusses.h"
 #include "i2c-dev.h"
 #include "version.h"
@@ -33 +33 @@
 #define MODE_QUICK      1
 #define MODE_READ       2
-
-void print_i2c_busses(int);
 
 void help(void)
@@ -48 +46 @@
 
         print_i2c_busses(0);
-}
-
-int open_i2c_dev(const int i2cbus, char *filename)
-{
-        int file;
-
-        sprintf(filename, "/dev/i2c-%d", i2cbus);
-        file = open(filename, O_RDWR);
-
-        if (file >= 0 || errno != ENOENT) {
-                return file;
-        }
-
-        sprintf(filename, "/dev/i2c/%d", i2cbus);
-        file = open(filename, O_RDWR);
-        
-        return file;
 }
 
@@ -232 +213 @@
   file = open_i2c_dev(i2cbus, filename);
   if (file < 0) {
-    if (errno == ENOENT) {
-      fprintf(stderr, "Error: Could not open file `/dev/i2c-%d' or `/dev/i2c/%d': %s\n",
-              i2cbus, i2cbus, strerror(ENOENT));
-    } else {
-      fprintf(stderr, "Error: Could not open file `%s': %s\n",
-              filename, strerror(errno));
-      if (errno == EACCES)
-        fprintf(stderr, "Run as root?\n");
-    }
     exit(1);
   }

lm-sensors/trunk/prog/dump/i2cbusses.c

@@ -21 +21 @@
 */
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <string.h>
 #include <stdio.h>
 #include <limits.h>
 #include <dirent.h>
+#include <fcntl.h>
+#include <errno.h>
+#include "i2cbusses.h"
 
 /*
@@ -164 +169 @@
                                "and also modprobed your i2c bus drivers\n");
 }
+
+int open_i2c_dev(const int i2cbus, char *filename)
+{
+        int file;
+
+        sprintf(filename, "/dev/i2c/%d", i2cbus);
+        file = open(filename, O_RDWR);
+
+        if (file < 0 && errno == ENOENT) {
+                sprintf(filename, "/dev/i2c-%d", i2cbus);
+                file = open(filename, O_RDWR);
+        }
+
+        if (file < 0) {
+                if (errno == ENOENT) {
+                        fprintf(stderr, "Error: Could not open file "
+                                "`/dev/i2c-%d' or `/dev/i2c/%d': %s\n",
+                                i2cbus, i2cbus, strerror(ENOENT));
+                } else {
+                        fprintf(stderr, "Error: Could not open file "
+                                "`%s': %s\n", filename, strerror(errno));
+                        if (errno == EACCES)
+                                fprintf(stderr, "Run as root?\n");
+                }
+        }
+        
+        return file;
+}

lm-sensors/trunk/prog/dump/i2cdump.c

@@ -25 +25 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
+#include "i2cbusses.h"
 #include "i2c-dev.h"
 #include "version.h"
@@ -43 +43 @@
 #define HAVE_PEC 1
 #endif
-
-void print_i2c_busses(int);
 
 void help(void)
@@ -65 +63 @@
         char *end;
         int i, j, res, res2, i2cbus, address, size, file;
-        int e1, e2;
         int bank = 0, bankreg = 0x4E;
-        char filename1[20];
-        char filename2[20];
-        char *filename;
+        char filename[20];
         long funcs;
         unsigned char cblock[256];
@@ -175 +170 @@
         }
 
-        /*
-         * Try both variants and give the correct error message
-         * upon failure
-         */
-
-        sprintf(filename1, "/dev/i2c-%d", i2cbus);
-        sprintf(filename2, "/dev/i2c/%d", i2cbus);
-        if ((file = open(filename1, O_RDWR)) < 0) {
-                e1 = errno;
-                if ((file = open(filename2, O_RDWR)) < 0) {
-                        e2 = errno;
-                        if (e1 == ENOENT && e2 == ENOENT) {
-                                fprintf(stderr, "Error: Could not open file "
-                                        "`%s' or `%s': %s\n", filename1,
-                                        filename2, strerror(ENOENT));
-                        }
-                        if (e1 != ENOENT) {
-                                fprintf(stderr, "Error: Could not open file "
-                                        "`%s': %s\n", filename1,
-                                        strerror(e1));
-                                if (e1 == EACCES)
-                                        fprintf(stderr, "Run as root?\n");
-                        }
-                        if (e2 != ENOENT) {
-                                fprintf(stderr, "Error: Could not open file "
-                                        "`%s' : %s\n", filename2,
-                                        strerror(e2));
-                                if (e2 == EACCES)
-                                        fprintf(stderr, "Run as root?\n");
-                        }
-                        exit(1);
-                } else {
-                        filename = filename2;
-                }
-        } else {
-                filename = filename1;
+        file = open_i2c_dev(i2cbus, filename);
+        if (file < 0) {
+                exit(1);
         }
 

lm-sensors/trunk/prog/dump/i2cset.c

@@ -25 +25 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
+#include "i2cbusses.h"
 #include "i2c-dev.h"
 #include "version.h"
 
-void print_i2c_busses(int);
 void help(void) __attribute__ ((noreturn));
 
@@ -47 +46 @@
         int res, i2cbus, address, size, file;
         int value, daddress;
-        int e1, e2;
-        char filename1[20];
-        char filename2[20];
-        char *filename;
+        int e1;
+        char filename[20];
         long funcs;
 
@@ -104 +101 @@
         }
 
-        /*
-         * Try both variants and give the correct error message
-         * upon failure
-         */
-
-        sprintf(filename1, "/dev/i2c-%d", i2cbus);
-        sprintf(filename2, "/dev/i2c/%d", i2cbus);
-        if ((file = open(filename1, O_RDWR)) < 0) {
-                e1 = errno;
-                if ((file = open(filename2, O_RDWR)) < 0) {
-                        e2 = errno;
-                        if (e1 == ENOENT && e2 == ENOENT) {
-                                fprintf(stderr, "Error: Could not open file "
-                                        "`%s' or `%s': %s\n", filename1,
-                                        filename2, strerror(ENOENT));
-                        }
-                        if (e1 != ENOENT) {
-                                fprintf(stderr, "Error: Could not open file "
-                                        ":`%s': %s\n", filename1,
-                                        strerror(e1));
-                                if (e1 == EACCES)
-                                        fprintf(stderr, "Run as root?\n");
-                        }
-                        if (e2 != ENOENT) {
-                                fprintf(stderr, "Error: Could not open file "
-                                        "`%s' : %s\n", filename2,
-                                        strerror(e2));
-                                if (e2 == EACCES)
-                                        fprintf(stderr, "Run as root?\n");
-                        }
-                        exit(1);
-                } else {
-                        filename = filename2;
-                }
-        } else {
-                filename = filename1;
+        file = open_i2c_dev(i2cbus, filename);
+        if (file < 0) {
+                exit(1);
         }