X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/786c7d54e8d820e89997e507c29ea716c0d55fd9..2827b727d2910a3b48f9de7d67b3a67f59e256c7:/lincan/src/pcm3680.c diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c index 853986a..cfe5856 100644 --- a/lincan/src/pcm3680.c +++ b/lincan/src/pcm3680.c @@ -1,43 +1,19 @@ /* 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 -#include -#include - +#include "../include/can.h" +#include "../include/can_sysdep.h" #include "../include/main.h" #include "../include/pcm3680.h" #include "../include/i82527.h" #include "../include/sja1000p.h" -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) /* may need correction */ - #ifndef request_mem_region - #define request_mem_region(start,size,dev) (1) - #define release_mem_region(start,size) - #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 @@ -46,9 +22,9 @@ static unsigned long isa_base = 0L; #define IO_RANGE 0x400 /** - * template_request_io: - reserve io memory - * @io_addr: The reserved memory starts at @io_addr, wich is the module - * parameter @io. + * template_request_io: - reserve io or memory range for can board + * @candev: pointer to candevice/board which asks for io. Field @io_addr + * of @candev is used in most cases to define start of the range * * 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 @@ -59,28 +35,27 @@ 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 (!can_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); + can_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; } /** - * template_release_io - free reserved io-memory - * @io_addr: Start of the memory range to be released. + * template_elease_io - free reserved io memory range + * @candev: pointer to candevice/board which releases io * * The function template_release_io() is used to free reserved io-memory. * In case you have reserved more io memory, don't forget to free it here. @@ -90,16 +65,16 @@ 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); + can_release_mem_region(candev->io_addr,IO_RANGE); return 0; } /** * template_reset - hardware reset routine - * @card: Number of the hardware card. + * @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 @@ -107,15 +82,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); @@ -141,25 +116,26 @@ int pcm3680_reset(int card) #define NR_SJA1000 2 /** - * template_init_hw_data - Initialze hardware cards - * @card: Number of the hardware card. + * template_init_hw_data - Initialize hardware cards + * @candev: Pointer to candevice/board structure * * The function template_init_hw_data() is used to initialize the hardware * structure containing information about the installed CAN-board. * %RESET_ADDR represents the io-address of the hardware reset register. * %NR_82527 represents the number of intel 82527 chips on the board. * %NR_SJA1000 represents the number of philips sja1000 chips on the board. - * The flags entry can currently only be %PROGRAMMABLE_IRQ to indicate that + * The flags entry can currently only be %CANDEV_PROGRAMMABLE_IRQ to indicate that * the hardware uses programmable interrupts. * 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 &= ~CANDEV_PROGRAMMABLE_IRQ; return 0; } @@ -167,7 +143,7 @@ int pcm3680_init_hw_data(int card) #define CHIP_TYPE "sja1000p" /** * template_init_chip_data - Initialize chips - * @card: Number of the hardware card + * @candev: Pointer to candevice/board structure * @chipnr: Number of the CAN chip on the hardware card * * The function template_init_chip_data() is used to initialize the hardware @@ -194,17 +170,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; @@ -212,7 +187,7 @@ int pcm3680_init_chip_data(int card, int chipnr) /** * template_init_obj_data - Initialize message buffers - * @chipnr: Number of the CAN chip + * @chip: Pointer to chip specific structure * @objnr: Number of the message buffer * * The function template_init_obj_data() is used to initialize the hardware @@ -227,27 +202,26 @@ 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; return 0; } /** * template_program_irq - program interrupts - * @card: Number of the hardware card. + * @candev: Pointer to candevice/board structure * * 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 %PROGRAMMABLE_IRQ and + * 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 */ -int pcm3680_program_irq(int card) +int pcm3680_program_irq(struct candevice_t *candev) { return 0; } @@ -265,7 +239,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 +254,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 !!! */