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

diff --git a/lincan/src/eb8245.c b/lincan/src/eb8245.c
index b871305..1ff89a4 100644
--- a/lincan/src/eb8245.c
+++ b/lincan/src/eb8245.c
@@ -1,11 +1,37 @@
-/* eb8245.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
- */ 
+/**************************************************************************/
+/* File: eb8245.c -  Kontron EB8245 onboard CAN with SJA1000 controller   */
+/*                                                                        */
+/* 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>             */
+/* Copyright (C) 2005 Petr Cvachoucek, Unicontrols                        */
+/* 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"
@@ -36,13 +62,13 @@
  */
 int eb8245_request_io(struct candevice_t *candev)
 {
-        int remap_addr;
+        can_ioptr_t remap_addr;
 	
 	if (!can_request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - eb8245")) {
 		CANMSG("Unable to request IO-memory: 0x%lx\n",candev->io_addr);
 		return -ENODEV;
 	}
-	if ( !( remap_addr = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) {
+	if ( !( remap_addr = ioremap( candev->io_addr, IO_RANGE ) ) ) {
 		CANMSG("Unable to access I/O memory at: 0x%lx\n", candev->io_addr);
 		can_release_mem_region(candev->io_addr,IO_RANGE);
 		return -ENODEV;
@@ -241,11 +267,11 @@ int eb8245_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/eb8245.c
  */
-void eb8245_write_register(unsigned data, unsigned long address)
+void eb8245_write_register(unsigned data, can_ioptr_t address)
 {
 	/*DEBUGMSG("eb8245_write_register: addr=0x%lx data=0x%x",
 		address,data);*/
-	writeb(data,address);
+	can_writeb(data,address);
 }
 
 /**
@@ -258,9 +284,9 @@ void eb8245_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/eb8245.c
  */
-unsigned eb8245_read_register(unsigned long address)
+unsigned eb8245_read_register(can_ioptr_t address)
 {
-	return readb(address);
+	return can_readb(address);
 }
 
 /* !!! Don't change this function !!! */