X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/7414f65d027e04893b7dce40d61feed2ca3a4319..HEAD:/lincan/src/esdpci266.c

diff --git a/lincan/src/esdpci266.c b/lincan/src/esdpci266.c
index a2f3183..fc043bc 100644
--- a/lincan/src/esdpci266.c
+++ b/lincan/src/esdpci266.c
@@ -1,11 +1,36 @@
-/* esdpci266.c - support for ESD PCI/PMC 266 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: esdpci266.c - support for ESD PCI/PMC 266 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"
@@ -178,28 +203,18 @@ int esdpci266_reset(struct candevice_t *candev)
 
 int esdpci266_init_hw_data(struct candevice_t *candev)
 {
-	struct pci_dev *pcidev = NULL;
+	struct pci_dev *pcidev;
 
 	printk("lincan: search for ESD PCI/PMC 266 board ...\n");
 
-	do {
-		pcidev =
-		    pci_find_device(PLX_9056_VENDOR_ID, PLX_9056_DEVICE_ID,
-				    pcidev);
-		if (pcidev == NULL)
-			return -ENODEV;
-		if (pcidev->subsystem_vendor != ESDPCI266_PCI_VENDOR_ID
-		    || pcidev->subsystem_device != ESDPCI266_PCI_PRODUCT_ID) {
-			printk
-			    ("PLX9056 found, subvendor/subdevice mismatch (%04d:%04d)\n",
-			     pcidev->subsystem_vendor,
-			     pcidev->subsystem_device);
-			continue;
-		}
-	} while (can_check_dev_taken(pcidev));
+	pcidev = can_pci_get_next_untaken_subsyst(PLX_9056_VENDOR_ID, PLX_9056_DEVICE_ID,
+						ESDPCI266_PCI_VENDOR_ID, ESDPCI266_PCI_PRODUCT_ID);
+	if(pcidev == NULL)
+		return -ENODEV;
 
 	if (pci_enable_device(pcidev)) {
 		printk("lincan: pci_enable_device() failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 
@@ -217,6 +232,12 @@ int esdpci266_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
+void esdpci266_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int esdpci266_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	if (candev->sysdevptr.pcidev == NULL)
@@ -252,6 +273,7 @@ int esdpci266_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = esdpci266_release_io;
 	hwspecops->reset = esdpci266_reset;
 	hwspecops->init_hw_data = esdpci266_init_hw_data;
+	hwspecops->done_hw_data = esdpci266_done_hw_data;
 	hwspecops->init_chip_data = esdpci266_init_chip_data;
 	hwspecops->init_obj_data = esdpci266_init_obj_data;
 	hwspecops->write_register = esdpci266_write_register;