X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2fc9be1994ae2be41a743f5c4b3aa38d65efaffb..50e9e47fc21191ea9ea758fea1e7f2bd5a275e98:/lincan/src/main.c diff --git a/lincan/src/main.c b/lincan/src/main.c index 52cec59..a0740eb 100644 --- a/lincan/src/main.c +++ b/lincan/src/main.c @@ -36,8 +36,6 @@ #define EXPORT_SYMTAB #endif -#include - #include #include @@ -45,10 +43,10 @@ #include #include #include -#include #include #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0)) + #include #include #else #include @@ -206,6 +204,13 @@ devfs_handle_t devfs_handles[MAX_TOT_MSGOBJS]; #endif #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) +static int can_oldapi_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) +{ + return can_ioctl(file, cmd, arg); +} +#endif /* 2.6.36 */ + /* Pointers to dynamically allocated memory are maintained in a linked list * to ease memory deallocation. */ @@ -219,7 +224,11 @@ struct file_operations can_fops= read: can_read, write: can_write, poll: can_poll, - ioctl: can_ioctl, + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) + ioctl: can_oldapi_ioctl, + #else /* Linux 3.x */ + unlocked_ioctl: can_ioctl, + #endif /* Linux 3.x */ open: can_open, release: can_close, #ifdef CAN_ENABLE_KERN_FASYNC @@ -398,7 +407,7 @@ int init_module(void) res = usbcan_init(); if (res){ CANMSG("usb_register for usbcan failed. Error number %d.\n", res); - return -ENODEV; + goto memory_error; } #endif @@ -443,8 +452,7 @@ int init_module(void) - -struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *ch,void *data)){ +struct candevice_t* register_hotplug_dev(const char *hwname,int (*chipdataregfnc)(struct canchip_t *ch,void *data),void *devdata){ int i=0, j, board=0; struct candevice_t *candev; struct canchip_t *chip; @@ -458,17 +466,19 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip } brp = boardtype_find(hwname); if(!brp) { - CANMSG("Sorry, hardware \"%s\" is currently not supported.\n",hw[board]); + CANMSG("Sorry, hardware \"%s\" is currently not supported.\n",hwname); return NULL; } if (board==MAX_HW_CARDS){ - CANMSG("Device \"%s\" could not be registered due to internal limits.\n",hw[board]); + CANMSG("Device \"%s\" could not be registered due to internal limits.\n",hwname); return NULL; } hw[board]=brp->boardtype; - if (init_new_hw_struct(board)) + if (init_new_hw_struct(board)){ + CANMSG("HW struct creation failed.\n"); return NULL; + } #ifdef CAN_DEBUG list_hw(); @@ -490,7 +500,10 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip if((chip=candev->chip[j])==NULL) continue; - chipdataregfnc(chip,devdata); + if (chipdataregfnc && devdata){ + if (chipdataregfnc(chip,devdata)) + goto interrupt_error; + } if(chip->chipspecops->attach_to_chip(chip)<0) { CANMSG("Initial attach to the chip HW failed\n"); @@ -510,7 +523,7 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip CANMSG("Error to program board interrupt\n"); goto interrupt_error; } - + CANMSG("Registering /proc entry\n"); #ifdef CONFIG_PROC_FS if (can_init_procentry(board)) goto proc_error; @@ -540,9 +553,11 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip this_dev=class_device_create(can_class, MKDEV(major, dev_minor), NULL, "can%d", dev_minor); #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); - #else /* >= 2.6.26 */ + #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) this_dev=device_create_drvdata(can_class, NULL, MKDEV(major, dev_minor), objects_p[i], "can%d", dev_minor); - #endif /* >= 2.6.26 */ + #else /* >= 2.6.28 */ + this_dev=device_create(can_class, NULL, MKDEV(major, dev_minor), objects_p[i], "can%d", dev_minor); + #endif /* >= 2.6.28 */ 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) @@ -584,25 +599,20 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip #endif /*CAN_WITH_RTL*/ // register_error: - if ( can_del_mem_list() ) - CANMSG("Error deallocating memory\n"); +// if ( can_del_mem_list() ) +// CANMSG("Error deallocating memory\n"); return NULL; } - - - - - - -void cleanup_usbdev(struct candevice_t *dev) +void deregister_hotplug_dev(struct candevice_t *dev) { int i=0; int dev_minor; if (!dev) return; + DEBUGMSG("Deregistering hotplug device.\n"); #ifdef CONFIG_PROC_FS if (can_delete_procentry(dev)) @@ -632,6 +642,18 @@ void cleanup_usbdev(struct candevice_t *dev) } #endif +} + + +void cleanup_hotplug_dev(struct candevice_t *dev) +{ + int i=0; + int dev_minor; + + if (!dev) + return; + DEBUGMSG("Cleaning up hotplug device.\n"); + for(i=0;ihostdevice != dev) continue; @@ -656,9 +678,11 @@ void cleanup_module(void) #endif #if defined(CONFIG_OC_LINCAN_CARD_usbcan) + DEBUGMSG("Unregistering usbcan.\n"); usbcan_exit(); #endif + DEBUGMSG("Continuing with coldplug cleanup.\n"); #ifdef CONFIG_PROC_FS if (can_delete_procdir()) CANMSG("Error unregistering /proc/can entry.\n"); @@ -698,6 +722,8 @@ void cleanup_module(void) canqueue_rtl_done(); #endif /*CAN_WITH_RTL*/ + DEBUGMSG("Can hardware cleanup done, freeing memory.\n"); + if ( can_del_mem_list() ) CANMSG("Error deallocating memory\n");