Changeset 5203

Timestamp:

04/24/08 14:32:16 (5 years ago)

Author:

khali

Message:

Consistently restrict the allowed I2C device address to 0x03 - 0x77.

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• tools/i2cdump.8 (modified) (1 diff)
• tools/i2cdump.c (modified) (2 diffs)
• tools/i2cget.c (modified) (2 diffs)
• tools/i2cset.8 (modified) (1 diff)
• tools/i2cset.c (modified) (3 diffs)

i2c-tools/trunk/CHANGES

@@ -8 +8 @@
   i2cdump: Support i2c bus passed by name
            Shorten the usage message
+           Restrict the chip address to 0x03-0x77
   i2cget: Support i2c bus passed by name
           Shorten the usage message
   i2cset: Support i2c bus passed by name
           Shorten the usage message
+          Restrict the chip address to 0x03-0x77
 
 3.0.1 (2008-04-04)

i2c-tools/trunk/tools/i2cdump.8

@@ -46 +46 @@
 number or name of the I2C bus to be scanned. This number should correspond to one
 of the busses listed by \fIi2cdetect -l\fR. \fIaddress\fR indicates the
-address to be scanned on that bus, and is an integer between 0x00 and 0x7F.
+address to be scanned on that bus, and is an integer between 0x03 and 0x77.
 .PP
 The \fImode\fR parameter, if specified, is one of the letters \fBb\fP, \fBw\fP,

i2c-tools/trunk/tools/i2cdump.c

@@ -36 +36 @@
                 "Usage: i2cdump [-f] [-y] [-r first-last] I2CBUS ADDRESS [MODE] [BANK [BANKREG]]\n"
                 "  I2CBUS is an integer or an I2C bus name\n"
-                "  ADDRESS is an integer (0x00 - 0x7f)\n"
+                "  ADDRESS is an integer (0x03 - 0x77)\n"
                 "  MODE is one of:\n"
                 "    b (byte, default)\n"
@@ -104 +104 @@
                 exit(1);
         }
-        if (address < 0 || address > 0x7f) {
+        if (address < 0x03 || address > 0x77) {
                 fprintf(stderr, "Error: Address out of range!\n");
                 help();

i2c-tools/trunk/tools/i2cget.c

@@ -1 +1 @@
 /*
     i2cget.c - A user-space program to read an I2C register.
-    Copyright (C) 2005       Jean Delvare <khali@linux-fr.org>
+    Copyright (C) 2005-2008  Jean Delvare <khali@linux-fr.org>
 
     Based on i2cset.c:
@@ -191 +191 @@
 
         address = strtol(argv[flags+2], &end, 0);
-        if (*end || address < 3 || address > 0x77) {
+        if (*end || address < 0x03 || address > 0x77) {
                 fprintf(stderr, "Error: Chip address invalid!\n");
                 help();

i2c-tools/trunk/tools/i2cset.8

@@ -43 +43 @@
 or name of the I2C bus to be scanned.  This number should correspond to one of
 the busses listed by \fIi2cdetect -l\fR. \fIchip-address\fR specifies the
-address of the chip on that bus, and is an integer between 0x00 and 0x7F.
+address of the chip on that bus, and is an integer between 0x03 and 0x77.
 \fIdata-address\fR specifies the address on that chip to write to, and is an
 integer between 0x00 and 0xFF. \fIvalue\fR is the value to write to that

i2c-tools/trunk/tools/i2cset.c

@@ -3 +3 @@
     Copyright (C) 2001-2003  Frodo Looijaard <frodol@dds.nl>, and
                              Mark D. Studebaker <mdsxyz123@yahoo.com>
-    Copyright (C) 2004-2005  Jean Delvare <khali@linux-fr.org>
+    Copyright (C) 2004-2008  Jean Delvare <khali@linux-fr.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -38 +38 @@
                 "Usage: i2cset [-f] [-y] I2CBUS CHIP-ADDRESS DATA-ADDRESS VALUE [MODE] [MASK]\n"
                 "  I2CBUS is an integer or an I2C bus name\n"
-                "  ADDRESS is an integer (0x00 - 0x7f)\n"
+                "  ADDRESS is an integer (0x03 - 0x77)\n"
                 "  MODE is one of:\n"
                 "    b (byte, default)\n"
@@ -85 +85 @@
 
         address = strtol(argv[flags+2], &end, 0);
-        if (*end || address < 0 || address > 0x7f) {
+        if (*end || address < 0x03 || address > 0x77) {
                 fprintf(stderr, "Error: Chip address invalid!\n");
                 help();