X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4dc78b4651f006bf0404c8ec7db85651bcee7c2e..04ac67cc3cac14cd601daacd0592121ec0b84012:/lincan/src/aim104.c diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c index d6dad7b..357fe41 100644 --- a/lincan/src/aim104.c +++ b/lincan/src/aim104.c @@ -52,7 +52,7 @@ * * The function template_request_io() is used to reserve the io-memory. If your * hardware uses a dedicated memory range as hardware control registers you - * will have to add the code to reserve this memory as well. + * will have to add the code to reserve this memory as well. * %IO_RANGE is the io-memory range that gets reserved, please adjust according * your hardware. Example: #define IO_RANGE 0x100 for i82527 chips or * #define IO_RANGE 0x20 for sja1000 chips in basic CAN mode. @@ -93,8 +93,8 @@ int aim104_release_io(struct candevice_t *candev) * template_reset - hardware reset routine * @candev: Pointer to candevice/board structure * - * The function template_reset() is used to give a hardware reset. This is - * rather hardware specific so I haven't included example code. Don't forget to + * The function template_reset() is used to give a hardware reset. This is + * rather hardware specific so I haven't included example code. Don't forget to * check the reset status of the chip before returning. * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/template.c @@ -106,10 +106,10 @@ int aim104_reset(struct candevice_t *candev) DEBUGMSG("Resetting aim104 hardware ...\n"); aim104_write_register(0x00, candev->io_addr + SJACR); - + /* Check hardware reset status chip 0 */ i=0; - while ( (aim104_read_register(candev->io_addr + SJACR) + while ( (aim104_read_register(candev->io_addr + SJACR) & sjaCR_RR) && (i<=15) ) { udelay(20000); i++; @@ -143,7 +143,7 @@ int aim104_reset(struct candevice_t *candev) * Return Value: The function always returns zero * File: src/template.c */ -int aim104_init_hw_data(struct candevice_t *candev) +int aim104_init_hw_data(struct candevice_t *candev) { candev->res_addr=RESET_ADDR; candev->nr_82527_chips=0; @@ -177,7 +177,7 @@ int aim104_init_hw_data(struct candevice_t *candev) * The entry @int_clk_reg holds hardware specific options for the Clock Out * register. Options defined in the %i82527.h file: * %iCLK_CD0, %iCLK_CD1, %iCLK_CD2, %iCLK_CD3, %iCLK_SL0, %iCLK_SL1. - * The entry @int_bus_reg holds hardware specific options for the Bus + * The entry @int_bus_reg holds hardware specific options for the Bus * Configuration register. Options defined in the %i82527.h file: * %iBUS_DR0, %iBUS_DR1, %iBUS_DT1, %iBUS_POL, %iBUS_CBY. * Return Value: The function always returns zero @@ -205,7 +205,7 @@ int aim104_init_chip_data(struct candevice_t *candev, int chipnr) * CAN chip. In case of the sja1000 there's only one message object but on the * i82527 chip there are 15. * The code below is for a i82527 chip and initializes the object base addresses - * The entry @obj_base_addr represents the first memory address of the message + * The entry @obj_base_addr represents the first memory address of the message * object. In case of the sja1000 @obj_base_addr is taken the same as the chips * base address. * Unless the hardware uses a segmented memory map, flags can be set zero. @@ -216,7 +216,7 @@ int aim104_init_obj_data(struct canchip_t *chip, int objnr) { chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr; chip->msgobj[objnr]->obj_flags=0; - + return 0; } @@ -224,10 +224,10 @@ int aim104_init_obj_data(struct canchip_t *chip, int objnr) * template_program_irq - program interrupts * @candev: Pointer to candevice/board structure * - * The function template_program_irq() is used for hardware that uses + * The function template_program_irq() is used for hardware that uses * programmable interrupts. If your hardware doesn't use programmable interrupts - * you should not set the @candevices_t->flags entry to %CANDEV_PROGRAMMABLE_IRQ and - * leave this function unedited. Again this function is hardware specific so + * you should not set the @candevices_t->flags entry to %CANDEV_PROGRAMMABLE_IRQ and + * leave this function unedited. Again this function is hardware specific so * there's no example code. * Return value: The function returns zero on success or %-ENODEV on failure * File: src/template.c