X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2a4663dd0b20d96d1ffe20993dd0c63ed2ca9f20..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/src/setup.c diff --git a/lincan/src/setup.c b/lincan/src/setup.c index 564b3c0..cb6550d 100644 --- a/lincan/src/setup.c +++ b/lincan/src/setup.c @@ -5,7 +5,7 @@ * email:pisa@cmp.felk.cvut.cz * This software is released under the GPL-License. * Version lincan-0.3 17 Jun 2004 - */ + */ #include "../include/can.h" #include "../include/can_sysdep.h" @@ -16,173 +16,10 @@ int init_hwspecops(struct candevice_t *candev, int *irqnum_p); int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p); -int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate); -int init_obj_struct(struct candevice_t *candev, struct chip_t *hostchip, int objnr); - -/** - * can_checked_malloc - memory allocation with registering of requested blocks - * @size: size of the requested block - * - * The function is used in the driver initialization phase to catch possible memory - * leaks for future driver finalization or case, that driver initialization fail. - * - * Return Value: pointer to the allocated memory or NULL in the case of fail - */ -void *can_checked_malloc(size_t size) -{ - struct mem_addr *mem_new; - void *address_p; - - address_p=kmalloc(size,GFP_KERNEL); - if(address_p == NULL) { - CANMSG("can_checked_malloc: out of the memory\n"); - return NULL; - } - -#ifdef DEBUG_MEM - DEBUGMSG("can_checked_malloc: allocated %d bytes at %p, mem_head=%p\n", - (int)size, address_p, mem_head); -#endif - - mem_new=(struct mem_addr *)kmalloc(sizeof(struct mem_addr),GFP_KERNEL); - if (mem_new == NULL) { - CANMSG("can_checked_malloc: memory list allocation error.\n"); - kfree(address_p); - return NULL; - } - mem_new->next=mem_head; - mem_new->address=address_p; - mem_new->size=size; - mem_head=mem_new; - - return address_p; -} - -/** - * can_checked_free - free memory allocated by can_checked_malloc() - * @address_p: pointer to the memory block - */ -int can_checked_free(void *address_p) -{ - struct mem_addr **mem_pptr; - struct mem_addr *mem_del=NULL; - -#ifdef DEBUG_MEM - DEBUGMSG("can_checked_free %p, mem_head=%p\n", address_p, mem_head); -#endif - - for(mem_pptr = &mem_head; (mem_del = *mem_pptr); mem_pptr = &mem_del->next) { - if (mem_del->address != address_p) - continue; - *mem_pptr=mem_del->next; - kfree(mem_del); - kfree(address_p); - return 0; - } - - CANMSG("can_checked_free: address %p not found on the mem list\n", address_p); - - kfree(address_p); - return -1; -} +int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate, long clock); +int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int objnr); - -/** - * can_del_mem_list - check for stale memory allocations at driver finalization - * - * Checks, if there are still some memory blocks allocated and releases memory - * occupied by such blocks back to the system - */ -int can_del_mem_list(void) -{ - struct mem_addr *mem; - -#ifdef DEBUG_MEM - DEBUGMSG("can_del_mem_list, mem_head=%p\n", mem_head); -#endif - if(mem_head == NULL) { - CANMSG("can_del_mem_list: no entries on the list - OK\n"); - return 0; - } - - while((mem=mem_head) != NULL) { - mem_head=mem->next; - CANMSG("can_del_mem_list: deleting %p with size %d\n", - mem->address, (int)mem->size); - kfree(mem->address); - kfree(mem); - } - - return 0; -} - -/** - * can_request_io_region - request IO space region - * @start: the first IO port address - * @n: number of the consecutive IO port addresses - * @name: name/label for the requested region - * - * The function hides system specific implementation of the feature. - * - * Return Value: returns positive value (1) in the case, that region could - * be reserved for the driver. Returns zero (0) if there is collision with - * other driver or region cannot be taken for some other reason. - */ -int can_request_io_region(unsigned long start, unsigned long n, const char *name) -{ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) - if(check_region(start,n)) return 0; - request_region(start,n,name); - return 1; - #else - return (request_region(start,n,name))?1:0; - #endif -} - -/** - * can_release_io_region - release IO space region - * @start: the first IO port address - * @n: number of the consecutive IO port addresses - */ -void can_release_io_region(unsigned long start, unsigned long n) -{ - release_region(start,n); -} - -/** - * can_request_mem_region - request memory space region - * @start: the first memory port physical address - * @n: number of the consecutive memory port addresses - * @name: name/label for the requested region - * - * The function hides system specific implementation of the feature. - * - * Return Value: returns positive value (1) in the case, that region could - * be reserved for the driver. Returns zero (0) if there is collision with - * other driver or region cannot be taken for some other reason. - */ -int can_request_mem_region(unsigned long start, unsigned long n, const char *name) -{ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) - return 1; - #else - return (request_mem_region(start,n,name))?1:0; - #endif -} - -/** - * can_release_mem_region - release memory space region - * @start: the first memory port physical address - * @n: number of the consecutive memory port addresses - */ -void can_release_mem_region(unsigned long start, unsigned long n) -{ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) - return; - #else - release_mem_region(start,n); - #endif -} +int next_minor=0; /** * can_base_addr_fixup - relocates board physical memory addresses to the CPU accessible ones @@ -195,11 +32,11 @@ void can_release_mem_region(unsigned long start, unsigned long n) * This function is prepared to simplify board specific xxx_request_io() function * for memory mapped devices. */ -int can_base_addr_fixup(struct candevice_t *candev, unsigned long new_base) +int can_base_addr_fixup(struct candevice_t *candev, can_ioptr_t new_base) { - unsigned long offs; + long offs; int i, j; - + offs=new_base-candev->dev_base_addr; candev->dev_base_addr=new_base; for(i=0;inr_all_chips;i++){ @@ -212,7 +49,7 @@ int can_base_addr_fixup(struct candevice_t *candev, unsigned long new_base) /** * can_check_dev_taken - checks if bus device description is already taken by driver - * @anydev: pointer to bus specific Linux device description + * @anydev: pointer to bus specific Linux device description * * Returns: Returns 1 if device is already used by LinCAN driver, 0 otherwise. */ @@ -229,7 +66,7 @@ int can_check_dev_taken(void *anydev) if(boarddev == anydev) return 1; } - + return 0; } @@ -243,9 +80,8 @@ int can_check_dev_taken(void *anydev) */ int register_obj_struct(struct msgobj_t *obj, int minorbase) { - static int next_minor=0; int i; - + if(minorbase>=0) next_minor=minorbase; if(next_minor>=MAX_TOT_MSGOBJS) @@ -272,11 +108,11 @@ int register_obj_struct(struct msgobj_t *obj, int minorbase) * * Return Value: returns negative number in the case of fail */ -int register_chip_struct(struct chip_t *chip, int minorbase) +int register_chip_struct(struct canchip_t *chip, int minorbase) { static int next_chip_slot=0; int i; - + if(next_chip_slot>=MAX_TOT_CHIPS) next_chip_slot=0; i=next_chip_slot; @@ -321,6 +157,30 @@ int init_hw_struct(void) return 0; } +/** + * init_new_hw_struct - initializes driver description structures for new hardware + * + * The function init_new_hw_struct() is used to initialize the hardware structure. + * + * Return Value: returns negative number in the case of fail + */ +int init_new_hw_struct(int devnr) +{ + int irq_param_idx=0; + int chan_param_idx=0; + + if ( (hw[devnr] != NULL) & (devnr < MAX_HW_CARDS) ) { + hardware_p->nr_boards++; + + if (init_device_struct(devnr, &chan_param_idx, &irq_param_idx)) { + CANMSG("Error initializing candevice_t structures.\n"); + return -ENODEV; + } + } + + return 0; +} + /** * init_device_struct - initializes single CAN device/board * @card: index into @hardware_p HW description @@ -328,7 +188,7 @@ int init_hw_struct(void) * @irq_param_idx_p: pointer to the index into arrays of the per CAN channel IRQ parameters * * The function builds representation of the one board from parameters provided - * in the module parameters arrays: + * in the module parameters arrays: * @hw[card] .. hardware type, * @io[card] .. base IO address, * @baudrate[chan_param_idx] .. per channel baudrate, @@ -337,10 +197,10 @@ int init_hw_struct(void) * The indexes are advanced after consumed parameters if the registration is successful. * * The hardware specific operations of the device/board are initialized by call to - * init_hwspecops() function. Then board data are initialized by board specific + * init_hwspecops() function. Then board data are initialized by board specific * init_hw_data() function. Then chips and objects representation is build by * init_chip_struct() function. If all above steps are successful, chips and - * message objects are registered into global arrays. + * message objects are registered into global arrays. * * Return Value: returns negative number in the case of fail */ @@ -352,7 +212,8 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p) int chipnr; long bd; int irqsig=-1; - + long clock; + candev=(struct candevice_t *)can_checked_malloc(sizeof(struct candevice_t)); if (candev==NULL) return -ENOMEM; @@ -367,6 +228,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p) candev->hwname=hw[card]; candev->io_addr=io[card]; candev->dev_base_addr=io[card]; + clock=clockfreq[card]; candev->hwspecops=(struct hwspecops_t *)can_checked_malloc(sizeof(struct hwspecops_t)); if (candev->hwspecops==NULL) @@ -385,23 +247,23 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p) if(chipnrnr_all_chips; chipnr++) { int m=minor[*chan_param_idx_p+chipnr]; - struct chip_t *chip=candev->chip[chipnr]; + struct canchip_t *chip=candev->chip[chipnr]; int objnr; register_chip_struct(chip, m); - + for (objnr=0; objnrmax_objects; objnr++) { register_obj_struct(chip->msgobj[objnr], m); if(m>=0) m++; @@ -426,7 +288,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p) hardware_p->candevice[card]=NULL; can_checked_free(candev); return ret; - + } /** @@ -435,25 +297,26 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p) * @chipnr: index of the chip in the corresponding device/board structure * @irq: chip IRQ number or (-1) if not appropriate * @baudrate: baudrate in the units of 1Bd + * @clock: optional chip base clock frequency in 1Hz step * - * Chip structure is allocated and chip specific operations are filled by + * Chip structure is allocated and chip specific operations are filled by * call to board specific init_chip_data() which calls chip specific - * fill_chipspecops(). The message objects are generated by + * fill_chipspecops(). The message objects are generated by * calls to init_obj_struct() function. * * Return Value: returns negative number in the case of fail */ -int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate) +int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate, long clock) { - struct chip_t *chip; + struct canchip_t *chip; int objnr; int ret; - candev->chip[chipnr]=(struct chip_t *)can_checked_malloc(sizeof(struct chip_t)); + candev->chip[chipnr]=(struct canchip_t *)can_checked_malloc(sizeof(struct canchip_t)); if ((chip=candev->chip[chipnr])==NULL) return -ENOMEM; - memset(chip, 0, sizeof(struct chip_t)); + memset(chip, 0, sizeof(struct canchip_t)); chip->write_register=candev->hwspecops->write_register; chip->read_register=candev->hwspecops->read_register; @@ -467,6 +330,7 @@ int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudr chip->hostdevice=candev; chip->chip_irq=irq; chip->baudrate=baudrate; + chip->clock=clock; chip->flags=0x0; if(candev->hwspecops->init_chip_data(candev,chipnr)<0) @@ -492,7 +356,7 @@ int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudr * * Return Value: returns negative number in the case of fail */ -int init_obj_struct(struct candevice_t *candev, struct chip_t *hostchip, int objnr) +int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int objnr) { struct canque_ends_t *qends; struct msgobj_t *obj; @@ -500,7 +364,7 @@ int init_obj_struct(struct candevice_t *candev, struct chip_t *hostchip, int obj obj=(struct msgobj_t *)can_checked_malloc(sizeof(struct msgobj_t)); hostchip->msgobj[objnr]=obj; - if (obj == NULL) + if (obj == NULL) return -ENOMEM; memset(obj, 0, sizeof(struct msgobj_t)); @@ -525,7 +389,7 @@ int init_obj_struct(struct candevice_t *candev, struct chip_t *hostchip, int obj ret=candev->hwspecops->init_obj_data(hostchip,objnr); if(ret<0) return ret; - + return 0; } @@ -544,73 +408,17 @@ int init_obj_struct(struct candevice_t *candev, struct chip_t *hostchip, int obj int init_hwspecops(struct candevice_t *candev, int *irqnum_p) { const struct boardtype_t *brp; - + brp = boardtype_find(candev->hwname); - + if(!brp) { CANMSG("Sorry, hardware \"%s\" is currently not supported.\n",candev->hwname); return -EINVAL; } - + if(irqnum_p) *irqnum_p=brp->irqnum; brp->board_register(candev->hwspecops); return 0; } - - -#ifndef CAN_WITH_RTL - -/** - * can_chip_setup_irq - attaches chip to the system interrupt processing - * @chip: pointer to CAN chip structure - * - * Return Value: returns negative number in the case of fail - */ -int can_chip_setup_irq(struct chip_t *chip) -{ - if(chip==NULL) - return -1; - if(!chip->chipspecops->irq_handler) - return 0; - - if ((chip->flags & CHIP_IRQ_VME) == 0) { - if (request_irq(chip->chip_irq,chip->chipspecops->irq_handler,SA_SHIRQ,DEVICE_NAME,chip)) - return -1; - else { - DEBUGMSG("Registered interrupt %d\n",chip->chip_irq); - chip->flags |= CHIP_IRQ_SETUP; - } - } else { -#ifdef CAN_ENABLE_VME_SUPPORT - /* TODO: Move here the irq setup from - * unican_vme_request_io(). To do this, the VME bridge - * driver should be modified. */ -#endif - } - return 1; -} - - -/** - * can_chip_free_irq - unregisters chip interrupt handler from the system - * @chip: pointer to CAN chip structure - */ -void can_chip_free_irq(struct chip_t *chip) -{ - if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)) { - if ((chip->flags & CHIP_IRQ_VME) == 0) - free_irq(chip->chip_irq, chip); - else { -#ifdef CAN_ENABLE_VME_SUPPORT - /* TODO: Move here the irq cleanup from - * unican_vme_release_io(). To do this, the VME bridge - * driver should be modified. */ -#endif - } - chip->flags &= ~CHIP_IRQ_SETUP; - } -} - -#endif /*CAN_WITH_RTL*/