X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c61a955168179d9b11a8f420979eed5cc24869c0..9c8ab08d7e8fca3916a7f91a3c001d151989137c:/lincan/src/pc_i03.c diff --git a/lincan/src/pc_i03.c b/lincan/src/pc_i03.c index c7b3863..eb4653c 100644 --- a/lincan/src/pc_i03.c +++ b/lincan/src/pc_i03.c @@ -1,11 +1,36 @@ -/* pc-i03.c - * Linux CAN-bus device driver. - * Written by Arnaud Westenberg email:arnaud@wnadoo.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 lincan-0.2 9 Jul 2003 - */ +/**************************************************************************/ +/* File: pc_i03.c - PC-I03 ISA card by IXXAT */ +/* */ +/* LinCAN - (Not only) Linux CAN bus driver */ +/* Copyright (C) 2002-2009 DCE FEE CTU Prague */ +/* Copyright (C) 2002-2009 Pavel Pisa */ +/* Funded by OCERA and FRESCOR IST projects */ +/* Based on CAN driver code by Arnaud Westenberg */ +/* */ +/* LinCAN is free software; you can redistribute it and/or modify it */ +/* under terms of the GNU General Public License as published by the */ +/* Free Software Foundation; either version 2, or (at your option) any */ +/* later version. LinCAN is distributed in the hope that it will be */ +/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty */ +/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */ +/* General Public License for more details. You should have received a */ +/* copy of the GNU General Public License along with LinCAN; see file */ +/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, */ +/* Cambridge, MA 02139, USA. */ +/* */ +/* To allow use of LinCAN in the compact embedded systems firmware */ +/* and RT-executives (RTEMS for example), main authors agree with next */ +/* special exception: */ +/* */ +/* Including LinCAN header files in a file, instantiating LinCAN generics */ +/* or templates, or linking other files with LinCAN objects to produce */ +/* an application image/executable, does not by itself cause the */ +/* resulting application image/executable to be covered by */ +/* the GNU General Public License. */ +/* This exception does not however invalidate any other reasons */ +/* why the executable file might be covered by the GNU Public License. */ +/* Publication of enhanced or derived LinCAN files is required although. */ +/**************************************************************************/ #include "../include/can.h" #include "../include/can_sysdep.h" @@ -93,7 +118,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++; @@ -136,7 +161,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 @@ -152,11 +176,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. @@ -168,13 +192,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; } @@ -196,7 +220,7 @@ 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; @@ -231,7 +255,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 data, unsigned long address) +void pci03_write_register(unsigned data, can_ioptr_t address) { unsigned int *pci03_base_ptr; unsigned short address_to_write; @@ -256,7 +280,7 @@ void pci03_write_register(unsigned 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;