X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4cf24de229090b1ab6279570a564d224e13dd706..47002b02942d3d48e4e24ef91fc55177cdcda486:/lincan/src/main.c diff --git a/lincan/src/main.c b/lincan/src/main.c index 4ff1523..0f5f60a 100644 --- a/lincan/src/main.c +++ b/lincan/src/main.c @@ -1,31 +1,31 @@ /* main.c * Linux CAN-bus device driver. * Written by Arnaud Westenberg email:arnaud@wanadoo.nl + * Rewritten for new CAN queues by Pavel Pisa - OCERA team member + * email:pisa@cmp.felk.cvut.cz * This software is released under the GPL-License. - * Version 0.7 6 Aug 2001 + * Version lincan-0.2 9 Jul 2003 */ #define EXPORT_SYMTAB #include -#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS) -#define MODVERSIONS -#endif #include -#if defined (MODVERSIONS) -#include -#endif - #include #include -#include #include +#include #include #include +#include + +#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50)) +#include +#endif -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,2,19)) +#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0)) #include #else #include @@ -34,17 +34,26 @@ #if !defined (__GENKSYMS__) #if (defined (MODVERSIONS) && !defined(NOVER)) #include -#include "../include/main.ver" +/*#include "../include/main.ver"*/ #endif #endif +/*#undef CONFIG_DEVFS_FS*/ + +#ifdef CONFIG_DEVFS_FS +#include +#include +#endif + #include "../include/main.h" #include "../include/modparms.h" +#include "../include/devcommon.h" #include "../include/setup.h" #include "../include/proc.h" #include "../include/open.h" #include "../include/close.h" #include "../include/read.h" +#include "../include/select.h" #include "../include/irq.h" #include "../include/ioctl.h" #include "../include/write.h" @@ -55,7 +64,8 @@ int major=CAN_MAJOR; MODULE_PARM(major,"1i"); 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}; -MODULE_PARM(minor, "1-" __MODULE_STRING(MAX_TOT_CHIPS)"i"); +/*MODULE_PARM(minor, "1-" __MODULE_STRING(MAX_TOT_CHIPS)"i");*/ +MODULE_PARM(minor, "1-" __MODULE_STRING(MAX_TOT_CHIPS_STR)"i"); int extended=0; MODULE_PARM(extended,"1i"); int pelican=0; @@ -75,26 +85,41 @@ MODULE_PARM(extmask, "1i"); int mo15mask=0; MODULE_PARM(mo15mask, "1i"); +/* Other module attributes */ +#ifdef MODULE_SUPPORTED_DEVICE +MODULE_SUPPORTED_DEVICE("can"); +#endif +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif +#ifdef MODULE_DESCRIPTION +MODULE_DESCRIPTION("Universal Linux CAN-bus device driver"); +#endif + /* Global structures, used to describe the installed hardware. */ struct canhardware_t canhardware; struct canhardware_t *hardware_p=&canhardware; -struct candevice_t *candevices_p[MAX_HW_CARDS]; struct chip_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)) +devfs_handle_t devfs_handles[MAX_TOT_MSGOBJS]; +#endif +#endif /* Pointers to dynamically allocated memory are maintained in a linked list * to ease memory deallocation. */ struct mem_addr *mem_head=NULL; -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,2,19)) +#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0)) struct file_operations can_fops= { NULL, /* llseek */ read: can_read, write: can_write, NULL, /* readdir */ - NULL, /* poll */ + poll: can_poll, ioctl: can_ioctl, NULL, /* mmap */ open: can_open, @@ -108,6 +133,7 @@ struct file_operations can_fops= owner: THIS_MODULE, read: can_read, write: can_write, + poll: can_poll, ioctl: can_ioctl, open: can_open, release: can_close, @@ -119,6 +145,7 @@ EXPORT_SYMBOL(can_fops); int init_module(void) { int res=0,i=0; + struct candevice_t *candev; if (parse_mod_parms()) return -EINVAL; @@ -137,27 +164,24 @@ int init_module(void) } for (i=0; inr_boards; i++) { - if (candevices_p[i]->hwspecops->request_io(candevices_p[i]->io_addr)) - goto memory_error; + candev=hardware_p->candevice[i]; + if (candev->hwspecops->request_io(candev)) + goto memory_error; } for (i=0; inr_boards; i++) { - if (candevices_p[i]->hwspecops->reset(i)) + candev=hardware_p->candevice[i]; + if (candev->hwspecops->reset(candev)) goto reset_error; } + spin_lock_init(&hardware_p->rtr_lock); + hardware_p->rtr_queue=NULL; + i=0; while ( (chips_p[i] != NULL) && (i < MAX_TOT_CHIPS) ) { - if (!strcmp(chips_p[i]->chip_type,"i82527")) { - if (request_irq(chips_p[i]->chip_irq,i82527_irq_handler,SA_SHIRQ,DEVICE_NAME,chips_p[i])) - goto interrupt_error; - else - DEBUGMSG("Registered interrupt %d\n",chips_p[i]->chip_irq); - } - if (!strcmp(chips_p[i]->chip_type,"sja1000p") || - !strcmp(chips_p[i]->chip_type,"sja1000")) { - if (request_irq(chips_p[i]->chip_irq, - chips_p[i]->chipspecops->irq_handler,SA_SHIRQ,DEVICE_NAME,chips_p[i])) + if (chips_p[i]->chipspecops->irq_handler) { + if (request_irq(chips_p[i]->chip_irq,chips_p[i]->chipspecops->irq_handler,SA_SHIRQ,DEVICE_NAME,chips_p[i])) goto interrupt_error; else DEBUGMSG("Registered interrupt %d\n",chips_p[i]->chip_irq); @@ -166,19 +190,36 @@ int init_module(void) } for (i=0; inr_boards; i++) { - if (candevices_p[i]->flags & PROGRAMMABLE_IRQ) - if (candevices_p[i]->hwspecops->program_irq(i)) + candev=hardware_p->candevice[i]; + if (candev->flags & PROGRAMMABLE_IRQ) + if (candev->hwspecops->program_irq(candev)) goto interrupt_error; } - spin_lock_init(&hardware_p->rtr_lock); - hardware_p->rtr_queue=NULL; - #ifdef CONFIG_PROC_FS if (can_init_procdir()) goto proc_error; #endif +#ifdef CONFIG_DEVFS_FS + { + char dev_name[32]; + int dev_minor; + for(i=0;iminor; + #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,50)) + 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 + devfs_mk_cdev(MKDEV(major, dev_minor), S_IFCHR | S_IRUGO | S_IWUGO, "can%d", dev_minor); + #endif + } + } +#endif return 0; #ifdef CONFIG_PROC_FS @@ -195,8 +236,10 @@ int init_module(void) goto memory_error; memory_error: ; - for (i=0; inr_boards; i++) - candevices_p[i]->hwspecops->release_io(candevices_p[i]->io_addr); + for (i=0; inr_boards; i++) { + candev=hardware_p->candevice[i]; + candev->hwspecops->release_io(candev); + } goto register_error; register_error: ; @@ -212,19 +255,38 @@ int init_module(void) void cleanup_module(void) { int res=0,i=0; + struct candevice_t *candev; #ifdef CONFIG_PROC_FS if (can_delete_procdir()) CANMSG("Error unregistering /proc/can entry.\n"); #endif +#ifdef CONFIG_DEVFS_FS + for(i=0;iminor; + if(minor>=0) + devfs_remove("can%d", dev_minor); + #endif + } +#endif + i=0; while ( (chips_p[i] != NULL) & (i < MAX_TOT_CHIPS) ) { - free_irq(chips_p[i]->chip_irq, chips_p[i]); + if(chips_p[i]->chipspecops->irq_handler) + free_irq(chips_p[i]->chip_irq, chips_p[i]); i++; } - for (i=0; inr_boards; i++) - candevices_p[i]->hwspecops->release_io(candevices_p[i]->io_addr); + for (i=0; inr_boards; i++){ + candev=hardware_p->candevice[i]; + candev->hwspecops->release_io(candev); + } if ( del_mem_list() ) CANMSG("Error deallocating memory\n");