X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4cf24de229090b1ab6279570a564d224e13dd706..786c7d54e8d820e89997e507c29ea716c0d55fd9:/lincan/src/pcm3680.c

diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c
index cfb816a..853986a 100644
--- a/lincan/src/pcm3680.c
+++ b/lincan/src/pcm3680.c
@@ -24,18 +24,26 @@
 #include "../include/i82527.h"
 #include "../include/sja1000p.h"
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) /* may need correction */
+	#ifndef request_mem_region
+		#define request_mem_region(start,size,dev) (1)
+		#define release_mem_region(start,size) 
+	#endif /*request_mem_region*/
+#endif /* 2.4.0 */
+
 /* Basic hardware io address. This is also stored in the hardware structure but
  * we need it global, else we have to change many internal functions.
  * pcm3680_base_addr is initialized in pcm3680_init_chip_data().
  */
-unsigned int pcm3680_base_addr;
+unsigned long pcm3680_base_addr;
+static unsigned long isa_base = 0L; 
 
 /*
  * IO_RANGE is the io-memory range that gets reserved, please adjust according
  * your hardware. Example: #define IO_RANGE 0x100 for i82527 chips or
  * #define IO_RANGE 0x20 for sja1000 chips in basic CAN mode.
  */
-#define IO_RANGE 0x200
+#define IO_RANGE 0x400
 
 /**
  * template_request_io: - reserve io memory
@@ -53,14 +61,20 @@ unsigned int pcm3680_base_addr;
  */
 int pcm3680_request_io(unsigned long io_addr)
 {
-	if (check_region(io_addr,IO_RANGE)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr);
+        unsigned long remap_addr;
+	if (!request_mem_region(io_addr,IO_RANGE,DEVICE_NAME " - pcm3680")) {
+		CANMSG("Unable to request IO-memory: 0x%lx\n",io_addr);
 		return -ENODEV;
 	}
-	else {
-		request_region(io_addr,IO_RANGE,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr, io_addr + IO_RANGE - 1);
+	if ( !( remap_addr = (long) ioremap( io_addr, IO_RANGE ) ) ) {
+		CANMSG("Unable to access I/O memory at: 0x%lx\n", io_addr);
+		release_mem_region(io_addr,IO_RANGE);
+		return -ENODEV;
+	
 	}
+	isa_base=remap_addr-io_addr;
+
+	DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr, io_addr + IO_RANGE - 1);
 	return 0;
 }
 
@@ -78,8 +92,8 @@ int pcm3680_request_io(unsigned long io_addr)
  */
 int pcm3680_release_io(unsigned long io_addr)
 {
-	release_region(io_addr,IO_RANGE);
-
+	iounmap((void*)isa_base);
+	release_mem_region(io_addr,IO_RANGE);
 	return 0;
 }
 
@@ -95,54 +109,36 @@ int pcm3680_release_io(unsigned long io_addr)
  */
 int pcm3680_reset(int card)
 {
-//	int i=0;
-
-//	DEBUGMSG("Resetting pcm3680 hardware ...\n");
-//	pcm3680_write_register(0x01, candevices_p[card]->io_addr +
-//				0x100); // Write arbitrary data to reset mem
-//	pcm3680_write_register(0x01, candevices_p[card]->io_addr +
-//				0x300); // Write arbitrary data to reset mem
-//	udelay(20000);
-
-//	pcm3680_write_register(0x00, candevices_p[card]->io_addr + SJACR);
-//	pcm3680_write_register(0x00, candevices_p[card]->io_addr + SJACR+0x200);
-									
-	/* Check hardware reset status chip 0 */
-/*	i=0;
-	while ( (pcm3680_read_register(candevices_p[card]->io_addr + SJACR) 
-							& CR_RR) && (i<=15) ) {
-		udelay(20000);
-		i++;
-	}
-	if (i>=15) {
-		CANMSG("Reset status timeout!\n");
-		CANMSG("Please check your hardware.\n");
-		return -ENODEV;
-	}
-	else
-		DEBUGMSG("Chip[0] reset status ok.\n");
-*/
-	/* Check hardware reset status chip 1 */
-/*	i=0;
-	while ( (pcm3680_read_register( candevices_p[card]->io_addr + SJACR + 
-						0x200) & CR_RR) && (i<=15) ) {
-		udelay(20000);
-		i++;
-	}
-	if (i>=15) {
-		CANMSG("Reset status timeout!\n");
-		CANMSG("Please check your hardware.\n");
-		return -ENODEV;
+	int i=0;
+	struct chip_t *chip;
+	int chipnr;
+	
+	DEBUGMSG("Resetting pcm3680 hardware ...\n");
+	for(chipnr=0;chipnr<candevices_p[card]->nr_sja1000_chips;chipnr++) {
+		chip=candevices_p[card]->chip[chipnr];
+		pcm3680_write_register(MOD_RM, chip->chip_base_addr+SJAMOD);
+		udelay(1000);
+		pcm3680_write_register(0x00, chip->chip_base_addr + SJAIER);
+		/* Write arbitrary data to reset chip */
+		pcm3680_write_register(0x01, chip->chip_base_addr + 0x100);
+		udelay(1000);
+		i=20;
+		while (pcm3680_read_register(chip->chip_base_addr+SJAMOD)&MOD_RM){
+			if(!i--) return -ENODEV;
+			udelay(1000);
+			pcm3680_write_register(0, chip->chip_base_addr+SJAMOD);
+		}
+		udelay(1000);
+		pcm3680_write_register(CDR_PELICAN, chip->chip_base_addr+SJACDR);
+		pcm3680_write_register(0x00, chip->chip_base_addr + SJAIER);
 	}
-	else
-		DEBUGMSG("Chip[1] reset status ok.\n");
-*/
+
 	return 0;
 }
 
 #define RESET_ADDR 0x100
 #define NR_82527 0
-#define NR_SJA1000 1
+#define NR_SJA1000 2
 
 /**
  * template_init_hw_data - Initialze hardware cards
@@ -202,7 +198,8 @@ int pcm3680_init_chip_data(int card, int chipnr)
 {
 	pcm3680_base_addr = candevices_p[card]->io_addr;
 	candevices_p[card]->chip[chipnr]->chip_type=CHIP_TYPE;
-	candevices_p[card]->chip[chipnr]->chip_base_addr=candevices_p[card]->io_addr;
+	candevices_p[card]->chip[chipnr]->chip_base_addr=
+			candevices_p[card]->io_addr + 0x200*chipnr;
 	candevices_p[card]->chip[chipnr]->clock = 16000000;
 	candevices_p[card]->chip[chipnr]->int_clk_reg = 0x0;
 	candevices_p[card]->chip[chipnr]->int_bus_reg = 0x0;
@@ -268,7 +265,7 @@ int pcm3680_program_irq(int card)
  */
 void pcm3680_write_register(unsigned char data, unsigned long address)
 {
-	writeb(data,address);
+	writeb(data,isa_base+address);
 }
 
 /**
@@ -283,7 +280,7 @@ void pcm3680_write_register(unsigned char data, unsigned long address)
  */
 unsigned pcm3680_read_register(unsigned long address)
 {
-	return readb(address);
+	return readb(isa_base+address);
 }
 
 /* !!! Don't change this function !!! */