diff options
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/base.c | 57 | ||||
| -rw-r--r-- | driver/base.h | 6 | ||||
| -rw-r--r-- | driver/int.c | 4 | ||||
| -rw-r--r-- | driver/pciDriver.h | 24 |
4 files changed, 8 insertions, 83 deletions
diff --git a/driver/base.c b/driver/base.c index b999cac..581e6d5 100644 --- a/driver/base.c +++ b/driver/base.c @@ -301,58 +301,15 @@ static int __devinit pcidriver_probe(struct pci_dev *pdev, const struct pci_devi * * However, there is some difference in the interrupt handling functions. */ - if ( (id->vendor == MPRACE1_VENDOR_ID) && - (id->device == MPRACE1_DEVICE_ID)) - { - /* It is a mpRACE-1 */ - mod_info( "Found mpRACE-1 at %s\n", dev_name(&pdev->dev)); - /* Set bus master */ - pci_set_master(pdev); - } - else if ((id->vendor == PCIXTEST_VENDOR_ID) && - (id->device == PCIXTEST_DEVICE_ID)) - { - /* It is a PCI-X Test board */ - mod_info( "Found PCI-X test board at %s\n", dev_name(&pdev->dev)); - } - else if ((id->vendor == PCIEPLDA_VENDOR_ID) && - (id->device == PCIEPLDA_DEVICE_ID)) - { - /* It is a PCI-X Test board */ - mod_info( "Found PCIe PLDA test board at %s\n", dev_name(&pdev->dev)); - } - else if ((id->vendor == PCIEABB_VENDOR_ID) && - (id->device == PCIEABB_DEVICE_ID)) - { - /* It is a PCI-X Test board */ - mod_info( "Found PCIe ABB test board at %s\n", dev_name(&pdev->dev)); - } - else if ((id->vendor == PCIXPG4_VENDOR_ID) && - (id->device == PCIXPG4_DEVICE_ID)) - { - /* It is a PCI-X PROGRAPE4 board */ - mod_info( "Found PCI-X PROGRAPE-4 board at %s\n", dev_name(&pdev->dev)); - } - else if ((id->vendor == PCI64PG4_VENDOR_ID) && - (id->device == PCI64PG4_DEVICE_ID)) - { - /* It is a PCI-64 PROGRAPE4 board */ - mod_info( "Found PCI-64b/66 PROGRAPE-4 board at %s\n", dev_name(&pdev->dev)); - } - else if ((id->vendor == PCIE_XILINX_VENDOR_ID) && - (id->device == PCIE_ML605_DEVICE_ID)) - { - /* It is a PCI-E Xilinx ML605 evaluation board */ + if (id->vendor == PCIE_XILINX_VENDOR_ID) { + if (id->device == PCIE_ML605_DEVICE_ID) { mod_info("Found ML605 board at %s\n", dev_name(&pdev->dev)); - } - else if ((id->vendor == PCIE_XILINX_VENDOR_ID) && - (id->device == PCIE_IPECAMERA_DEVICE_ID)) - { - /* It is a PCI-E IPECamera based on Xilinx ML605 evaluation board */ + } else if (id->device == PCIE_IPECAMERA_DEVICE_ID) { mod_info("Found IPE Camera at %s\n", dev_name(&pdev->dev)); - } - else - { + } else { + mod_info("Found unknown Xilinx device (%x) at %s\n", id->device, dev_name(&pdev->dev)); + } + } else { /* It is something else */ mod_info( "Found unknown board (%x:%x) at %s\n", id->vendor, id->device, dev_name(&pdev->dev)); } diff --git a/driver/base.h b/driver/base.h index c8787c9..743eee5 100644 --- a/driver/base.h +++ b/driver/base.h @@ -45,12 +45,6 @@ static void pcidriver_exit(void); */ static const __devinitdata struct pci_device_id pcidriver_ids[] = { - { PCI_DEVICE( MPRACE1_VENDOR_ID , MPRACE1_DEVICE_ID ) }, // mpRACE-1 - { PCI_DEVICE( PCIXTEST_VENDOR_ID , PCIXTEST_DEVICE_ID ) }, // pcixTest - { PCI_DEVICE( PCIEPLDA_VENDOR_ID , PCIEPLDA_DEVICE_ID ) }, // PCIePLDA - { PCI_DEVICE( PCIEABB_VENDOR_ID , PCIEABB_DEVICE_ID ) }, // PCIeABB - { PCI_DEVICE( PCIXPG4_VENDOR_ID , PCIXPG4_DEVICE_ID ) }, // PCI-X PROGRAPE 4 - { PCI_DEVICE( PCI64PG4_VENDOR_ID , PCI64PG4_DEVICE_ID ) }, // PCI-64 PROGRAPE 4 { PCI_DEVICE( PCIE_XILINX_VENDOR_ID, PCIE_ML605_DEVICE_ID ) }, // PCI-E Xilinx ML605 { PCI_DEVICE( PCIE_XILINX_VENDOR_ID, PCIE_IPECAMERA_DEVICE_ID ) }, // PCI-E IPE Camera {0,0,0,0}, diff --git a/driver/int.c b/driver/int.c index 1cca7b2..285aa0e 100644 --- a/driver/int.c +++ b/driver/int.c @@ -247,9 +247,7 @@ static bool pcidriver_irq_acknowledge(pcidriver_privdata_t *privdata) /* FIXME: guillermo: which ones? all? */ /* Test if we have to handle this interrupt */ - if ((privdata->pdev->vendor != PCIEABB_VENDOR_ID) || - (privdata->pdev->device != PCIEABB_DEVICE_ID)) - return false; + return false; // The device is not supported any more /* Acknowledge the device */ /* this is for ABB / wenxue DMA engine */ diff --git a/driver/pciDriver.h b/driver/pciDriver.h index 22369e9..083b0b2 100644 --- a/driver/pciDriver.h +++ b/driver/pciDriver.h @@ -58,30 +58,6 @@ #include <linux/ioctl.h> -/* Identifies the mpRACE-1 boards */ -#define MPRACE1_VENDOR_ID 0x10b5 -#define MPRACE1_DEVICE_ID 0x9656 - -/* Identifies the PCI-X Test boards */ -#define PCIXTEST_VENDOR_ID 0x10dc -#define PCIXTEST_DEVICE_ID 0x0156 - -/* Identifies the PCIe-PLDA Test board */ -#define PCIEPLDA_VENDOR_ID 0x1556 -#define PCIEPLDA_DEVICE_ID 0x1100 - -/* Identifies the PCIe-ABB Test board */ -#define PCIEABB_VENDOR_ID 0x10dc -#define PCIEABB_DEVICE_ID 0x0153 - -/* Identifies the PCI-X PROGRAPE4 */ -#define PCIXPG4_VENDOR_ID 0x1679 -#define PCIXPG4_DEVICE_ID 0x0001 - -/* Identifies the PCI-64 PROGRAPE4 */ -#define PCI64PG4_VENDOR_ID 0x1679 -#define PCI64PG4_DEVICE_ID 0x0005 - /* Identifies the PCI-E Xilinx ML605 */ #define PCIE_XILINX_VENDOR_ID 0x10ee #define PCIE_ML605_DEVICE_ID 0x04a0 |