Changeset 5200

Timestamp:

04/24/08 14:08:02 (5 years ago)

Author:

khali

Message:

Don't print the list of i2c buses as part of the help.

Location:

i2c-tools/trunk/tools

Files:

• i2cbusses.c (modified) (2 diffs)
• i2cbusses.h (modified) (1 diff)
• i2cdetect.c (modified) (2 diffs)
• i2cdump.c (modified) (1 diff)
• i2cget.c (modified) (1 diff)
• i2cset.c (modified) (1 diff)

i2c-tools/trunk/tools/i2cbusses.c

@@ -296 +296 @@
 
 /*
-   this just prints out the installed i2c busses in a consistent format, whether
-   on a 2.4 kernel using /proc or a 2.6 kernel using /sys.
-   If procfmt == 1, print out exactly /proc/bus/i2c format on stdout.
-   This allows this to be used in a program to emulate /proc/bus/i2c on a
-   sysfs system.
-*/
-void print_i2c_busses(int procfmt)
+ * Print the installed i2c busses. The format is those of Linux 2.4's
+ * /proc/bus/i2c for historical compatibility reasons.
+ */
+void print_i2c_busses(void)
 {
         struct i2c_adap *adapters;
@@ -314 +311 @@
 
         for (count = 0; adapters[count].name; count++) {
-                if (count == 0 && !procfmt)
-                        fprintf(stderr,"  Installed I2C busses:\n");
-                if (procfmt)
-                        /* match 2.4 /proc/bus/i2c format as closely as possible */
-                        printf("i2c-%d\t%-10s\t%-32s\t%s\n",
-                                adapters[count].nr,
-                                adapters[count].funcs,
-                                adapters[count].name,
-                                adapters[count].algo);
-                else
-                        fprintf(stderr, "    i2c-%d\t%-10s\t%s\n",
-                                adapters[count].nr,
-                                adapters[count].funcs,
-                                adapters[count].name);
-        }
-
-        if(count == 0 && !procfmt)
-                fprintf(stderr,"Error: No I2C busses found!\n"
-                               "Be sure you have done 'modprobe i2c-dev'\n"
-                               "and also modprobed your i2c bus drivers\n");
+                printf("i2c-%d\t%-10s\t%-32s\t%s\n",
+                        adapters[count].nr, adapters[count].funcs,
+                        adapters[count].name, adapters[count].algo);
+        }
 
         free_adapters(adapters);

i2c-tools/trunk/tools/i2cbusses.h

@@ -23 +23 @@
 #define _I2CBUSSES_H
 
-void print_i2c_busses(int procfmt);
+void print_i2c_busses(void);
 
 int lookup_i2c_bus(const char *i2cbus_arg);

i2c-tools/trunk/tools/i2cdetect.c

@@ -50 +50 @@
                 "  If provided, FIRST and LAST limit the probing range.\n"
                 "  With -l, lists installed busses only\n");
-        print_i2c_busses(0);
 }
 
@@ -227 +226 @@
 
         if (list) {
-                print_i2c_busses(1);
+                print_i2c_busses();
                 exit(0);
         }

i2c-tools/trunk/tools/i2cdump.c

@@ -49 +49 @@
                 "bank 0, reg 0x4e)\n"
                 "  BANK is the command for smbusblock accesses (default 0)\n");
-        print_i2c_busses(0);
 }
 

i2c-tools/trunk/tools/i2cget.c

@@ -48 +48 @@
                 "  Append 'p' to MODE for PEC checking\n"
                 "  I2CBUS is an integer\n");
-        print_i2c_busses(0);
         exit(1);
 }

i2c-tools/trunk/tools/i2cset.c

@@ -41 +41 @@
                 "  Append 'p' to MODE for PEC checking\n"
                 "  I2CBUS is an integer\n");
-        print_i2c_busses(0);
         exit(1);
 }