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

diff --git a/lincan/src/m437.c b/lincan/src/m437.c
index 3be6f65..7405160 100644
--- a/lincan/src/m437.c
+++ b/lincan/src/m437.c
@@ -1,8 +1,10 @@
 /* m437.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
  */ 
 
 /* 
@@ -21,13 +23,6 @@
  */
 
 #include <linux/autoconf.h>
-#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
-#define MODVERSIONS
-#endif
-
-#ifdef MODVERSIONS
-#include <linux/modversions.h>
-#endif
 
 #include <linux/ioport.h>
 #include <linux/delay.h>
@@ -62,15 +57,20 @@ static long base = 0L;
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/m437.c
  */
-int m437_request_io(unsigned long io_addr)
+int m437_request_io(struct candevice_t *candev)
 {
 
-	if ( !( base = (long) ioremap( io_addr, IO_RANGE ) ) ) {
-		CANMSG("Unable to access I/O memory at: 0x%lx\n", io_addr);
+	if (!request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME)) {
+		CANMSG("Unable to request IO-memory: 0x%lx\n",candev->io_addr);
+		return -ENODEV;
+	}
+
+	if ( !( base = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) {
+		CANMSG("Unable to access I/O memory at: 0x%lx\n", candev->io_addr);
 		return -ENODEV;
 	
 	}
-	DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr, io_addr + IO_RANGE - 1);
+	DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr, candev->io_addr + IO_RANGE - 1);
 	return 0;
 }
 
@@ -86,7 +86,7 @@ int m437_request_io(unsigned long io_addr)
  * Return Value: The function always returns zero
  * File: src/m437.c
  */
-int m437_release_io(unsigned long io_addr)
+int m437_release_io(struct candevice_t *candev)
 {
 	unsigned i;
 	
@@ -116,6 +116,8 @@ int m437_release_io(unsigned long io_addr)
 	/* release I/O memory mapping */
 	iounmap((void*)base);
 
+	release_mem_region(candev->io_addr,IO_RANGE);
+
 	return 0;
 }
 
@@ -129,7 +131,7 @@ int m437_release_io(unsigned long io_addr)
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/m437.c
  */
-int m437_reset(int card)
+int m437_reset(struct candevice_t *candev)
 {
 	return 0;
 }
@@ -152,13 +154,14 @@ int m437_reset(int card)
  * Return Value: The function always returns zero
  * File: src/m437.c
  */
-int m437_init_hw_data(int card) 
+int m437_init_hw_data(struct candevice_t *candev) 
 {
 	DEBUGMSG("m437_init_hw_data()\n");
-	candevices_p[card]->res_addr=RESET_ADDR;
-	candevices_p[card]->nr_82527_chips=1;
-	candevices_p[card]->nr_sja1000_chips=0;
-	candevices_p[card]->flags &= ~PROGRAMMABLE_IRQ;
+	candev->res_addr=RESET_ADDR;
+	candev->nr_82527_chips=1;
+	candev->nr_sja1000_chips=0;
+        candev->nr_all_chips=1;
+	candev->flags &= ~PROGRAMMABLE_IRQ;
 	/* The M437 has no programmable IRQ */
 
 	return 0;
@@ -197,15 +200,15 @@ int m437_init_hw_data(int card)
  * Return Value: The function always returns zero
  * File: src/m437.c
  */
-int m437_init_chip_data(int card, int chipnr)
+int m437_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-	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]->clock = 16000000;
-	candevices_p[card]->chip[chipnr]->int_cpu_reg = iCPU_DSC | iCPU_CEN;
-	candevices_p[card]->chip[chipnr]->int_clk_reg = 
+	candev->chip[chipnr]->chip_type=CHIP_TYPE;
+	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
+	candev->chip[chipnr]->clock = 16000000;
+	candev->chip[chipnr]->int_cpu_reg = iCPU_DSC | iCPU_CEN;
+	candev->chip[chipnr]->int_clk_reg = 
 		iCLK_CD0 | iCLK_CD1 | iCLK_CD2 | iCLK_SL0 | iCLK_SL1;
-	candevices_p[card]->chip[chipnr]->int_bus_reg = iBUS_CBY;
+	candev->chip[chipnr]->int_bus_reg = iBUS_CBY;
 
 	return 0;
 }
@@ -227,10 +230,10 @@ int m437_init_chip_data(int card, int chipnr)
  * Return Value: The function always returns zero
  * File: src/m437.c
  */
-int m437_init_obj_data(int chipnr, int objnr)
+int m437_init_obj_data(struct chip_t *chip, int objnr)
 {
-	chips_p[chipnr]->msgobj[objnr]->obj_base_addr=chips_p[chipnr]->chip_base_addr+(objnr+1)*0x10;
-	chips_p[chipnr]->msgobj[objnr]->flags=0;
+	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10;
+	chip->msgobj[objnr]->flags=0;
 	
 	return 0;
 }
@@ -247,7 +250,7 @@ int m437_init_obj_data(int chipnr, int objnr)
  * Return value: The function returns zero on success or %-ENODEV on failure
  * File: src/m437.c
  */
-int m437_program_irq(int card)
+int m437_program_irq(struct candevice_t *candev)
 {
 	return 0;
 }