X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/b99e666b3b0b03c12fc30f4ad6fec9caa6e1a13d..8bf274975cae173308f3e85a70cf17834071873b:/lincan/src/ems_cpcpci.c?ds=sidebyside

diff --git a/lincan/src/ems_cpcpci.c b/lincan/src/ems_cpcpci.c
index 63cf430..41441f3 100644
--- a/lincan/src/ems_cpcpci.c
+++ b/lincan/src/ems_cpcpci.c
@@ -30,8 +30,13 @@
 
 /*PSB4610 PITA-2 bridge control registers*/   
 #define PITA2_ICR  0x00  /* Interrupt Control Register */
-#define   PITA2_ICR_INT0    0x00000002 /* [RC] INT0 Active/Clear */
-#define   PITA2_ICR_INT0_En 0x00020000 /* [RW] Enable INT0 */
+#define   PITA2_ICR_INT0    0x00000002	/* [RC] INT0 Active/Clear */
+#define   PITA2_ICR_GP0_INT 0x00000004	/* [RC] GP0 Interrupt */
+					/* GP0_Int_En=1, GP0_Out_En=0 and low detected */
+#define   PITA2_ICR_GP1_INT 0x00000008	/* [RC] GP1 Interrupt */
+#define   PITA2_ICR_GP2_INT 0x00000010	/* [RC] GP2 Interrupt */
+#define   PITA2_ICR_GP3_INT 0x00000020	/* [RC] GP2 Interrupt */
+#define   PITA2_ICR_INT0_En 0x00020000	/* [RW] Enable INT0 */
 
 #define PITA2_MISC 0x1C  /* Miscellaneous Register */
 #define   PITA2_MISC_CONFIG 0x04000000
@@ -197,7 +202,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 +281,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 +300,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");
 	}