]> rtime.felk.cvut.cz Git - lincan.git/blobdiff - lincan/src/bfadcan.c
Use mdelay instead of udelay for long times.
[lincan.git] / lincan / src / bfadcan.c
index 5270bd13572b43229b3d2a8c455a4549209484f0..5557ca1d74c283f237d87d74ec751c4422754f3e 100644 (file)
@@ -1,17 +1,36 @@
-/* bfadcan.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 lincan-0.3  17 Jun 2004
- */
-
-/* This file is intended as a bfadcan file for currently unsupported hardware.
- * Once you've changed/added the functions specific to your hardware it is
- * possible to load the driver with the hardware option hw=bfadcan.
- */
-
+/**************************************************************************/
+/* File: bfadcan.c - support for BFAD can boards                          */
+/*                                                                        */
+/* LinCAN - (Not only) Linux CAN bus driver                               */
+/* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+/* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+/* Funded by OCERA and FRESCOR IST projects                               */
+/* Based on CAN driver code by Arnaud Westenberg <arnaud@wanadoo.nl>      */
+/*                                                                        */
+/* 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.  */
+/**************************************************************************/
 
 #define WINDOWED_ACCESS
 
 #define __NO_VERSION__
 #include <linux/module.h>
 
-long clock_freq;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-MODULE_PARM(clock_freq,"i");
-#else
-module_param(clock_freq,int,0);
-#endif
+#define CAN_BFAD_CLOCKFREQ 20000000
 
 /* cli and sti are not allowed in 2.5.5x SMP kernels */
 #ifdef WINDOWED_ACCESS
@@ -46,8 +60,8 @@ static CAN_DEFINE_SPINLOCK(bfadcan_win_lock);
 #define IO_RANGE 0x100
 #endif
 
-unsigned bfadcan_read_register(unsigned long address);
-void bfadcan_write_register(unsigned data, unsigned long address);
+unsigned bfadcan_read_register(can_ioptr_t address);
+void bfadcan_write_register(unsigned data, can_ioptr_t address);
 
 
 /**
@@ -200,17 +214,18 @@ int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
        unsigned int id1, id2;
        sja1000p_fill_chipspecops(candev->chip[chipnr]);
-       candev->chip[chipnr]->chip_base_addr=candev->io_addr;
-       candev->chip[chipnr]->clock = clock_freq;
+       candev->chip[chipnr]->chip_base_addr=can_ioport2ioptr(candev->io_addr);
+       if(candev->chip[chipnr]->clock<=0)
+               candev->chip[chipnr]->clock = CAN_BFAD_CLOCKFREQ;
        candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF;
        candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH;
-       id1 = inb(0xe284);
-       id2 = inb(0xe285);
+       id1 = can_inb(0xe284);
+       id2 = can_inb(0xe285);
 
 
        CANMSG("can driver ver lincan-0.3, at %04lx, CPLD v%d.%d.%d.%d\n",
-                                       candev->chip[chipnr]->chip_base_addr,
-                                                       id1>>4, id1&0x0f, id2>>4, id2&0x0f);
+                       can_ioptr2ulong(candev->chip[chipnr]->chip_base_addr),
+                       id1>>4, id1&0x0f, id2>>4, id2&0x0f);
 
 
        return 0;
@@ -268,16 +283,16 @@ int bfadcan_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/bfadcan.c
  */
-void bfadcan_write_register(unsigned data, unsigned long address)
+void bfadcan_write_register(unsigned data, can_ioptr_t address)
 {
 #ifdef WINDOWED_ACCESS
        can_spin_irqflags_t flags;
        can_spin_lock_irqsave(&bfadcan_win_lock,flags);
-       outb(address&0x00ff,0x200);
-       outb(data, 0x201);
+       can_outb(can_ioptr2ulong(address)&0x00ff,0x200);
+       can_outb(data, 0x201);
        can_spin_unlock_irqrestore(&bfadcan_win_lock,flags);
 #else
-       outb(data,address);
+       can_outb(data,address);
 #endif
 }
 
@@ -291,18 +306,18 @@ void bfadcan_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/bfadcan.c
  */
-unsigned bfadcan_read_register(unsigned long address)
+unsigned bfadcan_read_register(can_ioptr_t address)
 {
 #ifdef WINDOWED_ACCESS
        can_spin_irqflags_t flags;
        int ret;
        can_spin_lock_irqsave(&bfadcan_win_lock,flags);
-       outb(address&0x00ff,0x200);
-       ret = inb(0x201);
+       can_outb(can_ioptr2ulong(address)&0x00ff,0x200);
+       ret = can_inb(0x201);
        can_spin_unlock_irqrestore(&bfadcan_win_lock,flags);
        return ret;
 #else
-       return inb(address);
+       return can_inb(address);
 #endif
 }