X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/09842f610105faf6b2c03da03b8916494203f765..3367930de7bb1e08bed6463ff3ed66f242bf8fc0:/lincan/src/adlink7841.c

diff --git a/lincan/src/adlink7841.c b/lincan/src/adlink7841.c
index 59107d4..5385332 100644
--- a/lincan/src/adlink7841.c
+++ b/lincan/src/adlink7841.c
@@ -1,11 +1,36 @@
-/* adlink7841.c - support for ADLINK 7841 cards
- * 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: adlink7841.c - support for ADLINK 7841 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>             */
+/* 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"
@@ -95,14 +120,14 @@ int adlink7841_release_io(struct candevice_t *candev)
 }
 
 
-void adlink7841_write_register(unsigned data, unsigned long address)
+void adlink7841_write_register(unsigned data, can_ioptr_t address)
 {
-	outb(data,address); 
+	can_outb(data,address); 
 }
 
-unsigned adlink7841_read_register(unsigned long address)
+unsigned adlink7841_read_register(can_ioptr_t address)
 {
-	return inb(address);
+	return can_inb(address);
 }
 
 int adlink7841_reset(struct candevice_t *candev)
@@ -151,16 +176,16 @@ int adlink7841_reset(struct candevice_t *candev)
 
 int adlink7841_init_hw_data(struct candevice_t *candev)
 {
-	struct pci_dev *pcidev = NULL;
+	struct pci_dev *pcidev;
 	int i;
 
-	do {
-		pcidev = pci_find_device(ADLINK7841_PCI_VENDOR_ID, ADLINK7841_PCI_PRODUCT_ID, pcidev);
-		if(pcidev == NULL) return -ENODEV;
-	} while(can_check_dev_taken(pcidev));
+	pcidev = can_pci_get_next_untaken_device(ADLINK7841_PCI_VENDOR_ID, ADLINK7841_PCI_PRODUCT_ID);
+	if(pcidev == NULL)
+		return -ENODEV;
 	
 	if (pci_enable_device (pcidev)){
 		printk(KERN_CRIT "Setup of ADLINK7841 failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->sysdevptr.pcidev=pcidev;
@@ -168,6 +193,7 @@ int adlink7841_init_hw_data(struct candevice_t *candev)
 	for(i=1;i<3;i++){
 		if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
 			printk(KERN_CRIT "ADLINK7841 region %d is not IO\n",i);
+			can_pci_dev_put(pcidev);
 			return -EIO;
 		}
 	}
@@ -184,6 +210,12 @@ int adlink7841_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
+void adlink7841_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int adlink7841_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 
@@ -194,7 +226,7 @@ int adlink7841_init_chip_data(struct candevice_t *candev, int chipnr)
 
 	sja1000p_fill_chipspecops(candev->chip[chipnr]);
 	candev->chip[chipnr]->chip_base_addr=
-			candev->io_addr+chipnr*ADLINK7841_BYTES_PER_CIRCUIT;
+			can_ioport2ioptr(candev->io_addr+chipnr*ADLINK7841_BYTES_PER_CIRCUIT);
 	candev->chip[chipnr]->flags = 0;
 	candev->chip[chipnr]->int_cpu_reg = 0;
 	candev->chip[chipnr]->int_clk_reg = 0;
@@ -225,6 +257,7 @@ int adlink7841_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = adlink7841_release_io;
 	hwspecops->reset = adlink7841_reset;
 	hwspecops->init_hw_data = adlink7841_init_hw_data;
+	hwspecops->done_hw_data = adlink7841_done_hw_data;
 	hwspecops->init_chip_data = adlink7841_init_chip_data;
 	hwspecops->init_obj_data = adlink7841_init_obj_data;
 	hwspecops->write_register = adlink7841_write_register;