The LinCAN driver license unified according to DCE FEE CTU head and superiors request.

[lincan.git] / lincan / src / esdpci200.c

diff --git a/lincan/src/esdpci200.c b/lincan/src/esdpci200.c
index 1b62e7e49972bf9c518476a1363bb02d537ed844..718db1eefd7c68d30882b2945fa84c23cd94315c 100644 (file)
--- a/lincan/src/esdpci200.c
+++ b/lincan/src/esdpci200.c
@@ -1,10 +1,37 @@
-/* esdpci200.c - support for ESD Electronics' CAN/PCI-200 cards
- * Linux CAN-bus device driver.
- * The card support was added by Manuel Bessler <m.bessler@gmx.net>
- * Based on adlink7841.c and nsi_canpci.c
- * This software is released under the GPL-License.
- * Version lincan-0.3.3
- */ 
+/**************************************************************************/
+/* File: esdpci200.c - support for ESD Electronics' CAN/PCI-200 cards     */
+/*                                                                        */
+/* 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) 2007 Manuel Bessler <m.bessler@gmx.net>                  */
+/* 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"
@@ -173,7 +200,7 @@ int esdpci200_request_io(struct candevice_t *candev)
        can_base_addr_fixup(candev, remap_addr);
        CANMSG("esdpci200_sja IO-memory: 0x%lx - 0x%lx (VMA 0x%lx)\n", 
                (unsigned long) bar2_addr,
-               (unsigned long) bar2_addr + pci_resource_len(pcidev,2) - 1,
+               (unsigned long) (bar2_addr + pci_resource_len(pcidev,2) - 1),
                (long) remap_addr);
 
        return 0;
@@ -208,13 +235,13 @@ int esdpci200_release_io(struct candevice_t *candev)
 
 void esdpci200_write_register(unsigned data, can_ioptr_t address)
 {
-       iowrite8((u8)data,(void*)address);
+       iowrite8((u8)data,address);
        wmb();
 }
 
 unsigned esdpci200_read_register(can_ioptr_t address)
 {
-       return ioread8((void*)address);
+       return ioread8(address);
 }
 
 int esdpci200_reset(struct candevice_t *candev)