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

diff --git a/lincan/src/pcccan.c b/lincan/src/pcccan.c
index e7b5b22..290a44a 100644
--- a/lincan/src/pcccan.c
+++ b/lincan/src/pcccan.c
@@ -1,8 +1,10 @@
 /* pcccan.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
  */ 
 
 /* This file contains the low level functions for the pcccan-1 card from Gespac.
@@ -10,13 +12,6 @@
  */
 
 #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>
@@ -66,15 +61,13 @@ unsigned long pcccan_base=0x0;
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/pcccan.c
  */
-int pcccan_request_io(unsigned long io_addr)
+int pcccan_request_io(struct candevice_t *candev)
 {
-	if (check_region(io_addr,IO_RANGE)) {
-		CANMSG("Unable to open port: 0x%lx\n",io_addr);
+	if (!can_request_io_region(candev->io_addr,IO_RANGE,DEVICE_NAME)) {
+		CANMSG("Unable to open port: 0x%lx\n",candev->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);
+	} else {
+		DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr, candev->io_addr + IO_RANGE - 1);
 	}
 	return 0;
 }
@@ -91,9 +84,9 @@ int pcccan_request_io(unsigned long io_addr)
  * Return Value: The function always returns zero
  * File: src/pcccan.c
  */
-int pcccan_release_io(unsigned long io_addr)
+int pcccan_release_io(struct candevice_t *candev)
 {
-	release_region(io_addr,IO_RANGE);
+	can_release_io_region(candev->io_addr,IO_RANGE);
 
 	return 0;
 }
@@ -108,20 +101,20 @@ int pcccan_release_io(unsigned long io_addr)
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/pcccan.c
  */
-int pcccan_reset(int card)
+int pcccan_reset(struct candevice_t *candev)
 {
 	int i=0;
 
 	DEBUGMSG("Resetting pcccan-1 hardware ...\n");
 	while (i < 1000000) {
 		i++;
-		outb(0x0,candevices_p[card]->res_addr);
+		outb(0x0,candev->res_addr);
 	}
 
 	/* Check hardware reset status */
 	i=0;
-	outb(iCPU,candevices_p[card]->io_addr+0x1);
-	while ( (inb(candevices_p[card]->io_addr+0x2)&0x80) && (i<=15) ) {
+	outb(iCPU,candev->io_addr+0x1);
+	while ( (inb(candev->io_addr+0x2)&0x80) && (i<=15) ) {
 		udelay(20000);
 		i++;
 	}
@@ -153,12 +146,13 @@ int pcccan_reset(int card)
  * Return Value: The function always returns zero
  * File: src/pcccan.c
  */
-int pcccan_init_hw_data(int card) 
+int pcccan_init_hw_data(struct candevice_t *candev) 
 {
-	candevices_p[card]->res_addr=candevices_p[card]->io_addr;
-	candevices_p[card]->nr_82527_chips=NR_82527;
-	candevices_p[card]->nr_sja1000_chips=NR_SJA1000;
-	candevices_p[card]->flags |= ~PROGRAMMABLE_IRQ;
+	candev->res_addr=candev->io_addr;
+	candev->nr_82527_chips=NR_82527;
+	candev->nr_sja1000_chips=NR_SJA1000;
+        candev->nr_all_chips=NR_82527+NR_SJA1000;
+	candev->flags &= ~PROGRAMMABLE_IRQ;
 
 	return 0;
 }
@@ -196,18 +190,18 @@ int pcccan_init_hw_data(int card)
  * Return Value: The function always returns zero
  * File: src/pcccan.c
  */
-int pcccan_init_chip_data(int card, int chipnr)
+int pcccan_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_DMC;
-	candevices_p[card]->chip[chipnr]->int_clk_reg = iCLK_SL1 | iCLK_CD0;
-	candevices_p[card]->chip[chipnr]->int_bus_reg = iBUS_CBY | iBUS_DR1;
-	candevices_p[card]->chip[chipnr]->sja_cdr_reg = 0;
-	candevices_p[card]->chip[chipnr]->sja_ocr_reg = 0;
-	pcccan_irq=candevices_p[card]->chip[chipnr]->chip_irq;
-	pcccan_base=candevices_p[card]->chip[chipnr]->chip_base_addr;
+	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_DMC;
+	candev->chip[chipnr]->int_clk_reg = iCLK_SL1 | iCLK_CD0;
+	candev->chip[chipnr]->int_bus_reg = iBUS_CBY | iBUS_DR1;
+	candev->chip[chipnr]->sja_cdr_reg = 0;
+	candev->chip[chipnr]->sja_ocr_reg = 0;
+	pcccan_irq=candev->chip[chipnr]->chip_irq;
+	pcccan_base=candev->chip[chipnr]->chip_base_addr;
 
 	return 0;
 }
@@ -229,10 +223,10 @@ int pcccan_init_chip_data(int card, int chipnr)
  * Return Value: The function always returns zero
  * File: src/pcccan.c
  */
-int pcccan_init_obj_data(int chipnr, int objnr)
+int pcccan_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;
 }
@@ -249,7 +243,7 @@ int pcccan_init_obj_data(int chipnr, int objnr)
  * Return value: The function returns zero on success or %-ENODEV on failure
  * File: src/pcccan.c
  */
-int pcccan_program_irq(int card)
+int pcccan_program_irq(struct candevice_t *candev)
 {
 	return 0;
 }