Changeset 165

Timestamp:

01/13/99 21:47:52 (14 years ago)

Author:

frodo

Message:

i2c-dev is now working!

You can now use i2cdump to dump SMBus device registers!

Location:

lm-sensors/trunk

Files:

• kernel/i2c-dev.c (modified) (8 diffs)
• kernel/i2c-proc.c (modified) (1 diff)
• prog/dump/i2cdump.c (modified) (2 diffs)
• src/i2c-dev.c (modified) (8 diffs)
• src/i2c-proc.c (modified) (1 diff)

lm-sensors/trunk/kernel/i2c-dev.c

@@ -233 +233 @@
 {
   struct i2c_client *client = (struct i2c_client *)file->private_data;
-  struct i2c_smbus_data *data_arg;
+  struct i2c_smbus_data data_arg;
   union smbus_data temp;
   int ver,datasize,res;
@@ -255 +255 @@
       return -EINVAL;
     case I2C_SMBUS:
-      if (! (data_arg = (struct i2c_smbus_data *) arg)) {
+      if (! arg) {
 #ifdef DEBUG
         printk("i2c-dev.o: NULL argument pointer in ioctl I2C_SMBUS.\n");
@@ -261 +261 @@
         return -EINVAL;
       }
-      if (verify_area(VERIFY_READ,data_arg,sizeof(struct i2c_smbus_data))) {
-#ifdef DEBUG
-        printk("i2c-dev.o: invalid argument pointer (%p) "
-               "in IOCTL I2C_SMBUS.\n", data_arg);
-#endif
-        return -EINVAL;
-      }
-      if ((data_arg->size != SMBUS_BYTE) && 
-          (data_arg->size != SMBUS_QUICK) &&
-          (data_arg->size != SMBUS_BYTE_DATA) && 
-          (data_arg->size != SMBUS_WORD_DATA) &&
-          (data_arg->size != SMBUS_PROC_CALL) &&
-          (data_arg->size != SMBUS_BLOCK_DATA)) {
+      if (verify_area(VERIFY_READ,(struct i2c_smbus_data *) arg,
+          sizeof(struct i2c_smbus_data))) {
+#ifdef DEBUG
+        printk("i2c-dev.o: invalid argument pointer (%ld) "
+               "in IOCTL I2C_SMBUS.\n", arg);
+#endif
+        return -EINVAL;
+      }
+      copy_from_user(&data_arg,(struct i2c_smbus_data *) arg,
+                     sizeof(struct i2c_smbus_data));
+      if ((data_arg.size != SMBUS_BYTE) && 
+          (data_arg.size != SMBUS_QUICK) &&
+          (data_arg.size != SMBUS_BYTE_DATA) && 
+          (data_arg.size != SMBUS_WORD_DATA) &&
+          (data_arg.size != SMBUS_PROC_CALL) &&
+          (data_arg.size != SMBUS_BLOCK_DATA)) {
 #ifdef DEBUG
         printk("i2c-dev.o: size out of range (%x) in ioctl I2C_SMBUS.\n",
-               data_arg->size);
+               data_arg.size);
 #endif
         return -EINVAL;
@@ -282 +285 @@
       /* Note that SMBUS_READ and SMBUS_WRITE are 0 and 1, so the check is
          valid if size==SMBUS_QUICK too. */
-      if ((data_arg->read_write != SMBUS_READ) && 
-          (data_arg->read_write != SMBUS_WRITE)) {
+      if ((data_arg.read_write != SMBUS_READ) && 
+          (data_arg.read_write != SMBUS_WRITE)) {
 #ifdef DEBUG
         printk("i2c-dev.o: read_write out of range (%x) in ioctl I2C_SMBUS.\n",
-               data_arg->read_write);
+               data_arg.read_write);
 #endif
         return -EINVAL;
@@ -293 +296 @@
       /* Note that command values are always valid! */
 
-      if ((data_arg->size == SMBUS_QUICK) ||
-          ((data_arg->size == SMBUS_BYTE) && 
-           (data_arg->read_write == SMBUS_WRITE)))
+      if ((data_arg.size == SMBUS_QUICK) ||
+          ((data_arg.size == SMBUS_BYTE) && 
+           (data_arg.read_write == SMBUS_WRITE)))
         /* These are special: we do not use data */
         return smbus_access(client->adapter, client->addr, 
-                            data_arg->read_write, data_arg->command,
-                            data_arg->size, NULL);
-
-      if (data_arg->data == NULL) {
+                            data_arg.read_write, data_arg.command,
+                            data_arg.size, NULL);
+
+      if (data_arg.data == NULL) {
 #ifdef DEBUG
         printk("i2c-dev.o: data is NULL pointer in ioctl I2C_SMBUS.\n");
@@ -310 +313 @@
       /* This seems unlogical but it is not: if the user wants to read a
          value, we must write that value to user memory! */
-      ver = (data_arg->read_write == SMBUS_WRITE)?VERIFY_READ:VERIFY_WRITE;
-
-      if ((data_arg->size == SMBUS_BYTE_DATA) || (data_arg->size == SMBUS_BYTE))
-        datasize = sizeof(data_arg->data->byte);
-      else if (data_arg->size == SMBUS_WORD_DATA)
-        datasize = sizeof(data_arg->data->word);
+      ver = (data_arg.read_write == SMBUS_WRITE)?VERIFY_READ:VERIFY_WRITE;
+
+      if ((data_arg.size == SMBUS_BYTE_DATA) || (data_arg.size == SMBUS_BYTE))
+        datasize = sizeof(data_arg.data->byte);
+      else if (data_arg.size == SMBUS_WORD_DATA)
+        datasize = sizeof(data_arg.data->word);
       else /* size == SMBUS_BLOCK_DATA */
-        datasize = sizeof(data_arg->data->block);
-
-      if (verify_area(ver,data_arg->data,datasize)) {
+        datasize = sizeof(data_arg.data->block);
+
+      if (verify_area(ver,data_arg.data,datasize)) {
 #ifdef DEBUG
         printk("i2c-dev.o: invalid pointer data (%p) in ioctl I2C_SMBUS.\n",
-               data_arg->data);
-#endif
-        return -EINVAL;
-      }
-      if (data_arg->read_write == SMBUS_WRITE) {
-        copy_from_user(&temp,data_arg->data,datasize);
-        return smbus_access(client->adapter,client->addr,data_arg->read_write,
-                            data_arg->command,data_arg->size,&temp);
+               data_arg.data);
+#endif
+        return -EINVAL;
+      }
+      if (data_arg.read_write == SMBUS_WRITE) {
+        copy_from_user(&temp,data_arg.data,datasize);
+        return smbus_access(client->adapter,client->addr,data_arg.read_write,
+                            data_arg.command,data_arg.size,&temp);
       } else {
-        res = smbus_access(client->adapter,client->addr,data_arg->read_write,
-                           data_arg->command,data_arg->size,&temp);
+        res = smbus_access(client->adapter,client->addr,data_arg.read_write,
+                           data_arg.command,data_arg.size,&temp);
         if (!res)
-          copy_to_user(data_arg->data,&temp,datasize);
+          copy_to_user(data_arg.data,&temp,datasize);
         return res;
       }
@@ -407 +410 @@
   if (i2c_is_isa_adapter(adap)) {
 #ifdef DEBUG
-    printk("i2c-dev.o: Can't open ISA adapter!\n");
+    printk("i2c-dev.o: Can't attach ISA adapter!\n");
 #endif
     return 0;
@@ -423 +426 @@
   }
   i2cdev_clients[i] = client;
-  printk("i2cdev.o: Registered '%s' as minor %d\n",adap->name,i);
+  printk("i2c-dev.o: Registered '%s' as minor %d\n",adap->name,i);
   return 0;
 }

lm-sensors/trunk/kernel/i2c-proc.c

@@ -302 +302 @@
           /* Filter out dummy clients */
 #ifndef DEBUG
-          if (client->driver->id != I2C_DRIVERID_I2CPROC)
+          if ((client->driver->id != I2C_DRIVERID_I2CPROC) &&
+              (client->driver->id != I2C_DRIVERID_I2CDEV))
 #endif /* ndef DEBUG */
             len += sprintf(kbuf+len,"%x\t%-32s\t%-32s\n",

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

@@ -96 +96 @@
   }
  
-  fprintf(stderr,"  WARNING! Running this program can confuse your I2C bus, "
+  fprintf(stderr,"  WARNING! This program can confuse your I2C bus, "
           "cause data loss and worse!\n");
   fprintf(stderr,"  I will probe file %s, address %x, mode %s\n",
@@ -121 +121 @@
       printf("%02x: ",i);
       for(j = 0; j < 8; j++) {
-        res = i2c_smbus_read_byte_data(file,i+j);
+        res = i2c_smbus_read_word_data(file,i+j);
         if (res < 0)
           printf("XXXX ");

lm-sensors/trunk/src/i2c-dev.c

@@ -233 +233 @@
 {
   struct i2c_client *client = (struct i2c_client *)file->private_data;
-  struct i2c_smbus_data *data_arg;
+  struct i2c_smbus_data data_arg;
   union smbus_data temp;
   int ver,datasize,res;
@@ -255 +255 @@
       return -EINVAL;
     case I2C_SMBUS:
-      if (! (data_arg = (struct i2c_smbus_data *) arg)) {
+      if (! arg) {
 #ifdef DEBUG
         printk("i2c-dev.o: NULL argument pointer in ioctl I2C_SMBUS.\n");
@@ -261 +261 @@
         return -EINVAL;
       }
-      if (verify_area(VERIFY_READ,data_arg,sizeof(struct i2c_smbus_data))) {
-#ifdef DEBUG
-        printk("i2c-dev.o: invalid argument pointer (%p) "
-               "in IOCTL I2C_SMBUS.\n", data_arg);
-#endif
-        return -EINVAL;
-      }
-      if ((data_arg->size != SMBUS_BYTE) && 
-          (data_arg->size != SMBUS_QUICK) &&
-          (data_arg->size != SMBUS_BYTE_DATA) && 
-          (data_arg->size != SMBUS_WORD_DATA) &&
-          (data_arg->size != SMBUS_PROC_CALL) &&
-          (data_arg->size != SMBUS_BLOCK_DATA)) {
+      if (verify_area(VERIFY_READ,(struct i2c_smbus_data *) arg,
+          sizeof(struct i2c_smbus_data))) {
+#ifdef DEBUG
+        printk("i2c-dev.o: invalid argument pointer (%ld) "
+               "in IOCTL I2C_SMBUS.\n", arg);
+#endif
+        return -EINVAL;
+      }
+      copy_from_user(&data_arg,(struct i2c_smbus_data *) arg,
+                     sizeof(struct i2c_smbus_data));
+      if ((data_arg.size != SMBUS_BYTE) && 
+          (data_arg.size != SMBUS_QUICK) &&
+          (data_arg.size != SMBUS_BYTE_DATA) && 
+          (data_arg.size != SMBUS_WORD_DATA) &&
+          (data_arg.size != SMBUS_PROC_CALL) &&
+          (data_arg.size != SMBUS_BLOCK_DATA)) {
 #ifdef DEBUG
         printk("i2c-dev.o: size out of range (%x) in ioctl I2C_SMBUS.\n",
-               data_arg->size);
+               data_arg.size);
 #endif
         return -EINVAL;
@@ -282 +285 @@
       /* Note that SMBUS_READ and SMBUS_WRITE are 0 and 1, so the check is
          valid if size==SMBUS_QUICK too. */
-      if ((data_arg->read_write != SMBUS_READ) && 
-          (data_arg->read_write != SMBUS_WRITE)) {
+      if ((data_arg.read_write != SMBUS_READ) && 
+          (data_arg.read_write != SMBUS_WRITE)) {
 #ifdef DEBUG
         printk("i2c-dev.o: read_write out of range (%x) in ioctl I2C_SMBUS.\n",
-               data_arg->read_write);
+               data_arg.read_write);
 #endif
         return -EINVAL;
@@ -293 +296 @@
       /* Note that command values are always valid! */
 
-      if ((data_arg->size == SMBUS_QUICK) ||
-          ((data_arg->size == SMBUS_BYTE) && 
-           (data_arg->read_write == SMBUS_WRITE)))
+      if ((data_arg.size == SMBUS_QUICK) ||
+          ((data_arg.size == SMBUS_BYTE) && 
+           (data_arg.read_write == SMBUS_WRITE)))
         /* These are special: we do not use data */
         return smbus_access(client->adapter, client->addr, 
-                            data_arg->read_write, data_arg->command,
-                            data_arg->size, NULL);
-
-      if (data_arg->data == NULL) {
+                            data_arg.read_write, data_arg.command,
+                            data_arg.size, NULL);
+
+      if (data_arg.data == NULL) {
 #ifdef DEBUG
         printk("i2c-dev.o: data is NULL pointer in ioctl I2C_SMBUS.\n");
@@ -310 +313 @@
       /* This seems unlogical but it is not: if the user wants to read a
          value, we must write that value to user memory! */
-      ver = (data_arg->read_write == SMBUS_WRITE)?VERIFY_READ:VERIFY_WRITE;
-
-      if ((data_arg->size == SMBUS_BYTE_DATA) || (data_arg->size == SMBUS_BYTE))
-        datasize = sizeof(data_arg->data->byte);
-      else if (data_arg->size == SMBUS_WORD_DATA)
-        datasize = sizeof(data_arg->data->word);
+      ver = (data_arg.read_write == SMBUS_WRITE)?VERIFY_READ:VERIFY_WRITE;
+
+      if ((data_arg.size == SMBUS_BYTE_DATA) || (data_arg.size == SMBUS_BYTE))
+        datasize = sizeof(data_arg.data->byte);
+      else if (data_arg.size == SMBUS_WORD_DATA)
+        datasize = sizeof(data_arg.data->word);
       else /* size == SMBUS_BLOCK_DATA */
-        datasize = sizeof(data_arg->data->block);
-
-      if (verify_area(ver,data_arg->data,datasize)) {
+        datasize = sizeof(data_arg.data->block);
+
+      if (verify_area(ver,data_arg.data,datasize)) {
 #ifdef DEBUG
         printk("i2c-dev.o: invalid pointer data (%p) in ioctl I2C_SMBUS.\n",
-               data_arg->data);
-#endif
-        return -EINVAL;
-      }
-      if (data_arg->read_write == SMBUS_WRITE) {
-        copy_from_user(&temp,data_arg->data,datasize);
-        return smbus_access(client->adapter,client->addr,data_arg->read_write,
-                            data_arg->command,data_arg->size,&temp);
+               data_arg.data);
+#endif
+        return -EINVAL;
+      }
+      if (data_arg.read_write == SMBUS_WRITE) {
+        copy_from_user(&temp,data_arg.data,datasize);
+        return smbus_access(client->adapter,client->addr,data_arg.read_write,
+                            data_arg.command,data_arg.size,&temp);
       } else {
-        res = smbus_access(client->adapter,client->addr,data_arg->read_write,
-                           data_arg->command,data_arg->size,&temp);
+        res = smbus_access(client->adapter,client->addr,data_arg.read_write,
+                           data_arg.command,data_arg.size,&temp);
         if (!res)
-          copy_to_user(data_arg->data,&temp,datasize);
+          copy_to_user(data_arg.data,&temp,datasize);
         return res;
       }
@@ -407 +410 @@
   if (i2c_is_isa_adapter(adap)) {
 #ifdef DEBUG
-    printk("i2c-dev.o: Can't open ISA adapter!\n");
+    printk("i2c-dev.o: Can't attach ISA adapter!\n");
 #endif
     return 0;
@@ -423 +426 @@
   }
   i2cdev_clients[i] = client;
-  printk("i2cdev.o: Registered '%s' as minor %d\n",adap->name,i);
+  printk("i2c-dev.o: Registered '%s' as minor %d\n",adap->name,i);
   return 0;
 }

lm-sensors/trunk/src/i2c-proc.c

@@ -302 +302 @@
           /* Filter out dummy clients */
 #ifndef DEBUG
-          if (client->driver->id != I2C_DRIVERID_I2CPROC)
+          if ((client->driver->id != I2C_DRIVERID_I2CPROC) &&
+              (client->driver->id != I2C_DRIVERID_I2CDEV))
 #endif /* ndef DEBUG */
             len += sprintf(kbuf+len,"%x\t%-32s\t%-32s\n",