X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/3129fcd8094edcb910b708463fdf1a234f11fb55..6234a9dc385e5a9258a84227b2eab09bbb099c27:/lincan/src/pc_i03.c diff --git a/lincan/src/pc_i03.c b/lincan/src/pc_i03.c index daec69c..def0546 100644 --- a/lincan/src/pc_i03.c +++ b/lincan/src/pc_i03.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/pc-i03.h" #include "../include/sja1000.h" @@ -98,7 +93,7 @@ int pci03_reset(struct candevice_t *candev) /* Check hardware reset status */ i=0; - while ( (pci03_read_register(pci03_base_addr + SJACR) & CR_RR) + while ( (pci03_read_register(pci03_base_addr + SJACR) & sjaCR_RR) && (i<=15) ) { udelay(20000); i++; @@ -127,7 +122,7 @@ int pci03_reset(struct candevice_t *candev) * %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/pc-i03.c @@ -141,7 +136,6 @@ int pci03_init_hw_data(struct candevice_t *candev) return 0; } -#define CHIP_TYPE "sja1000" /** * pci03_init_chip_data - Initialize chips * @candev: Pointer to candevice/board structure @@ -157,11 +151,11 @@ int pci03_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. @@ -173,13 +167,13 @@ int pci03_init_hw_data(struct candevice_t *candev) */ int pci03_init_chip_data(struct candevice_t *candev, int chipnr) { + sja1000_fill_chipspecops(candev->chip[chipnr]); pci03_base_addr = candev->io_addr; - candev->chip[chipnr]->chip_type=CHIP_TYPE; candev->chip[chipnr]->chip_base_addr=candev->io_addr; candev->chip[chipnr]->clock = 16000000; - candev->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF; - candev->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | - OCR_TX0_HL | OCR_TX1_LZ; + candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF; + candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL | + sjaOCR_TX0_HL | sjaOCR_TX1_LZ; return 0; } @@ -201,10 +195,9 @@ int pci03_init_chip_data(struct candevice_t *candev, int chipnr) * Return Value: The function always returns zero * File: src/pc-i03.c */ -int pci03_init_obj_data(struct chip_t *chip, int objnr) +int pci03_init_obj_data(struct canchip_t *chip, int objnr) { chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr; - chip->msgobj[objnr]->flags=0; return 0; } @@ -215,7 +208,7 @@ int pci03_init_obj_data(struct chip_t *chip, int objnr) * * The function pci03_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 @@ -237,7 +230,7 @@ int pci03_program_irq(struct candevice_t *candev) * Return Value: The function does not return a value * File: src/pc-i03.c */ -void pci03_write_register(unsigned char data, unsigned long address) +void pci03_write_register(unsigned data, can_ioptr_t address) { unsigned int *pci03_base_ptr; unsigned short address_to_write; @@ -262,7 +255,7 @@ void pci03_write_register(unsigned char data, unsigned long address) * Return Value: The function returns the value stored in @address * File: src/pc-i03.c */ -unsigned pci03_read_register(unsigned long address) +unsigned pci03_read_register(can_ioptr_t address) { unsigned int *pci03_base_ptr; unsigned short address_to_read;