X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2c5dbee366e95b46de0cb95cab23d2a94a13f184..626f7414aee3ecd51ab35d093314919528f67b12:/lincan/src/kv_pcican.c

diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index eace091..273db86 100644
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -121,7 +121,7 @@ int kv_pcican_release_io(struct candevice_t *candev)
 }
 
 
-void kv_pcican_write_register(unsigned char data, unsigned long address)
+void kv_pcican_write_register(unsigned data, unsigned long address)
 {
 	outb(data,address); 
 }
@@ -148,24 +148,24 @@ int kv_pcican_reset(struct candevice_t *candev)
 		if(!candev->chip[chip_nr]) continue;
 		chip=candev->chip[chip_nr];
 
-		kv_pcican_write_register(MOD_RM, chip->chip_base_addr+SJAMOD);
+		kv_pcican_write_register(sjaMOD_RM, chip->chip_base_addr+SJAMOD);
 		udelay(1000);
 
 		cdr=kv_pcican_read_register(chip->chip_base_addr+SJACDR);
-		kv_pcican_write_register(cdr|CDR_PELICAN, chip->chip_base_addr+SJACDR);
+		kv_pcican_write_register(cdr|sjaCDR_PELICAN, chip->chip_base_addr+SJACDR);
 
 		kv_pcican_write_register(0, chip->chip_base_addr+SJAIER);
 
 		i=20;
 		kv_pcican_write_register(0, chip->chip_base_addr+SJAMOD);
-		while (kv_pcican_read_register(chip->chip_base_addr+SJAMOD)&MOD_RM){
+		while (kv_pcican_read_register(chip->chip_base_addr+SJAMOD)&sjaMOD_RM){
 			if(!i--) return -ENODEV;
 			udelay(1000);
 			kv_pcican_write_register(0, chip->chip_base_addr+SJAMOD);
 		}
 
 		cdr=kv_pcican_read_register(chip->chip_base_addr+SJACDR);
-		kv_pcican_write_register(cdr|CDR_PELICAN, chip->chip_base_addr+SJACDR);
+		kv_pcican_write_register(cdr|sjaCDR_PELICAN, chip->chip_base_addr+SJACDR);
 
 		kv_pcican_write_register(0, chip->chip_base_addr+SJAIER);
 		
@@ -183,8 +183,10 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
 	struct pci_dev *pcidev = NULL;
 	int i;
 
-	pcidev = pci_find_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID, pcidev);
-	if(pcidev == NULL) return -ENODEV;
+	do {
+		pcidev = pci_find_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID, pcidev);
+		if(pcidev == NULL) return -ENODEV;
+	} while(can_check_dev_taken(pcidev));
 	
 	if (pci_enable_device (pcidev)){
 		printk(KERN_CRIT "Setup of PCICAN failed\n");
@@ -193,7 +195,7 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
 	candev->sysdevptr.pcidev=pcidev;
 	
 	for(i=0;i<3;i++){
-		if(!(pci_resource_flags(pcidev,0)&IORESOURCE_IO)){
+		if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
 			printk(KERN_CRIT "PCICAN region %d is not IO\n",i);
 			return -EIO;
 		}
@@ -238,9 +240,10 @@ int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr)
 	candev->chip[chipnr]->int_cpu_reg = 0;
 	candev->chip[chipnr]->int_clk_reg = 0;
 	candev->chip[chipnr]->int_bus_reg = 0;
-	candev->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF;
+	candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF;
 	candev->chip[chipnr]->sja_ocr_reg = KV_PCICAN_OCR_DEFAULT_STD;
 	candev->chip[chipnr]->clock = 16000000;
+	candev->chip[chipnr]->flags |= CHIP_IRQ_PCI;
 
 	return 0;
 }