X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/97078fff5202521b758c9081d75580880417a123..11132ea490f9e860744ee4f851c67e7fb4444231:/lincan/src/pikronisa.c diff --git a/lincan/src/pikronisa.c b/lincan/src/pikronisa.c index 104cbbc..fb6e3dc 100644 --- a/lincan/src/pikronisa.c +++ b/lincan/src/pikronisa.c @@ -1,18 +1,13 @@ /* pikronisa.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,8 +26,6 @@ */ #define IO_RANGE 0x100 -static long base = 0L; - /** * pikronisa_request_io: - reserve io memory * @io_addr: The reserved memory starts at @io_addr, wich is the module @@ -47,16 +40,22 @@ static long base = 0L; * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/pikronisa.c */ -int pikronisa_request_io(unsigned long io_addr) +int pikronisa_request_io(struct candevice_t *candev) { int remap_addr; - if ( !( remap_addr = (long) ioremap( io_addr, IO_RANGE ) ) ) { - CANMSG("Unable to access I/O memory at: 0x%lx\n", io_addr); + + if (!request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - pikronisa")) { + CANMSG("Unable to request IO-memory: 0x%lx\n",candev->io_addr); + return -ENODEV; + } + 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; } - 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; } @@ -72,10 +71,11 @@ int pikronisa_request_io(unsigned long io_addr) * Return Value: The function always returns zero * File: src/pikronisa.c */ -int pikronisa_release_io(unsigned long io_addr) +int pikronisa_release_io(struct candevice_t *candev) { /* release I/O memory mapping */ - iounmap((void*)base); + iounmap((void*)candev->dev_base_addr); + release_mem_region(candev->io_addr,IO_RANGE); return 0; } @@ -90,10 +90,10 @@ int pikronisa_release_io(unsigned long io_addr) * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/pikronisa.c */ -int pikronisa_reset(int card) +int pikronisa_reset(struct candevice_t *candev) { int i; - struct chip_t *chip=candevices_p[card]->chip[0]; + struct chip_t *chip=candev->chip[0]; unsigned cdr; pikronisa_write_register(MOD_RM, chip->chip_base_addr+SJAMOD); @@ -138,12 +138,13 @@ int pikronisa_reset(int card) * Return Value: The function always returns zero * File: src/pikronisa.c */ -int pikronisa_init_hw_data(int card) +int pikronisa_init_hw_data(struct candevice_t *candev) { - candevices_p[card]->res_addr=RESET_ADDR; - candevices_p[card]->nr_82527_chips=0; - candevices_p[card]->nr_sja1000_chips=1; - candevices_p[card]->flags |= PROGRAMMABLE_IRQ*0; + candev->res_addr=RESET_ADDR; + candev->nr_82527_chips=0; + candev->nr_sja1000_chips=1; + candev->nr_all_chips=1; + candev->flags |= PROGRAMMABLE_IRQ*0; return 0; } @@ -183,17 +184,15 @@ int pikronisa_init_hw_data(int card) * Return Value: The function always returns zero * File: src/pikronisa.c */ -int pikronisa_init_chip_data(int card, int chipnr) +int pikronisa_init_chip_data(struct candevice_t *candev, int chipnr) { - /* pikronisa_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; - candevices_p[card]->chip[chipnr]->clock = 24000000; - 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 | - OCR_TX0_LH; + candev->chip[chipnr]->chip_type=CHIP_TYPE; + candev->chip[chipnr]->chip_base_addr=candev->io_addr; + candev->chip[chipnr]->clock = 24000000; + 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; } @@ -215,10 +214,10 @@ int pikronisa_init_chip_data(int card, int chipnr) * Return Value: The function always returns zero * File: src/pikronisa.c */ -int pikronisa_init_obj_data(int chipnr, int objnr) +int pikronisa_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; } @@ -234,7 +233,7 @@ int pikronisa_init_obj_data(int chipnr, int objnr) * Return value: The function returns zero on success or %-ENODEV on failure * File: src/pikronisa.c */ -int pikronisa_program_irq(int card) +int pikronisa_program_irq(struct candevice_t *candev) { return 0; } @@ -252,9 +251,9 @@ int pikronisa_program_irq(int card) */ void pikronisa_write_register(unsigned char data, unsigned long address) { - /*DEBUGMSG("pikronisa_write_register: base=0x%lx addr=0x%lx data=0x%x", - base,address,data);*/ - writeb(data,base+address); + /*DEBUGMSG("pikronisa_write_register: addr=0x%lx data=0x%x", + address,data);*/ + writeb(data,address); } /** @@ -269,7 +268,7 @@ void pikronisa_write_register(unsigned char data, unsigned long address) */ unsigned pikronisa_read_register(unsigned long address) { - return readb(base+address); + return readb(address); } /* !!! Don't change this function !!! */