X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/8c0ae37c63dd4bc42fcb84da2eeb4a4978a2ebc0..95c031e101c74ae6472a7e538f3128f67a490082:/lincan/src/m437.c diff --git a/lincan/src/m437.c b/lincan/src/m437.c index c2073ed..c67b3dd 100644 --- a/lincan/src/m437.c +++ b/lincan/src/m437.c @@ -4,7 +4,7 @@ * 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 */ /* @@ -22,13 +22,8 @@ * */ -#include - -#include -#include -#include -#include - +#include "../include/can.h" +#include "../include/can_sysdep.h" #include "../include/main.h" #include "../include/m437.h" #include "../include/i82527.h" @@ -44,9 +39,9 @@ static long base = 0L; /** - * m437_request_io: - reserve io memory - * @io_addr: The reserved memory starts at @io_addr, wich is the module - * parameter @io. + * m437_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 m437_request_io() is used to reserve the io-memory. If your * hardware uses a dedicated memory range as hardware control registers you @@ -76,8 +71,8 @@ int m437_request_io(struct candevice_t *candev) } /** - * m437_release_io - free reserved io-memory - * @io_addr: Start of the memory range to be released. + * m437_elease_io - free reserved io memory range + * @candev: pointer to candevice/board which releases io * * The function m437_release_io() is used to free reserved io-memory. * In case you have reserved more io memory, don't forget to free it here. @@ -124,7 +119,7 @@ int m437_release_io(struct candevice_t *candev) /** * m437_reset - hardware reset routine - * @card: Number of the hardware card. + * @candev: Pointer to candevice/board structure * * The function m437_reset() is used to give a hardware reset. This is * rather hardware specific so I haven't included example code. Don't forget to @@ -142,15 +137,15 @@ int m437_reset(struct candevice_t *candev) #define NR_SJA1000 0 /** - * m437_init_hw_data - Initialze hardware cards - * @card: Number of the hardware card. + * m437_init_hw_data - Initialize hardware cards + * @candev: Pointer to candevice/board structure * * The function m437_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/m437.c @@ -162,16 +157,15 @@ int m437_init_hw_data(struct candevice_t *candev) candev->nr_82527_chips=1; candev->nr_sja1000_chips=0; candev->nr_all_chips=1; - candev->flags &= ~PROGRAMMABLE_IRQ; + candev->flags &= ~CANDEV_PROGRAMMABLE_IRQ; /* The M437 has no programmable IRQ */ return 0; } -#define CHIP_TYPE "i82527" /** * m437_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 m437_init_chip_data() is used to initialize the hardware @@ -184,11 +178,11 @@ int m437_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. @@ -203,7 +197,7 @@ int m437_init_hw_data(struct candevice_t *candev) */ int m437_init_chip_data(struct candevice_t *candev, int chipnr) { - candev->chip[chipnr]->chip_type=CHIP_TYPE; + i82527_fill_chipspecops(candev->chip[chipnr]); candev->chip[chipnr]->chip_base_addr=candev->io_addr; candev->chip[chipnr]->clock = 16000000; candev->chip[chipnr]->int_cpu_reg = iCPU_DSC | iCPU_CEN; @@ -216,7 +210,7 @@ int m437_init_chip_data(struct candevice_t *candev, int chipnr) /** * m437_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 m437_init_obj_data() is used to initialize the hardware @@ -231,21 +225,20 @@ int m437_init_chip_data(struct candevice_t *candev, int chipnr) * Return Value: The function always returns zero * File: src/m437.c */ -int m437_init_obj_data(struct chip_t *chip, int objnr) +int m437_init_obj_data(struct canchip_t *chip, int objnr) { chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10; - chip->msgobj[objnr]->flags=0; return 0; } /** * m437_program_irq - program interrupts - * @card: Number of the hardware card. + * @candev: Pointer to candevice/board structure * * The function m437_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 @@ -267,7 +260,7 @@ int m437_program_irq(struct candevice_t *candev) * Return Value: The function does not return a value * File: src/m437.c */ -void m437_write_register(unsigned char data, unsigned long address) +void m437_write_register(unsigned data, unsigned long address) { writeb(data,base+address); }