X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/97078fff5202521b758c9081d75580880417a123..11132ea490f9e860744ee4f851c67e7fb4444231:/lincan/src/pcm3680.c diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c index 853986a..2736035 100644 --- a/lincan/src/pcm3680.c +++ b/lincan/src/pcm3680.c @@ -1,18 +1,13 @@ /* pcm3680.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 */ #include -#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS) -#define MODVERSIONS -#endif - -#if defined (MODVERSIONS) -#include -#endif #include #include @@ -31,13 +26,6 @@ #endif /*request_mem_region*/ #endif /* 2.4.0 */ -/* Basic hardware io address. This is also stored in the hardware structure but - * we need it global, else we have to change many internal functions. - * pcm3680_base_addr is initialized in pcm3680_init_chip_data(). - */ -unsigned long pcm3680_base_addr; -static unsigned long isa_base = 0L; - /* * IO_RANGE is the io-memory range that gets reserved, please adjust according * your hardware. Example: #define IO_RANGE 0x100 for i82527 chips or @@ -59,22 +47,21 @@ static unsigned long isa_base = 0L; * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/template.c */ -int pcm3680_request_io(unsigned long io_addr) +int pcm3680_request_io(struct candevice_t *candev) { unsigned long remap_addr; - if (!request_mem_region(io_addr,IO_RANGE,DEVICE_NAME " - pcm3680")) { - CANMSG("Unable to request IO-memory: 0x%lx\n",io_addr); + if (!request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - pcm3680")) { + CANMSG("Unable to request IO-memory: 0x%lx\n",candev->io_addr); return -ENODEV; } - if ( !( remap_addr = (long) ioremap( io_addr, IO_RANGE ) ) ) { - CANMSG("Unable to access I/O memory at: 0x%lx\n", io_addr); - release_mem_region(io_addr,IO_RANGE); + if ( !( remap_addr = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) { + CANMSG("Unable to access I/O memory at: 0x%lx\n", candev->io_addr); + release_mem_region(candev->io_addr,IO_RANGE); return -ENODEV; } - isa_base=remap_addr-io_addr; - - DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr, io_addr + IO_RANGE - 1); + can_base_addr_fixup(candev, remap_addr); + DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr, candev->io_addr + IO_RANGE - 1); return 0; } @@ -90,10 +77,10 @@ int pcm3680_request_io(unsigned long io_addr) * Return Value: The function always returns zero * File: src/template.c */ -int pcm3680_release_io(unsigned long io_addr) +int pcm3680_release_io(struct candevice_t *candev) { - iounmap((void*)isa_base); - release_mem_region(io_addr,IO_RANGE); + iounmap((void*)candev->dev_base_addr); + release_mem_region(candev->io_addr,IO_RANGE); return 0; } @@ -107,15 +94,15 @@ int pcm3680_release_io(unsigned long io_addr) * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/template.c */ -int pcm3680_reset(int card) +int pcm3680_reset(struct candevice_t *candev) { int i=0; struct chip_t *chip; int chipnr; DEBUGMSG("Resetting pcm3680 hardware ...\n"); - for(chipnr=0;chipnrnr_sja1000_chips;chipnr++) { - chip=candevices_p[card]->chip[chipnr]; + for(chipnr=0;chipnrnr_sja1000_chips;chipnr++) { + chip=candev->chip[chipnr]; pcm3680_write_register(MOD_RM, chip->chip_base_addr+SJAMOD); udelay(1000); pcm3680_write_register(0x00, chip->chip_base_addr + SJAIER); @@ -154,12 +141,13 @@ int pcm3680_reset(int card) * Return Value: The function always returns zero * File: src/template.c */ -int pcm3680_init_hw_data(int card) +int pcm3680_init_hw_data(struct candevice_t *candev) { - candevices_p[card]->res_addr=RESET_ADDR; - candevices_p[card]->nr_82527_chips=NR_82527; - candevices_p[card]->nr_sja1000_chips=NR_SJA1000; - candevices_p[card]->flags &= ~PROGRAMMABLE_IRQ; + candev->res_addr=RESET_ADDR; + candev->nr_82527_chips=NR_82527; + candev->nr_sja1000_chips=NR_SJA1000; + candev->nr_all_chips=NR_82527+NR_SJA1000; + candev->flags &= ~PROGRAMMABLE_IRQ; return 0; } @@ -194,17 +182,16 @@ int pcm3680_init_hw_data(int card) * Return Value: The function always returns zero * File: src/template.c */ -int pcm3680_init_chip_data(int card, int chipnr) +int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr) { - pcm3680_base_addr = candevices_p[card]->io_addr; - candevices_p[card]->chip[chipnr]->chip_type=CHIP_TYPE; - candevices_p[card]->chip[chipnr]->chip_base_addr= - candevices_p[card]->io_addr + 0x200*chipnr; - candevices_p[card]->chip[chipnr]->clock = 16000000; - candevices_p[card]->chip[chipnr]->int_clk_reg = 0x0; - candevices_p[card]->chip[chipnr]->int_bus_reg = 0x0; - candevices_p[card]->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF; - candevices_p[card]->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | + candev->chip[chipnr]->chip_type=CHIP_TYPE; + candev->chip[chipnr]->chip_base_addr= + candev->io_addr + 0x200*chipnr; + candev->chip[chipnr]->clock = 16000000; + candev->chip[chipnr]->int_clk_reg = 0x0; + candev->chip[chipnr]->int_bus_reg = 0x0; + candev->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF; + candev->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | OCR_TX0_LH; return 0; @@ -227,10 +214,10 @@ int pcm3680_init_chip_data(int card, int chipnr) * Return Value: The function always returns zero * File: src/template.c */ -int pcm3680_init_obj_data(int chipnr, int objnr) +int pcm3680_init_obj_data(struct chip_t *chip, int objnr) { - chips_p[chipnr]->msgobj[objnr]->obj_base_addr=chips_p[chipnr]->chip_base_addr; - chips_p[chipnr]->msgobj[objnr]->flags=0; + chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr; + chip->msgobj[objnr]->flags=0; return 0; } @@ -247,7 +234,7 @@ int pcm3680_init_obj_data(int chipnr, int objnr) * Return value: The function returns zero on success or %-ENODEV on failure * File: src/template.c */ -int pcm3680_program_irq(int card) +int pcm3680_program_irq(struct candevice_t *candev) { return 0; } @@ -265,7 +252,7 @@ int pcm3680_program_irq(int card) */ void pcm3680_write_register(unsigned char data, unsigned long address) { - writeb(data,isa_base+address); + writeb(data,address); } /** @@ -280,7 +267,7 @@ void pcm3680_write_register(unsigned char data, unsigned long address) */ unsigned pcm3680_read_register(unsigned long address) { - return readb(isa_base+address); + return readb(address); } /* !!! Don't change this function !!! */