X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/a6d355f1cf48f39eecb2f1bdead51817d1fd5989..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/src/main.c diff --git a/lincan/src/main.c b/lincan/src/main.c index b59160b..b8edf46 100644 --- a/lincan/src/main.c +++ b/lincan/src/main.c @@ -88,6 +88,7 @@ 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; @@ -98,8 +99,9 @@ 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,0)) +#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");*/ @@ -110,12 +112,13 @@ 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,0 */ +#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); @@ -123,12 +126,13 @@ 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, int, &io_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,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"); @@ -139,6 +143,7 @@ MODULE_PARM_DESC(baudrate,"baudrate for each channel in step of 1kHz"); MODULE_PARM_DESC(hw,"list of boards types to initialize - virtual,pip5,..."); MODULE_PARM_DESC(irq,"list of iterrupt signal numbers, most ISA has one per chip, no value for PCI or virtual"); MODULE_PARM_DESC(io,"IO address for each board, use 0 for PCI or virtual"); +MODULE_PARM_DESC(clockfreq,"base board clock source frequency in step of 1kHz"); MODULE_PARM_DESC(stdmask,"default standard mask for i82527 chips"); MODULE_PARM_DESC(extmask,"default extended mask for i82527 chips"); MODULE_PARM_DESC(mo15mask,"mask for communication object 15 of i82527 chips"); @@ -323,8 +328,10 @@ int init_module(void) { #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0)) char dev_name[32]; - #else + #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */ struct class_device *this_dev; + #else + struct device *this_dev; #endif int dev_minor; for(i=0;i= 2.6.15 */ + #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */ this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL, "can%d", dev_minor); - #endif /* >= 2.6.15 */ + #else /* >= 2.6.26 */ + this_dev=device_create_drvdata(can_class, NULL, MKDEV(major, dev_minor), objects_p[i], "can%d", dev_minor); + #endif /* >= 2.6.26 */ if(IS_ERR(this_dev)){ CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor); + #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) }else{ /*this_dev->class_data=objects_p[i];*/ class_set_devdata(this_dev,objects_p[i]); + #endif /* <= 2.6.25 */ } #ifdef CONFIG_DEVFS_FS devfs_mk_cdev(MKDEV(major, dev_minor), S_IFCHR | S_IRUGO | S_IWUGO, "can%d", dev_minor); @@ -392,15 +403,8 @@ int init_module(void) canqueue_rtl_done(); #endif /*CAN_WITH_RTL*/ - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)) unregister_chrdev(major,DEVICE_NAME); - #else /*LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)*/ - 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"); - #endif /*LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)*/ + CANMSG("No CAN devices or driver setup error.\n"); register_error: if ( can_del_mem_list() ) @@ -507,14 +511,18 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip #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 */ + #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) /* >= 2.6.15 */ this_dev=class_device_create(can_class, NULL, MKDEV(major, dev_minor), NULL, "can%d", dev_minor); - #endif /* >= 2.6.15 */ + #else /* >= 2.6.26 */ + this_dev=device_create_drvdata(can_class, NULL, MKDEV(major, dev_minor), objects_p[i], "can%d", dev_minor); + #endif /* >= 2.6.26 */ if(IS_ERR(this_dev)){ CANMSG("problem to create device \"can%d\" in the class \"can\"\n", dev_minor); + #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) }else{ /*this_dev->class_data=objects_p[i];*/ class_set_devdata(this_dev,objects_p[i]); + #endif /* <= 2.6.25 */ } #ifdef CONFIG_DEVFS_FS devfs_mk_cdev(MKDEV(major, dev_minor), S_IFCHR | S_IRUGO | S_IWUGO, "can%d", dev_minor); @@ -587,7 +595,11 @@ void cleanup_usbdev(struct candevice_t *dev) #ifdef CONFIG_DEVFS_FS devfs_remove("can%d", dev_minor); #endif + #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) class_device_destroy(can_class, MKDEV(major, dev_minor)); + #else /* >= 2.6.26 */ + device_destroy(can_class, MKDEV(major, dev_minor)); + #endif /* >= 2.6.26 */ } #endif } @@ -612,7 +624,9 @@ void cleanup_usbdev(struct candevice_t *dev) 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 #if defined(CONFIG_OC_LINCAN_CARD_usbcan) usbcan_exit(); @@ -636,7 +650,11 @@ void cleanup_module(void) #ifdef CONFIG_DEVFS_FS devfs_remove("can%d", dev_minor); #endif + #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25) class_device_destroy(can_class, MKDEV(major, dev_minor)); + #else /* >= 2.6.26 */ + device_destroy(can_class, MKDEV(major, dev_minor)); + #endif /* >= 2.6.26 */ } #endif } @@ -656,11 +674,5 @@ void cleanup_module(void) if ( can_del_mem_list() ) CANMSG("Error deallocating memory\n"); - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)) unregister_chrdev(major,DEVICE_NAME); - #else /*LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)*/ - res=unregister_chrdev(major,DEVICE_NAME); - if (res<0) - CANMSG("Error unregistering CAN driver, error: %d\n",res); - #endif /*LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)*/ }