X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/446346b22245a238d8d70390797b9749eac03788..6d1158545bf86bf3478a1e247d6c3d80b8e4ed13:/lincan/src/main.c diff --git a/lincan/src/main.c b/lincan/src/main.c index 60eb6e6..e021761 100644 --- a/lincan/src/main.c +++ b/lincan/src/main.c @@ -23,8 +23,19 @@ #include #include -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50)) -#include +#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0)) + #include +#else + #include + #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__) @@ -65,46 +76,76 @@ can_spinlock_t canuser_manipulation_lock; -/* Module parameters, some must be supplied at module loading time */ int major=CAN_MAJOR; -MODULE_PARM(major,"1i"); -MODULE_PARM_DESC(major,"can be used to change default major [" __MODULE_STRING(CAN_MAJOR) "]"); int minor[MAX_TOT_CHIPS]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}; +int extended=0; +int pelican=0; +int baudrate[MAX_TOT_CHIPS]; +char *hw[MAX_HW_CARDS]={NULL,}; +int irq[MAX_IRQ]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}; +unsigned long io[MAX_HW_CARDS]={-1,-1,-1,-1,-1,-1,-1,-1}; +long clockfreq[MAX_HW_CARDS]; +int stdmask=0; +int extmask=0; +int mo15mask=0; +int processlocal=0; + +unsigned int minor_specified; +unsigned int baudrate_specified; +unsigned int hw_specified; +unsigned int irq_specified; +unsigned int io_specified; +unsigned int clockfreq_specified; + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)) +/* Module parameters, some must be supplied at module loading time */ +MODULE_PARM(major,"1i"); /*MODULE_PARM(minor, "1-" __MODULE_STRING(MAX_TOT_CHIPS)"i");*/ MODULE_PARM(minor, "1-" __MODULE_STRING(MAX_TOT_CHIPS_STR)"i"); -MODULE_PARM_DESC(minor,"can be used to change default starting minor for each channel"); -int extended=0; MODULE_PARM(extended,"1i"); +MODULE_PARM(pelican,"1i"); +MODULE_PARM(baudrate, "1-" __MODULE_STRING(MAX_TOT_CHIPS_STR)"i"); +MODULE_PARM(hw, "1-" __MODULE_STRING(MAX_HW_CARDS)"s"); +MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_IRQ)"i"); +MODULE_PARM(io, "1-" __MODULE_STRING(MAX_HW_CARDS)"i"); +MODULE_PARM(clockfreq, "1-" __MODULE_STRING(MAX_HW_CARDS)"i"); +MODULE_PARM(stdmask, "1i"); +MODULE_PARM(extmask, "1i"); +MODULE_PARM(mo15mask, "1i"); +MODULE_PARM(processlocal, "1i"); + +#else /* LINUX_VERSION_CODE >= 2,6,12 */ +module_param(major, int, 0); +module_param_array(minor, int, &minor_specified, 0); +module_param(extended, int, 0); +module_param(pelican, int, 0); +module_param_array(baudrate, int, &baudrate_specified, 0); +module_param_array(hw, charp, &hw_specified, 0); +module_param_array(irq, int, &irq_specified, 0); +module_param_array(io, ulong, &io_specified, 0); +module_param_array(clockfreq, long, &clockfreq_specified, 0); +module_param(stdmask, int, 0); +module_param(extmask, int, 0); +module_param(mo15mask, int, 0); +module_param(processlocal, int, 0); +#endif /* LINUX_VERSION_CODE >= 2,6,12 */ + +MODULE_PARM_DESC(major,"can be used to change default major [" __MODULE_STRING(CAN_MAJOR) "]"); +MODULE_PARM_DESC(minor,"can be used to change default starting minor for each channel"); MODULE_PARM_DESC(extended,"enables automatic switching to extended format if ID>2047," " selects extended frames reception for i82527"); -int pelican=0; -MODULE_PARM(pelican,"1i"); MODULE_PARM_DESC(pelican,"unused parameter, PeliCAN used by default for sja1000p chips"); -int baudrate[MAX_TOT_CHIPS]; -MODULE_PARM(baudrate, "1-" __MODULE_STRING(MAX_TOT_CHIPS_STR)"i"); MODULE_PARM_DESC(baudrate,"baudrate for each channel in step of 1kHz"); -char *hw[MAX_HW_CARDS]={NULL,}; -MODULE_PARM(hw, "1-" __MODULE_STRING(MAX_HW_CARDS)"s"); MODULE_PARM_DESC(hw,"list of boards types to initialize - virtual,pip5,..."); -int irq[MAX_IRQ]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}; -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_IRQ)"i"); MODULE_PARM_DESC(irq,"list of iterrupt signal numbers, most ISA has one per chip, no value for PCI or virtual"); -unsigned long io[MAX_HW_CARDS]={-1,-1,-1,-1,-1,-1,-1,-1}; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_HW_CARDS)"i"); MODULE_PARM_DESC(io,"IO address for each board, use 0 for PCI or virtual"); -int stdmask=0; -MODULE_PARM(stdmask, "1i"); +MODULE_PARM_DESC(clockfreq,"base board clock source frequency in step of 1kHz"); MODULE_PARM_DESC(stdmask,"default standard mask for i82527 chips"); -int extmask=0; -MODULE_PARM(extmask, "1i"); MODULE_PARM_DESC(extmask,"default extended mask for i82527 chips"); -int mo15mask=0; -MODULE_PARM(mo15mask, "1i"); MODULE_PARM_DESC(mo15mask,"mask for communication object 15 of i82527 chips"); -int processlocal=0; -MODULE_PARM(processlocal, "1i"); MODULE_PARM_DESC(processlocal,"select postprocessing/loopback of transmitted messages - " "0 .. disabled, 1 .. can be enabled by FIFO filter, 2 .. enabled by default"); + #ifdef CAN_WITH_RTL int can_rtl_priority=-1; MODULE_PARM(can_rtl_priority, "1i"); @@ -131,7 +172,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 +214,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; @@ -229,15 +290,25 @@ int init_module(void) for(j=0; jnr_all_chips; j++) { if((chip=candev->chip[j])==NULL) continue; + + if(chip->chipspecops->attach_to_chip(chip)<0) { + CANMSG("Initial attach to the chip HW failed\n"); + goto interrupt_error; + } + + chip->flags |= CHIP_ATTACHED; + if(can_chip_setup_irq(chip)<0) { - CANMSG("IRQ setup failed\n"); + CANMSG("Error to setup chip IRQ\n"); goto interrupt_error; } } - + if (candev->flags & CANDEV_PROGRAMMABLE_IRQ) - if (candev->hwspecops->program_irq(candev)) + if (candev->hwspecops->program_irq(candev)){ + CANMSG("Error to program board interrupt\n"); goto interrupt_error; + } } #ifdef CONFIG_PROC_FS @@ -245,23 +316,42 @@ 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;iminor; - #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 + #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,14)) + this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL, "can%d", dev_minor); + #else /* >= 2.6.15 */ + this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL, "can%d", dev_minor); + #endif /* >= 2.6.15 */ + if(IS_ERR(this_dev)){ + CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor); + }else{ + /*this_dev->class_data=objects_p[i];*/ + class_set_devdata(this_dev,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 } } @@ -275,7 +365,6 @@ int init_module(void) #endif interrupt_error: ; - CANMSG("Error registering interrupt line.\n"); goto memory_error; reset_error: ; @@ -295,11 +384,8 @@ int init_module(void) canqueue_rtl_done(); #endif /*CAN_WITH_RTL*/ - res=unregister_chrdev(major,DEVICE_NAME); - if (res<0) - CANMSG("Error unloading CAN driver, error: %d\n",res); - else - CANMSG("No CAN devices or driver setup error.\n"); + unregister_chrdev(major,DEVICE_NAME); + CANMSG("No CAN devices or driver setup error.\n"); register_error: if ( can_del_mem_list() ) @@ -310,28 +396,38 @@ int init_module(void) void cleanup_module(void) { - int res=0,i=0; +#if defined(CONFIG_DEVFS_FS) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) + int i=0; +#endif #ifdef CONFIG_PROC_FS if (can_delete_procdir()) 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;iminor; - 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 @@ -342,7 +438,5 @@ void cleanup_module(void) if ( can_del_mem_list() ) CANMSG("Error deallocating memory\n"); - res=unregister_chrdev(major,DEVICE_NAME); - if (res<0) - CANMSG("Error unregistering CAN driver, error: %d\n",res); + unregister_chrdev(major,DEVICE_NAME); }