X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/ce93567bb929614d283a248bc8dbf4caec26e59b..HEAD:/lincan/src/oscar.c

diff --git a/lincan/src/oscar.c b/lincan/src/oscar.c
index 798e6ea..2bc5937 100644
--- a/lincan/src/oscar.c
+++ b/lincan/src/oscar.c
@@ -1,15 +1,37 @@
-/* oscar.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
-
- NOTE: Please see the template.c file for the comments relating to this code.
-       Herein is the modified copy of the functions
-
- */ 
+/**************************************************************************/
+/* File: oscar.c - SJA1000 based card connected to ARM LH7A400 SoC        */
+/*                                                                        */
+/* 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.  */
+/**************************************************************************/
+
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
@@ -66,7 +88,7 @@ int oscar_reset(struct candevice_t *candev)
 	return 0;
 }
 
-int oscar_init_hw_data(struct candevice_t *candev) 
+int oscar_init_hw_data(struct candevice_t *candev)
 {
     candev->res_addr = 0x0; // RESET address?
     candev->nr_82527_chips = 0;
@@ -82,8 +104,8 @@ int oscar_init_chip_data(struct candevice_t *candev, int chipnr)
     // i82527_fill_chipspecops(candev->chip[chipnr]);
     // sja1000_fill_chipspecops(candev->chip[chipnr]);
     sja1000p_fill_chipspecops(candev->chip[chipnr]);
-	
-    candev->chip[chipnr]->chip_base_addr = candev->io_addr;
+
+    candev->chip[chipnr]->chip_base_addr = can_ioport2ioptr(candev->io_addr);
     candev->chip[chipnr]->clock = 12000000;
     candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP;  // we use an external tranceiver
     candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH;
@@ -91,33 +113,33 @@ int oscar_init_chip_data(struct candevice_t *candev, int chipnr)
     candev->chip[chipnr]->int_cpu_reg = 0;
     candev->chip[chipnr]->int_clk_reg = 0;
     candev->chip[chipnr]->int_bus_reg = 0;
-    
+
     return 0;
 }
 
 int oscar_init_obj_data(struct canchip_t *chip, int objnr)
 {
     chip->msgobj[objnr]->obj_base_addr = chip->chip_base_addr;
-    
+
     return 0;
 }
 
 int oscar_program_irq(struct candevice_t *candev)
 {
     // CAN_IRQ_L (active low) interrupt: PF2 / INT2 on our LH7A400 SoC
-    // This IRQ is set up already by the kernel.    
+    // This IRQ is set up already by the kernel.
 
     return 0;
 }
 
-void oscar_write_register(unsigned data, unsigned long address)
+void oscar_write_register(unsigned data, can_ioptr_t address)
 {
-	outb(data,address);
+	can_outb(data,address);
 }
 
-unsigned oscar_read_register(unsigned long address)
+unsigned oscar_read_register(can_ioptr_t address)
 {
-	return inb(address);
+	return can_inb(address);
 }
 
 /* !!! Don't change this function !!! */