Changeset 3496 for i2c/trunk/kernel/i2c-dev.c

Timestamp:

08/31/00 01:15:32 (13 years ago)

Author:

frodo

Message:

Integrated Philipp Matthias Hahn's devfs patch

Files:

• i2c/trunk/kernel/i2c-dev.c (modified) (10 diffs)

i2c/trunk/kernel/i2c-dev.c

@@ -25 +25 @@
 
 /* The I2C_RDWR ioctl code is written by Kolja Waschk <waschk@telos.de> */
+
+/* The devfs code is contributed by Philipp Matthias Hahn 
+   <pmhahn@titan.lahn.de> */
 
 /* $Id$ */
@@ -36 +39 @@
 #include <linux/smp_lock.h>
 #endif /* LINUX_KERNEL_VERSION >= KERNEL_VERSION(2,4,0) */
+#ifdef CONFIG_DEVFS_FS
+#include <linux/devfs_fs_kernel.h>
+#endif
+
 
 /* If you want debugging uncomment: */
@@ -93 +100 @@
 #define I2CDEV_ADAPS_MAX I2C_ADAP_MAX
 static struct i2c_adapter *i2cdev_adaps[I2CDEV_ADAPS_MAX];
+#ifdef CONFIG_DEVFS_FS
+static devfs_handle_t devfs_i2c[I2CDEV_ADAPS_MAX];
+static devfs_handle_t devfs_handle = NULL;
+#endif
 
 static struct i2c_driver i2cdev_driver = {
-        /* name */              "i2c-dev dummy driver",
-        /* id */                I2C_DRIVERID_I2CDEV,
-        /* flags */             I2C_DF_DUMMY,
-        /* attach_adapter */    i2cdev_attach_adapter,
-        /* detach_client */     i2cdev_detach_client,
-        /* command */           i2cdev_command,
-        /* inc_use */           NULL,
-        /* dec_use */           NULL,
+        name:           "i2c-dev dummy driver",
+        id:             I2C_DRIVERID_I2CDEV,
+        flags:          I2C_DF_DUMMY,
+        attach_adapter: i2cdev_attach_adapter,
+        detach_client:  i2cdev_detach_client,
+        command:        i2cdev_command,
+/*      inc_use:        NULL,
+        dec_use:        NULL, */
 };
 
 static struct i2c_client i2cdev_client_template = {
-        /* name */              "I2C /dev entry",
-        /* id */                1,
-        /* flags */             0,
-        /* addr */              -1,
-        /* adapter */           NULL,
-        /* driver */            &i2cdev_driver,
-        /* data */              NULL
+        name:           "I2C /dev entry",
+        id:             1,
+        flags:          0,
+        addr:           -1,
+/*      adapter:        NULL, */
+        driver:         &i2cdev_driver,
+/*      data:           NULL */
 };
 
@@ -123 +134 @@
 #ifdef DEBUG
         struct inode *inode = file->f_dentry->d_inode;
-        printk("i2c-dev,o: i2c-%d lseek to %ld bytes relative to %d.\n",
+        printk("i2c-dev.o: i2c-%d lseek to %ld bytes relative to %d.\n",
                MINOR(inode->i_rdev),(long) offset,origin);
 #endif /* DEBUG */
@@ -147 +158 @@
 
 #ifdef DEBUG
-        printk("i2c-dev,o: i2c-%d reading %d bytes.\n",MINOR(inode->i_rdev),
+        printk("i2c-dev.o: i2c-%d reading %d bytes.\n",MINOR(inode->i_rdev),
                count);
 #endif
@@ -179 +190 @@
 
 #ifdef DEBUG
-        printk("i2c-dev,o: i2c-%d writing %d bytes.\n",MINOR(inode->i_rdev),
+        printk("i2c-dev.o: i2c-%d writing %d bytes.\n",MINOR(inode->i_rdev),
                count);
 #endif
@@ -416 +427 @@
 {
         int i;
+        char name[8];
 
         if ((i = i2c_adapter_id(adap)) < 0) {
@@ -426 +438 @@
         }
 
+        sprintf (name, "%d", i);
         if (! i2cdev_adaps[i]) {
                 i2cdev_adaps[i] = adap;
+#ifdef CONFIG_DEVFS_FS
+                devfs_i2c[i] = devfs_register (devfs_handle, name,
+                        DEVFS_FL_DEFAULT, I2C_MAJOR, i,
+                        S_IFCHR | S_IRUSR | S_IWUSR,
+                        &i2cdev_fops, NULL);
+#endif
                 printk("i2c-dev.o: Registered '%s' as minor %d\n",adap->name,i);
         } else {
                 /* This is actually a detach_adapter call! */
+#ifdef CONFIG_DEVFS_FS
+                devfs_unregister(devfs_i2c[i]);
+#endif
                 i2cdev_adaps[i] = NULL;
 #ifdef DEBUG
@@ -458 +480 @@
 
         i2cdev_initialized = 0;
+#ifdef CONFIG_DEVFS_FS
+        if (devfs_register_chrdev(I2C_MAJOR, "i2c", &i2cdev_fops)) {
+#else
         if (register_chrdev(I2C_MAJOR,"i2c",&i2cdev_fops)) {
+#endif
                 printk("i2c-dev.o: unable to get major %d for i2c bus\n",
                        I2C_MAJOR);
                 return -EIO;
         }
+#ifdef CONFIG_DEVFS_FS
+        devfs_handle = devfs_mk_dir(NULL, "i2c", NULL);
+#endif
         i2cdev_initialized ++;
 
@@ -488 +517 @@
 
         if (i2cdev_initialized >= 1) {
+#ifdef CONFIG_DEVFS_FS
+                devfs_unregister(devfs_handle);
+                if ((res = devfs_unregister_chrdev(I2C_MAJOR, "i2c"))) {
+#else
                 if ((res = unregister_chrdev(I2C_MAJOR,"i2c"))) {
+#endif
                         printk("i2c-dev.o: unable to release major %d for i2c bus\n",
                                I2C_MAJOR);