X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/97078fff5202521b758c9081d75580880417a123..11132ea490f9e860744ee4f851c67e7fb4444231:/lincan/src/pccan.c

diff --git a/lincan/src/pccan.c b/lincan/src/pccan.c
index bf5a8a8..06e9e05 100644
--- a/lincan/src/pccan.c
+++ b/lincan/src/pccan.c
@@ -1,170 +1,127 @@
 /* pccan.c
  * Linux CAN-bus device driver.
  * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
+ * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
+ * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version 0.7  6 Aug 2001
+ * Version lincan-0.2  9 Jul 2003
  */ 
 
 #include <linux/autoconf.h>
-#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
-#define MODVERSIONS
-#endif
-
-#if defined (MODVERSIONS)
-#include <linux/modversions.h>
-#endif
 
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <asm/irq.h>
 #include <asm/errno.h>
 #include <asm/io.h>
+#include <asm/irq.h>
 
 #include "../include/main.h"
 #include "../include/pccan.h"
 #include "../include/i82527.h"
 #include "../include/sja1000.h"
 
-int pccanf_request_io(unsigned long io_addr)
+int pccanf_request_io(struct candevice_t *candev)
 {
-	if (check_region(io_addr+0x4000,0x20)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x4000);
+	if (!can_request_io_region(candev->io_addr+0x4000,0x20,DEVICE_NAME)) {
+		CANMSG("Unable to open port: 0x%lx\n",candev->io_addr+0x4000);
 		return -ENODEV;
 	}
-	else if (check_region(io_addr+0x6000,0x04)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x6000);
+	else if (!can_request_io_region(candev->io_addr+0x6000,0x04,DEVICE_NAME)) {
+		can_release_io_region(candev->io_addr+0x4000,0x20);
+		CANMSG("Unable to open port: 0x%lx\n",candev->io_addr+0x6000);
 		return -ENODEV;
 	}
 	else {
-		request_region(io_addr+0x4000,0x20,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x4000, io_addr+0x4000+0x20-1);
-		request_region(io_addr+0x6000,0x04,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x6000, io_addr+0x6000+0x04-1);
+		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr+0x4000, candev->io_addr+0x4000+0x20-1);
+		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr+0x6000, candev->io_addr+0x6000+0x04-1);
 	}
 	return 0;
 }
 
-int pccand_request_io(unsigned long io_addr)
+int pccand_request_io(struct candevice_t *candev)
 {
-	if (pccanf_request_io(io_addr))
+	if (pccanf_request_io(candev))
 		return -ENODEV;
 
-	if (check_region(io_addr+0x5000,0x20)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x5000);
+	if (!can_request_io_region(candev->io_addr+0x5000,0x20,DEVICE_NAME)) {
+		pccanf_release_io(candev);
+		CANMSG("Unable to open port: 0x%lx\n",candev->io_addr+0x5000);
 		return -ENODEV;
 	}
 	else {
-		request_region(io_addr+0x5000,0x20,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x5000, io_addr+0x5000+0x20-1);
+		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr+0x5000, candev->io_addr+0x5000+0x20-1);
 	}
 	return 0;
 }
 
-int pccanq_request_io(unsigned long io_addr)
+int pccanq_request_io(struct candevice_t *candev)
 {
-	if (pccand_request_io(io_addr))
+	unsigned long io_addr;
+	int i;
+	
+	if (pccand_request_io(candev))
 		return -ENODEV;
 
-	if (check_region(io_addr+0x2000,0x40)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x2000);
-		return -ENODEV;
-	}
-	else if (check_region(io_addr+0x2400,0x40)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x2400);
-		return -ENODEV;
-	}
-	else if (check_region(io_addr+0x2800,0x40)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x2800);
-		return -ENODEV;
-	}
-	else if (check_region(io_addr+0x2C00,0x40)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x2C00);
-		return -ENODEV;
-	}
-	else if (check_region(io_addr+0x3000,0x40)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x3000);
-		return -ENODEV;
-	}
-	else if (check_region(io_addr+0x3400,0x40)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x3400);
-		return -ENODEV;
-	}
-	else if (check_region(io_addr+0x3800,0x40)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x3800);
-		return -ENODEV;
-	}
-	else if (check_region(io_addr+0x3C00,0x40)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr+0x3C00);
-		return -ENODEV;
-	}
-	else {
-		request_region(io_addr+0x2000,0x40,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x2000, io_addr+0x2000+0x40-1);
-		request_region(io_addr+0x2400,0x40,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x2400, io_addr+0x2400+0x40-1);
-		request_region(io_addr+0x2800,0x40,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x2800, io_addr+0x2800+0x40-1);
-		request_region(io_addr+0x2C00,0x40,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x2C00, io_addr+0x2C00+0x40-1);
-		request_region(io_addr+0x3000,0x40,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x3000, io_addr+0x3000+0x40-1);
-		request_region(io_addr+0x3400,0x40,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x3400, io_addr+0x3400+0x40-1);
-		request_region(io_addr+0x3800,0x40,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x3800, io_addr+0x3800+0x40-1);
-		request_region(io_addr+0x3C00,0x40,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr+0x3C00, io_addr+0x3C00+0x40-1);
+	for(i=0, io_addr=candev->io_addr+0x2000; i<8; i++, io_addr+=0x400) {
+		if (!can_request_io_region(io_addr,0x40,DEVICE_NAME)) {
+			CANMSG("Unable to open port: 0x%lx\n",io_addr);
+			while(i--){
+				io_addr-=0x400;
+				can_release_io_region(io_addr,0x40);
+			}
+			pccand_release_io(candev);
+			return -ENODEV;
+		}
+		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr, io_addr+0x40-1);
 	}
-
 	return 0;
 }
 
-int pccanf_release_io(unsigned long io_addr)
+int pccanf_release_io(struct candevice_t *candev)
 {
-	release_region(io_addr+0x4000,0x20);
-	release_region(io_addr+0x6000,0x04);
+	can_release_io_region(candev->io_addr+0x4000,0x20);
+	can_release_io_region(candev->io_addr+0x6000,0x04);
 
 	return 0;
 }
 
-int pccand_release_io(unsigned long io_addr)
+int pccand_release_io(struct candevice_t *candev)
 {
-	pccanf_release_io(io_addr);
-	release_region(io_addr+0x5000,0x20);
+	pccanf_release_io(candev);
+	can_release_io_region(candev->io_addr+0x5000,0x20);
 
 	return 0;
 }
 
-int pccanq_release_io(unsigned long io_addr)
+int pccanq_release_io(struct candevice_t *candev)
 {
-	pccand_release_io(io_addr);
-	release_region(io_addr+0x2000,0x40);
-	release_region(io_addr+0x2400,0x40);
-	release_region(io_addr+0x2800,0x40);
-	release_region(io_addr+0x2C00,0x40);
-	release_region(io_addr+0x3000,0x40);
-	release_region(io_addr+0x3400,0x40);
-	release_region(io_addr+0x3800,0x40);
-	release_region(io_addr+0x3C00,0x40);
+	unsigned long io_addr;
+	int i;
+
+	pccand_release_io(candev);
+
+	for(i=0, io_addr=candev->io_addr+0x2000; i<8; i++, io_addr+=0x400) {
+		can_release_io_region(io_addr,0x40);
+	}
 
 	return 0;
 }
 
-int pccanf_reset(int card)
+int pccanf_reset(struct candevice_t *candev)
 {
 	int i=0;
 
 	DEBUGMSG("Resetting pccanf/s hardware ...\n");
 	while (i < 1000000) {
 		i++;
-		outb(0x00,candevices_p[card]->res_addr);
+		outb(0x00,candev->res_addr);
 	}
-	outb(0x01,candevices_p[card]->res_addr);
-	outb(0x00,candevices_p[card]->chip[0]->chip_base_addr+SJACR);
+	outb(0x01,candev->res_addr);
+	outb(0x00,candev->chip[0]->chip_base_addr+SJACR);
 
 	/* Check hardware reset status */
 	i=0;
-	while ( (inb(candevices_p[card]->chip[0]->chip_base_addr+SJACR) & CR_RR)
+	while ( (inb(candev->chip[0]->chip_base_addr+SJACR) & CR_RR)
 								 && (i<=15) ) {
 		udelay(20000);
 		i++;
@@ -180,24 +137,24 @@ int pccanf_reset(int card)
 	return 0;
 }
 
-int pccand_reset(int card)
+int pccand_reset(struct candevice_t *candev)
 {
 	int i=0,chip_nr=0;
 
 	DEBUGMSG("Resetting pccan-d hardware ...\n");
 	while (i < 1000000) {
 		i++;
-		outb(0x00,candevices_p[card]->res_addr);
+		outb(0x00,candev->res_addr);
 	}
-	outb(0x01,candevices_p[card]->res_addr);
-	outb(0x00,candevices_p[card]->chip[0]->chip_base_addr+SJACR);
-	outb(0x00,candevices_p[card]->chip[1]->chip_base_addr+SJACR);
+	outb(0x01,candev->res_addr);
+	outb(0x00,candev->chip[0]->chip_base_addr+SJACR);
+	outb(0x00,candev->chip[1]->chip_base_addr+SJACR);
 
 	/* Check hardware reset status */
 	i=0;
 	for (chip_nr=0; chip_nr<2; chip_nr++) {
 		i=0;
-		while ( (inb(candevices_p[card]->chip[chip_nr]->chip_base_addr +
+		while ( (inb(candev->chip[chip_nr]->chip_base_addr +
 						SJACR) & CR_RR) && (i<=15) ) {
 			udelay(20000);
 			i++;
@@ -213,27 +170,27 @@ int pccand_reset(int card)
 	return 0;
 }
 
-int pccanq_reset(int card)
+int pccanq_reset(struct candevice_t *candev)
 {
 	int i=0,chip_nr=0;
 
 	for (i=0; i<4; i++)
-		disable_irq(candevices_p[card]->chip[i]->chip_irq);
+		disable_irq(candev->chip[i]->chip_irq);
 
 	DEBUGMSG("Resetting pccan-q hardware ...\n");
 	while (i < 100000) {
 		i++;
-		outb(0x00,candevices_p[card]->res_addr);
+		outb(0x00,candev->res_addr);
 	}
-	outb_p(0x01,candevices_p[card]->res_addr);
+	outb_p(0x01,candev->res_addr);
 		
-	outb(0x00,candevices_p[card]->chip[2]->chip_base_addr+SJACR);
-	outb(0x00,candevices_p[card]->chip[3]->chip_base_addr+SJACR);
+	outb(0x00,candev->chip[2]->chip_base_addr+SJACR);
+	outb(0x00,candev->chip[3]->chip_base_addr+SJACR);
 
 	/* Check hardware reset status */
 	for (chip_nr=0; chip_nr<2; chip_nr++) {
 		i=0;
-		while( (inb(candevices_p[card]->chip[chip_nr]->chip_base_addr +
+		while( (inb(candev->chip[chip_nr]->chip_base_addr +
 						iCPU) & iCPU_RST) && (i<=15) ) {
 			udelay(20000);
 			i++;
@@ -248,7 +205,7 @@ int pccanq_reset(int card)
 	}
 	for (chip_nr=2; chip_nr<4; chip_nr++) {
 		i=0;
-		while( (inb(candevices_p[card]->chip[chip_nr]->chip_base_addr +
+		while( (inb(candev->chip[chip_nr]->chip_base_addr +
 						SJACR) & CR_RR) && (i<=15) ) {
 			udelay(20000);
 			i++;
@@ -263,90 +220,93 @@ int pccanq_reset(int card)
 	}
 
 	for (i=0; i<4; i++)
-		enable_irq(candevices_p[card]->chip[i]->chip_irq);
+		enable_irq(candev->chip[i]->chip_irq);
 
 	return 0;
 } 	
 
-int pccan_init_hw_data(int card)
+int pccan_init_hw_data(struct candevice_t *candev)
 {
-	candevices_p[card]->res_addr=candevices_p[card]->io_addr+0x6001;
-	candevices_p[card]->flags |= PROGRAMMABLE_IRQ;
+	candev->res_addr=candev->io_addr+0x6001;
+	candev->flags |= PROGRAMMABLE_IRQ;
 
-	if (!strcmp(candevices_p[card]->hwname,"pccan-q")) {
-		candevices_p[card]->nr_82527_chips=2;
-		candevices_p[card]->nr_sja1000_chips=2;
+	if (!strcmp(candev->hwname,"pccan-q")) {
+		candev->nr_82527_chips=2;
+		candev->nr_sja1000_chips=2;
+		candev->nr_all_chips=4;
 	}
-	if (!strcmp(candevices_p[card]->hwname,"pccan-f") |
-	    !strcmp(candevices_p[card]->hwname,"pccan-s")) {
-		candevices_p[card]->nr_82527_chips=0;
-		candevices_p[card]->nr_sja1000_chips=1;
+	if (!strcmp(candev->hwname,"pccan-f") |
+	    !strcmp(candev->hwname,"pccan-s")) {
+		candev->nr_82527_chips=0;
+		candev->nr_sja1000_chips=1;
+		candev->nr_all_chips=1;
 	}
-	if (!strcmp(candevices_p[card]->hwname,"pccan-d")) {
-		candevices_p[card]->nr_82527_chips=0;
-		candevices_p[card]->nr_sja1000_chips=2;
+	if (!strcmp(candev->hwname,"pccan-d")) {
+		candev->nr_82527_chips=0;
+		candev->nr_sja1000_chips=2;
+		candev->nr_all_chips=2;
 	}
 
 	return 0;
 }
 
-int pccan_init_chip_data(int card, int chipnr)
+int pccan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-	if (!strcmp(candevices_p[card]->hwname,"pccan-q")) {
+	if (!strcmp(candev->hwname,"pccan-q")) {
 		if (chipnr<2) {
-			candevices_p[card]->chip[chipnr]->chip_type="i82527";
-			candevices_p[card]->chip[chipnr]->flags = SEGMENTED;
-			candevices_p[card]->chip[chipnr]->int_cpu_reg=iCPU_DSC;
-			candevices_p[card]->chip[chipnr]->int_clk_reg=iCLK_SL1;
-			candevices_p[card]->chip[chipnr]->int_bus_reg=iBUS_CBY;
-			candevices_p[card]->chip[chipnr]->sja_cdr_reg = 0;
-			candevices_p[card]->chip[chipnr]->sja_ocr_reg = 0;	
+			candev->chip[chipnr]->chip_type="i82527";
+			candev->chip[chipnr]->flags = CHIP_SEGMENTED;
+			candev->chip[chipnr]->int_cpu_reg=iCPU_DSC;
+			candev->chip[chipnr]->int_clk_reg=iCLK_SL1;
+			candev->chip[chipnr]->int_bus_reg=iBUS_CBY;
+			candev->chip[chipnr]->sja_cdr_reg = 0;
+			candev->chip[chipnr]->sja_ocr_reg = 0;	
 		}
 		else{
-			candevices_p[card]->chip[chipnr]->chip_type="sja1000";
-			candevices_p[card]->chip[chipnr]->flags = 0;
-			candevices_p[card]->chip[chipnr]->int_cpu_reg = 0;
-			candevices_p[card]->chip[chipnr]->int_clk_reg = 0;
-			candevices_p[card]->chip[chipnr]->int_bus_reg = 0;
-			candevices_p[card]->chip[chipnr]->sja_cdr_reg =
+			candev->chip[chipnr]->chip_type="sja1000";
+			candev->chip[chipnr]->flags = 0;
+			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_CLK_OFF;
-			candevices_p[card]->chip[chipnr]->sja_ocr_reg = 
+			candev->chip[chipnr]->sja_ocr_reg = 
 						OCR_MODE_NORMAL | OCR_TX0_LH;	
 		}
-		candevices_p[card]->chip[chipnr]->chip_base_addr=0x1000*chipnr+0x2000+candevices_p[card]->io_addr;
+		candev->chip[chipnr]->chip_base_addr=0x1000*chipnr+0x2000+candev->io_addr;
 	}
 	else {
-		candevices_p[card]->chip[chipnr]->chip_type="sja1000";
-		candevices_p[card]->chip[chipnr]->chip_base_addr=0x1000*chipnr+0x4000+candevices_p[card]->io_addr;
-		candevices_p[card]->chip[chipnr]->flags = 0;
-		candevices_p[card]->chip[chipnr]->int_cpu_reg = 0;
-		candevices_p[card]->chip[chipnr]->int_clk_reg = 0;
-		candevices_p[card]->chip[chipnr]->int_bus_reg = 0;
-		candevices_p[card]->chip[chipnr]->sja_cdr_reg = CDR_CLK_OFF;
-		candevices_p[card]->chip[chipnr]->sja_ocr_reg = 
+		candev->chip[chipnr]->chip_type="sja1000";
+		candev->chip[chipnr]->chip_base_addr=0x1000*chipnr+0x4000+candev->io_addr;
+		candev->chip[chipnr]->flags = 0;
+		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_CLK_OFF;
+		candev->chip[chipnr]->sja_ocr_reg = 
 						OCR_MODE_NORMAL | OCR_TX0_LH;	
 	}
 
-	candevices_p[card]->chip[chipnr]->clock = 16000000;
+	candev->chip[chipnr]->clock = 16000000;
 
 	return 0;
 }	
 
-int pccan_init_obj_data(int chipnr, int objnr)
+int pccan_init_obj_data(struct chip_t *chip, int objnr)
 {
-	if (!strcmp(chips_p[chipnr]->chip_type,"sja1000")) {
-		chips_p[chipnr]->msgobj[objnr]->obj_base_addr=chips_p[chipnr]->chip_base_addr;
-		chips_p[chipnr]->msgobj[objnr]->flags=0;
+	if (!strcmp(chip->chip_type,"sja1000")) {
+		chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
+		chip->msgobj[objnr]->flags=0;
 	}
-	else {
-		chips_p[chipnr]->msgobj[objnr]->obj_base_addr=chips_p[chipnr]->chip_base_addr+(objnr+1)*0x10+(int)((objnr+1)/4)*0x3c0;
-		chips_p[chipnr]->msgobj[objnr]->flags=0;
+	else {	/* The spacing for this card is 0x3c0 */
+		chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10+(int)((objnr+1)/4)*0x3c0;
+		chip->msgobj[objnr]->flags=0;
 	}
 
 	return 0;
 }
 
-int pccan_program_irq(int card)
+int pccan_program_irq(struct candevice_t *candev)
 {
 	#define IRQ9 0x01
 	#define IRQ3 0x02
@@ -356,7 +316,7 @@ int pccan_program_irq(int card)
 	int i;
 
 	for (i=0; i<4; i++) {
-		switch (candevices_p[card]->chip[i]->chip_irq) {
+		switch (candev->chip[i]->chip_irq) {
 			case 0: {
 				break;
 			}
@@ -378,9 +338,9 @@ int pccan_program_irq(int card)
 			}
 		}
 	}
-	outb(irq_reg_value,0x6000+candevices_p[card]->io_addr);
+	outb(irq_reg_value,0x6000+candev->io_addr);
 	DEBUGMSG("Configured pccan hardware interrupts\n");
-	outb(0x80,0x6000+candevices_p[card]->io_addr+0x02);
+	outb(0x80,0x6000+candev->io_addr+0x02);
 	DEBUGMSG("Selected pccan on-board 16 MHz oscillator\n");
 
 	return 0;