CPC-PCI second chip IRQ corrected. Message timestamp code added.

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

diff --git a/lincan/src/ems_cpcpci.c b/lincan/src/ems_cpcpci.c
index 63cf430dc7c1c499c61accf8887abc6e61190f40..603595db4d7f6c4ac342fcf381c119a0952c71d3 100644 (file)
--- a/lincan/src/ems_cpcpci.c
+++ b/lincan/src/ems_cpcpci.c
@@ -197,7 +197,7 @@ can_irqreturn_t ems_cpcpci_irq_handler(int irq, void *dev_id, struct pt_regs *re
                        chip=candev->chip[i];
                        if(!chip || !(chip->flags&CHIP_CONFIGURED))
                                continue;
-                       sja1000p_irq_handler(irq, dev_id, regs);
+                       sja1000p_irq_handler(irq, chip, regs);
                }
                icr=readl(candev->dev_base_addr + PITA2_ICR);
        } while(icr & PITA2_ICR_INT0);
@@ -276,9 +276,9 @@ int ems_cpcpci_init_hw_data(struct candevice_t *candev)
        if(ems_cpcpci_request_io(candev)<0)
                return -ENODEV;
 
-       candev->dev_base_addr=pci_resource_start(pcidev,0); /*S5920*/
+       /*** candev->dev_base_addr=pci_resource_start(pcidev,0); ***/
        /* some control registers */
-       candev->io_addr=pci_resource_start(pcidev,1);
+       /*** candev->io_addr=pci_resource_start(pcidev,1); ***/
        /* 0 more EMS control registers
          * 0x400 the first SJA1000
          * 0x600 the second SJA1000
@@ -295,7 +295,7 @@ int ems_cpcpci_init_hw_data(struct candevice_t *candev)
        
        CANMSG("EMS CPC-PCI check value %04lx, ID %d\n", l, i);
        
-       if((l!=0x55aa01cb)||(i!=0x11)) {
+       if(l!=0x55aa01cb) {
                CANMSG("EMS CPC-PCI unexpected check values\n");
        }