X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/11132ea490f9e860744ee4f851c67e7fb4444231..1d20caee804d28a792dcacbf8424dc23b80c6370:/lincan/src/aim104.c diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c index da8afc0..015a793 100644 --- a/lincan/src/aim104.c +++ b/lincan/src/aim104.c @@ -4,16 +4,11 @@ * 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 lincan-0.2 9 Jul 2003 + * Version lincan-0.3 17 Jun 2004 */ -#include - -#include -#include -#include -#include - +#include "../include/can.h" +#include "../include/can_sysdep.h" #include "../include/main.h" #include "../include/aim104.h" #include "../include/sja1000.h" @@ -26,9 +21,9 @@ #define IO_RANGE 0x20 /** - * 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 @@ -51,8 +46,8 @@ int aim104_request_io(struct candevice_t *candev) } /** - * 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. @@ -71,7 +66,7 @@ int aim104_release_io(struct candevice_t *candev) /** * 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 @@ -90,7 +85,7 @@ int aim104_reset(struct candevice_t *candev) /* Check hardware reset status chip 0 */ i=0; while ( (aim104_read_register(candev->io_addr + SJACR) - & CR_RR) && (i<=15) ) { + & sjaCR_RR) && (i<=15) ) { udelay(20000); i++; } @@ -110,15 +105,15 @@ int aim104_reset(struct candevice_t *candev) #define NR_SJA1000 1 /** - * 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 @@ -129,15 +124,14 @@ int aim104_init_hw_data(struct candevice_t *candev) candev->nr_82527_chips=0; candev->nr_sja1000_chips=1; candev->nr_all_chips=1; - candev->flags &= ~PROGRAMMABLE_IRQ; + candev->flags &= ~CANDEV_PROGRAMMABLE_IRQ; return 0; } -#define CHIP_TYPE "sja1000" /** * 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 @@ -150,11 +144,11 @@ int aim104_init_hw_data(struct candevice_t *candev) * The @clock entry holds the chip clock value in Hz. * The entry @sja_cdr_reg holds hardware specific options for the Clock Divider * register. Options defined in the %sja1000.h file: - * %CDR_CLKOUT_MASK, %CDR_CLK_OFF, %CDR_RXINPEN, %CDR_CBP, %CDR_PELICAN + * %sjaCDR_CLKOUT_MASK, %sjaCDR_CLK_OFF, %sjaCDR_RXINPEN, %sjaCDR_CBP, %sjaCDR_PELICAN * The entry @sja_ocr_reg holds hardware specific options for the Output Control * register. Options defined in the %sja1000.h file: - * %OCR_MODE_BIPHASE, %OCR_MODE_TEST, %OCR_MODE_NORMAL, %OCR_MODE_CLOCK, - * %OCR_TX0_LH, %OCR_TX1_ZZ. + * %sjaOCR_MODE_BIPHASE, %sjaOCR_MODE_TEST, %sjaOCR_MODE_NORMAL, %sjaOCR_MODE_CLOCK, + * %sjaOCR_TX0_LH, %sjaOCR_TX1_ZZ. * 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. @@ -166,8 +160,8 @@ int aim104_init_hw_data(struct candevice_t *candev) */ int aim104_init_chip_data(struct candevice_t *candev, int chipnr) { - candev->chip[chipnr]->chip_type=CHIP_TYPE; - candev->chip[chipnr]->chip_base_addr=candev->io_addr; + sja1000_fill_chipspecops(candev->chip[chipnr]); + candev->chip[chipnr]->chip_base_addr=can_ioport2ioptr(candev->io_addr); candev->chip[chipnr]->clock = 16000000; candev->chip[chipnr]->flags = 0; candev->chip[chipnr]->sja_cdr_reg = 0x08; @@ -178,7 +172,7 @@ int aim104_init_chip_data(struct candevice_t *candev, 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 @@ -193,21 +187,21 @@ int aim104_init_chip_data(struct candevice_t *candev, int chipnr) * Return Value: The function always returns zero * File: src/template.c */ -int aim104_init_obj_data(struct chip_t *chip, int objnr) +int aim104_init_obj_data(struct canchip_t *chip, int objnr) { chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr; - chip->msgobj[objnr]->flags=0; + chip->msgobj[objnr]->obj_flags=0; 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 @@ -229,9 +223,9 @@ int aim104_program_irq(struct candevice_t *candev) * Return Value: The function does not return a value * File: src/template.c */ -void aim104_write_register(unsigned char data, unsigned long address) +void aim104_write_register(unsigned data, can_ioptr_t address) { - outb(data,address); + can_outb(data,address); } /** @@ -244,9 +238,9 @@ void aim104_write_register(unsigned char data, unsigned long address) * Return Value: The function returns the value stored in @address * File: src/template.c */ -unsigned aim104_read_register(unsigned long address) +unsigned aim104_read_register(can_ioptr_t address) { - return inb(address); + return can_inb(address); } /* !!! Don't change this function !!! */