LinCAN PCI cards support updated to support PCI devices reference counting.

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

diff --git a/lincan/src/ems_cpcpci.c b/lincan/src/ems_cpcpci.c
index ffbf76aeb2ac5e5738a5df2614b91a069a18ae79..55c4d983aea67d6fbd4db018eeb0f24998513482 100644 (file)
--- a/lincan/src/ems_cpcpci.c
+++ b/lincan/src/ems_cpcpci.c
@@ -1,9 +1,37 @@
-/* ems_cpcpci.c - support for EMS-WUENSCHE CPC-PCI card
- * Linux CAN-bus device driver.
- * The card support added by Paolo Grisleri <grisleri@ce.unipr.it>
- * This software is released under the GPL-License.
- * Version lincan-0.3  17 Jun 2004
- */ 
+/**************************************************************************/
+/* File: ems_cpcpci.c - support for EMS-WUENSCHE CPC-PCI card             */
+/*                                                                        */
+/* 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) 2004 Paolo Grisleri <grisleri@ce.unipr.it>               */
+/* 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"
@@ -259,15 +287,17 @@ int ems_cpcpci_reset(struct candevice_t *candev)
 
 int ems_cpcpci_init_hw_data(struct candevice_t *candev)
 {
-       struct pci_dev *pcidev = NULL;
+       struct pci_dev *pcidev;
        int i;
        unsigned long l;
 
-       pcidev = pci_find_device(EMS_CPCPCI_PCICAN_VENDOR, EMS_CPCPCI_PCICAN_ID, pcidev);
-       if(pcidev == NULL) return -ENODEV;
+       pcidev = can_pci_get_next_untaken_device(EMS_CPCPCI_PCICAN_VENDOR, EMS_CPCPCI_PCICAN_ID);
+       if(pcidev == NULL)
+               return -ENODEV;
        
        if (pci_enable_device (pcidev)){
                printk(KERN_CRIT "Setup of EMS_CPCPCI failed\n");
+               can_pci_dev_put(pcidev);
                return -EIO;
        }
        candev->sysdevptr.pcidev=pcidev;
@@ -275,13 +305,16 @@ int ems_cpcpci_init_hw_data(struct candevice_t *candev)
        for(i=0;i<2;i++){
                if(!(pci_resource_flags(pcidev,0)&IORESOURCE_MEM)){
                        printk(KERN_CRIT "EMS_CPCPCI region %d is not memory\n",i);
+                       can_pci_dev_put(pcidev);
                        return -EIO;
                }
        }
 
        /*request IO access temporarily to check card presence*/
-       if(ems_cpcpci_request_io(candev)<0)
+       if(ems_cpcpci_request_io(candev)<0) {
+               can_pci_dev_put(pcidev);
                return -ENODEV;
+       }
 
        /*** candev->aux_base_addr=pci_resource_start(pcidev,0); ***/
        /* some control registers */
@@ -312,10 +345,16 @@ int ems_cpcpci_init_hw_data(struct candevice_t *candev)
        candev->nr_all_chips=2;
 
        ems_cpcpci_release_io(candev);
-        
+
        return 0;
 }
 
+void ems_cpcpci_done_hw_data(struct candevice_t *candev)
+{
+       struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+       can_pci_dev_put(pcidev);
+}
+
 int ems_cpcpci_init_chip_data(struct candevice_t *candev, int chipnr)
 {
        if(candev->sysdevptr.pcidev==NULL)
@@ -362,6 +401,7 @@ int ems_cpcpci_register(struct hwspecops_t *hwspecops)
        hwspecops->release_io = ems_cpcpci_release_io;
        hwspecops->reset = ems_cpcpci_reset;
        hwspecops->init_hw_data = ems_cpcpci_init_hw_data;
+       hwspecops->done_hw_data = ems_cpcpci_done_hw_data;
        hwspecops->init_chip_data = ems_cpcpci_init_chip_data;
        hwspecops->init_obj_data = ems_cpcpci_init_obj_data;
        hwspecops->write_register = ems_cpcpci_write_register;