Introduced basic support for registration of "can" class and call devices,

[lincan.git] / lincan / src / main.c

diff --git a/lincan/src/main.c b/lincan/src/main.c
index dac96200c05c5d6402763279ce9a32152a877df9..1a868a72996e7770c0ede4819ba1814cdc93d280 100644 (file)
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -23,8 +23,19 @@
 #include <linux/autoconf.h>
 #include <linux/interrupt.h>
 
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
-#include <linux/wrapper.h>
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
+ #include <linux/wrapper.h>
+#else
+ #include <linux/device.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
+  static struct class *can_class;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+  static struct class_simple *can_class;
+  #define class_create class_simple_create
+  #define class_device_create class_simple_device_add
+  #define class_device_destroy(a,b) class_simple_device_remove(b)
+  #define class_destroy class_simple_destroy
+ #endif
 #endif
 
 #if !defined (__GENKSYMS__) 
@@ -131,7 +142,7 @@ struct canhardware_t *hardware_p=&canhardware;
 struct canchip_t *chips_p[MAX_TOT_CHIPS];
 struct msgobj_t *objects_p[MAX_TOT_MSGOBJS];
 #ifdef CONFIG_DEVFS_FS
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,60))
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
 devfs_handle_t  devfs_handles[MAX_TOT_MSGOBJS];
 #endif
 #endif
@@ -173,6 +184,26 @@ struct rtl_file_operations can_fops_rtl = {
 #endif /*CAN_WITH_RTL*/
 
 
+/*
+ 2.6 kernel attributes for sysfs
+ 
+static ssize_t show_xxx(struct class_device *cdev, char *buf)
+{
+        return sprintf(buf, "xxxx\n");
+}
+
+static ssize_t store_xxx(struct class_device *cdev, const char * buf, size_t count)
+{
+}
+
+static CLASS_DEVICE_ATTR(xxx, S_IRUGO, show_xxx, store_xxx/NULL);
+
+ret = class_device_create_file(class_dev, class_device_attr_xxx);
+if (ret)
+       goto err_unregister;
+
+*/
+
 int init_module(void)
 {
        int res=0,i=0, j;
@@ -255,23 +286,37 @@ int init_module(void)
                goto proc_error;
 #endif
 
-#ifdef CONFIG_DEVFS_FS
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+       can_class=class_create(THIS_MODULE, "can");
+#endif
+
+#if defined(CONFIG_DEVFS_FS) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
         {
-           #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
+           #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
                char dev_name[32];
+           #else
+               struct class_device *this_dev;
            #endif
                int dev_minor;
                for(i=0;i<MAX_TOT_MSGOBJS;i++) {
                        if(!objects_p[i]) continue;
                        dev_minor=objects_p[i]->minor;
-                   #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
+                   #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
                        sprintf (dev_name, "can%d", dev_minor);
                        devfs_handles[i]=devfs_register(NULL, dev_name,
                                DEVFS_FL_DEFAULT, major, dev_minor,
                                S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
                                &can_fops, (void*)objects_p[i]);
                    #else
+                       this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL,  "can%d", dev_minor);
+                       if(!this_dev){
+                               CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor);
+                       }else{
+                               this_dev->class_data=objects_p[i];
+                       }
+                     #ifdef CONFIG_DEVFS_FS
                        devfs_mk_cdev(MKDEV(major, dev_minor), S_IFCHR | S_IRUGO | S_IWUGO, "can%d", dev_minor);
+                     #endif
                    #endif
                }
         }
@@ -326,21 +371,29 @@ void cleanup_module(void)
                CANMSG("Error unregistering /proc/can entry.\n"); 
 #endif
 
-#ifdef CONFIG_DEVFS_FS
+#if defined(CONFIG_DEVFS_FS) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
                for(i=0;i<MAX_TOT_MSGOBJS;i++) {
-           #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50))
+           #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0))
                        if(devfs_handles[i])
                                devfs_unregister(devfs_handles[i]);
            #else
                int dev_minor;
                        if(!objects_p[i]) continue;
                        dev_minor=objects_p[i]->minor;
-               if(minor>=0)
+               if(minor>=0){
+                   #ifdef CONFIG_DEVFS_FS
                        devfs_remove("can%d", dev_minor);
+                   #endif
+                       class_device_destroy(can_class, MKDEV(major, dev_minor));
+               }
            #endif
                }
 #endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+       class_destroy(can_class);
+#endif
+
        canhardware_done(hardware_p);
 
        #ifdef CAN_WITH_RTL