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

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

diff --git a/lincan/src/sysdep_lnx.c b/lincan/src/sysdep_lnx.c
index 07ef7d04c3d6f6c807f3a478d500c32a02a3f148..1033a5f7e0fa6da3894611ee3a877f7d36df7829 100644 (file)
--- a/lincan/src/sysdep_lnx.c
+++ b/lincan/src/sysdep_lnx.c
@@ -1,11 +1,36 @@
-/* sysdep_lnx.c
- * 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: sysdep_lnx.c - Linux system dependant support routines           */
+/*                                                                        */
+/* 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"
@@ -20,6 +45,9 @@
  * components/comm/contrib directory. */
 #endif
 
+#ifndef IRQF_SHARED
+#define IRQF_SHARED SA_SHIRQ
+#endif  /*IRQF_SHARED*/
 
 /**
  * can_checked_malloc - memory allocation with registering of requested blocks
@@ -186,6 +214,37 @@ void can_release_mem_region(unsigned long start, unsigned long n)
     #endif
 }
 
+#ifdef CAN_ENABLE_PCI_SUPPORT
+
+struct pci_dev *can_pci_get_next_untaken_device(unsigned int vendor, unsigned int device)
+{
+       struct pci_dev *pcidev = NULL;
+
+       do {
+               pcidev = can_pci_get_device(vendor, device, pcidev);
+               if(pcidev == NULL)
+                       return NULL;
+       } while(can_check_dev_taken(pcidev));
+
+       return pcidev;
+}
+
+struct pci_dev *can_pci_get_next_untaken_subsyst(unsigned int vendor, unsigned int device,
+                       unsigned int ss_vendor, unsigned int ss_device)
+{
+       struct pci_dev *pcidev = NULL;
+
+       do {
+               pcidev = can_pci_get_subsys(vendor, device, ss_vendor, ss_device, pcidev);
+               if(pcidev == NULL)
+                       return NULL;
+       } while(can_check_dev_taken(pcidev));
+
+       return pcidev;
+}
+
+#endif /*CAN_ENABLE_PCI_SUPPORT*/
+
 #ifndef CAN_WITH_RTL
 
 /**
@@ -198,12 +257,12 @@ void can_release_mem_region(unsigned long start, unsigned long n)
  * 
  * File: src/setup.c
  */
-can_irqreturn_t can_default_irq_dispatch(int irq, void *dev_id, struct pt_regs *regs)
+can_irqreturn_t can_default_irq_dispatch(CAN_IRQ_HANDLER_ARGS(irq_number, dev_id))
 {
        int retval;
        struct canchip_t *chip=(struct canchip_t *)dev_id;
 
-       retval=chip->chipspecops->irq_handler(irq, chip);
+       retval=chip->chipspecops->irq_handler(irq_number, chip);
        return CAN_IRQ_RETVAL(retval);
 }
 
@@ -223,7 +282,7 @@ int can_chip_setup_irq(struct canchip_t *chip)
                return 1;
                        
        if ((chip->flags & CHIP_IRQ_VME) == 0) {
-               if (request_irq(chip->chip_irq,can_default_irq_dispatch,SA_SHIRQ,DEVICE_NAME,chip))
+               if (request_irq(chip->chip_irq,can_default_irq_dispatch,IRQF_SHARED,DEVICE_NAME,chip))
                        return -1;
                else {
                        DEBUGMSG("Registered interrupt %d\n",chip->chip_irq);