X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/99d090e67281ec1e9d61054afced20c9a76124b3..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/src/setup.c diff --git a/lincan/src/setup.c b/lincan/src/setup.c index ac83789..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,9 +16,11 @@ 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_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); +int next_minor=0; + /** * can_base_addr_fixup - relocates board physical memory addresses to the CPU accessible ones * @candev: pointer to the previously filled device/board, chips and message objects structures @@ -30,11 +32,11 @@ int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int * 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++){ @@ -47,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. */ @@ -64,7 +66,7 @@ int can_check_dev_taken(void *anydev) if(boarddev == anydev) return 1; } - + return 0; } @@ -78,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) @@ -111,7 +112,7 @@ 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; @@ -156,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 @@ -163,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, @@ -172,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 */ @@ -187,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; @@ -202,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) @@ -220,14 +247,14 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p) if(chipnrnr_all_chips; chipnr++) { @@ -236,7 +263,7 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p) int objnr; register_chip_struct(chip, m); - + for (objnr=0; objnrmax_objects; objnr++) { register_obj_struct(chip->msgobj[objnr], m); if(m>=0) m++; @@ -261,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; - + } /** @@ -270,15 +297,16 @@ 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 canchip_t *chip; int objnr; @@ -302,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) @@ -335,7 +364,7 @@ int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int 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)); @@ -360,7 +389,7 @@ int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int ret=candev->hwspecops->init_obj_data(hostchip,objnr); if(ret<0) return ret; - + return 0; } @@ -379,14 +408,14 @@ int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int 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);