X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/59a96df05006e914aea267209fa70b86eea448f4..d48f5ffafaa5a383c5fdfc7cdd83bb90d14a124c:/lincan/src/pcan_pci.c

diff --git a/lincan/src/pcan_pci.c b/lincan/src/pcan_pci.c
index 2a88beb..95ac94f 100644
--- a/lincan/src/pcan_pci.c
+++ b/lincan/src/pcan_pci.c
@@ -1,11 +1,36 @@
-/* pcan_pci.c - support for PEAK System PCAN-PCI 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: pcan_pci.c - support for PEAK System PCAN-PCI 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"
@@ -245,13 +270,15 @@ int pcan_pci_init_hw_data(struct candevice_t *candev)
 	int nr_chips;
 	u16 subsysid;
 
-	do {
-		pcidev = pci_find_device(PCAN_PCI_VENDOR_ID, PCAN_PCI_PRODUCT_ID, pcidev);
-		if(pcidev == NULL) return -ENODEV;
-	} while(can_check_dev_taken(pcidev));
+	pcidev = can_pci_get_next_untaken_device(PCAN_PCI_VENDOR_ID, PCAN_PCI_PRODUCT_ID);
+	if(pcidev == NULL) {
+		printk(KERN_ERR "No unused PCAN_PCI card found\n");
+		return -ENODEV;
+	}
 
 	if (pci_enable_device (pcidev)){
-		printk(KERN_CRIT "Enable PCAN_PCI failed\n");
+		printk(KERN_ERR "Enable PCAN_PCI failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->sysdevptr.pcidev=pcidev;
@@ -269,7 +296,7 @@ int pcan_pci_init_hw_data(struct candevice_t *candev)
 
 	for(i=0;i<2;i++){
 		if(!(pci_resource_flags(pcidev,0)&IORESOURCE_MEM)){
-			printk(KERN_CRIT "PCAN_PCI region %d is not memory\n",i);
+			printk(KERN_ERR "PCAN_PCI region %d is not memory\n",i);
 			goto error_ret;
 		}
 	}
@@ -301,21 +328,29 @@ error_ret:
 
 	printk(KERN_CRIT "Setup of PCAN_PCI failed\n");
 	pci_disable_device (pcidev);
+	can_pci_dev_put(pcidev);
 	return -EIO;
 }
 
+void pcan_pci_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int pcan_pci_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 
 	if(candev->sysdevptr.pcidev==NULL)
 		return -ENODEV;
 
+	sja1000p_fill_chipspecops(candev->chip[chipnr]);
+
 	/* special version of the IRQ handler is required for PCAN_PCI board */
 	candev->chip[chipnr]->chipspecops->irq_handler=pcan_pci_irq_handler;
 
 	candev->chip[chipnr]->chip_irq=candev->sysdevptr.pcidev->irq;
 
-	sja1000p_fill_chipspecops(candev->chip[chipnr]);
 	candev->chip[chipnr]->chip_base_addr=
 			can_ioport2ioptr(candev->io_addr+chipnr*PCAN_PCI_BYTES_PER_CIRCUIT);
 	candev->chip[chipnr]->flags = 0;
@@ -348,6 +383,7 @@ int pcan_pci_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = pcan_pci_release_io;
 	hwspecops->reset = pcan_pci_reset;
 	hwspecops->init_hw_data = pcan_pci_init_hw_data;
+	hwspecops->done_hw_data = pcan_pci_done_hw_data;
 	hwspecops->init_chip_data = pcan_pci_init_chip_data;
 	hwspecops->init_obj_data = pcan_pci_init_obj_data;
 	hwspecops->write_register = pcan_pci_write_register;