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

diff --git a/lincan/src/smartcan.c b/lincan/src/smartcan.c
index c41c2d6..731f657 100644
--- a/lincan/src/smartcan.c
+++ b/lincan/src/smartcan.c
@@ -1,18 +1,13 @@
 /* smartcan.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>
@@ -28,44 +23,40 @@
 int smartcan_irq=-1;
 unsigned long smartcan_base=0x0;
 
-int smartcan_request_io(unsigned long io_addr)
+int smartcan_request_io(struct candevice_t *candev)
 {
-	int err=0;
-
-	if ( (err=check_region(io_addr,0x04)) < 0 ) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr);
+	if (!can_request_io_region(candev->io_addr,0x04,DEVICE_NAME)) {
+		CANMSG("Unable to open port: 0x%lx\n",candev->io_addr);
 		return -ENODEV;
-	}
-	else {
-		request_region(io_addr,0x04,DEVICE_NAME);
-		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr, io_addr + 0x04 - 1);
+	}else {
+		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr, candev->io_addr + 0x04 - 1);
 	}
 	return 0;
 }
 
-int smartcan_release_io(unsigned long io_addr)
+int smartcan_release_io(struct candevice_t *candev)
 {
-	release_region(io_addr,0x04);
+	can_release_io_region(candev->io_addr,0x04);
 
 	return 0;
 }
 
-int smartcan_reset(int card)
+int smartcan_reset(struct candevice_t *candev)
 {
 	int i=0;
 
 	DEBUGMSG("Resetting smartcan hardware ...\n");
-	outb(0x00,candevices_p[card]->res_addr);
+	outb(0x00,candev->res_addr);
 	while (i < 1000000) {
 		i++;
-		outb(0x01,candevices_p[card]->res_addr);
+		outb(0x01,candev->res_addr);
 	}
-	outb(0x00,candevices_p[card]->res_addr); 
+	outb(0x00,candev->res_addr); 
 
 	/* Check hardware reset status */
 	i=0;
-	outb(candevices_p[card]->io_addr+iCPU,candevices_p[card]->io_addr);
-	while ( (inb(candevices_p[card]->io_addr+1)&0x80) && (i<=15) ) {
+	outb(candev->io_addr+iCPU,candev->io_addr);
+	while ( (inb(candev->io_addr+1)&0x80) && (i<=15) ) {
 		udelay(20000);
 		i++;
 	}
@@ -80,35 +71,36 @@ int smartcan_reset(int card)
 	return 0;
 } 
 
-int smartcan_init_hw_data(int card)
+int smartcan_init_hw_data(struct candevice_t *candev)
 {
-	candevices_p[card]->res_addr=candevices_p[card]->io_addr+0x02;
-	candevices_p[card]->nr_82527_chips=1;
-	candevices_p[card]->nr_sja1000_chips=0;
-
+	candev->res_addr=candev->io_addr+0x02;
+	candev->nr_82527_chips=1;
+	candev->nr_sja1000_chips=0;
+	candev->nr_all_chips=1;
+	
 	return 0;
 }
 
-int smartcan_init_chip_data(int card, int chipnr)
+int smartcan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-	candevices_p[card]->chip[chipnr]->chip_type="i82527";
-	candevices_p[card]->chip[chipnr]->chip_base_addr=candevices_p[card]->io_addr;
-	candevices_p[card]->chip[chipnr]->clock = 16000000;
-	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;
-	smartcan_irq=candevices_p[card]->chip[chipnr]->chip_irq;
-	smartcan_base=candevices_p[card]->chip[chipnr]->chip_base_addr;
+	candev->chip[chipnr]->chip_type="i82527";
+	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
+	candev->chip[chipnr]->clock = 16000000;
+	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;
+	smartcan_irq=candev->chip[chipnr]->chip_irq;
+	smartcan_base=candev->chip[chipnr]->chip_base_addr;
 
 	return 0;
 }
 
-int smartcan_init_obj_data(int chipnr, int objnr)
+int smartcan_init_obj_data(struct chip_t *chip, int objnr)
 {
-	chips_p[chipnr]->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;
-	chips_p[chipnr]->msgobj[objnr]->flags=0;
+	chip->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;
+	chip->msgobj[objnr]->flags=0;
 
 	return 0;
 }
@@ -132,7 +124,7 @@ unsigned smartcan_read_register(unsigned long address)
 	return ret;
 }
 
-int smartcan_program_irq(int card)
+int smartcan_program_irq(struct candevice_t *candev)
 {
 	CANMSG("The 'smartcan' card doesn't have programmable interrupts\n");
 	return 0;