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

diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c
index 930e91a..3e145f6 100644
--- a/lincan/src/bfadcan.c
+++ b/lincan/src/bfadcan.c
@@ -1,8 +1,10 @@
 /* bfadcan.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 is intended as a bfadcan file for currently unsupported hardware.
@@ -13,13 +15,7 @@
 #define __NO_VERSION__ /* this is not a main module, do not include module info */
 
 #include <linux/autoconf.h>
-#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
-#define MODVERSIONS
-#endif
 
-#if defined (MODVERSIONS)
-#include <linux/modversions.h>
-#endif
 #include <linux/module.h>
 
 #include <linux/version.h>
@@ -77,15 +73,13 @@ void bfadcan_write_register(unsigned char data, unsigned long address);
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/bfadcan.c
  */
-int bfadcan_request_io(unsigned long io_addr)
+int bfadcan_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;
 }
@@ -102,9 +96,9 @@ int bfadcan_request_io(unsigned long io_addr)
  * Return Value: The function always returns zero
  * File: src/bfadcan.c
  */
-int bfadcan_release_io(unsigned long io_addr)
+int bfadcan_release_io(struct candevice_t *candev)
 {
-	release_region(io_addr,IO_RANGE);
+	can_release_io_region(candev->io_addr,IO_RANGE);
 
 	return 0;
 }
@@ -119,11 +113,11 @@ int bfadcan_release_io(unsigned long io_addr)
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/bfadcan.c
  */
-int bfadcan_reset(int card)
+int bfadcan_reset(struct candevice_t *candev)
 {
 
 	int i;
-	struct chip_t *chip=candevices_p[card]->chip[0];
+	struct chip_t *chip=candev->chip[0];
 	unsigned cdr;
 	
 	bfadcan_write_register(MOD_RM, chip->chip_base_addr+SJAMOD);
@@ -168,12 +162,13 @@ int bfadcan_reset(int card)
  * Return Value: The function always returns zero
  * File: src/bfadcan.c
  */
-int bfadcan_init_hw_data(int card) 
+int bfadcan_init_hw_data(struct candevice_t *candev) 
 {
-	candevices_p[card]->res_addr=RESET_ADDR;
-	candevices_p[card]->nr_82527_chips=NR_82527;
-	candevices_p[card]->nr_sja1000_chips=NR_SJA1000;
-	candevices_p[card]->flags |= 0 /* PROGRAMMABLE_IRQ */ ;
+	candev->res_addr=RESET_ADDR;
+	candev->nr_82527_chips=NR_82527;
+	candev->nr_sja1000_chips=NR_SJA1000;
+	candev->nr_all_chips=NR_82527+NR_SJA1000;
+	candev->flags |= 0 /* PROGRAMMABLE_IRQ */ ;
 
 	return 0;
 }
@@ -211,24 +206,24 @@ int bfadcan_init_hw_data(int card)
  * Return Value: The function always returns zero
  * File: src/bfadcan.c
  */
-int bfadcan_init_chip_data(int card, int chipnr)
+int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	unsigned int id1, id2;
-	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 = clock_freq;
-	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 = CDR_CBP | CDR_CLK_OFF;
-	candevices_p[card]->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL |
+	candev->chip[chipnr]->chip_type=CHIP_TYPE;
+	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
+	candev->chip[chipnr]->clock = clock_freq;
+	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 = CDR_CBP | CDR_CLK_OFF;
+	candev->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL |
 								OCR_TX0_LH;
 	id1 = inb(0xe284);
 	id2 = inb(0xe285);
 
 
-	CANMSG("can driver ver 0.7.1-tm5, at %04lx, CPLD v%d.%d.%d.%d\n",
-			                candevices_p[card]->chip[chipnr]->chip_base_addr,
+	CANMSG("can driver ver lincan-0.2, at %04lx, CPLD v%d.%d.%d.%d\n",
+			                candev->chip[chipnr]->chip_base_addr,
 					                id1>>4, id1&0x0f, id2>>4, id2&0x0f);
 
 
@@ -252,10 +247,10 @@ int bfadcan_init_chip_data(int card, int chipnr)
  * Return Value: The function always returns zero
  * File: src/bfadcan.c
  */
-int bfadcan_init_obj_data(int chipnr, int objnr)
+int bfadcan_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;
 }
@@ -272,7 +267,7 @@ int bfadcan_init_obj_data(int chipnr, int objnr)
  * Return value: The function returns zero on success or %-ENODEV on failure
  * File: src/bfadcan.c
  */
-int bfadcan_program_irq(int card)
+int bfadcan_program_irq(struct candevice_t *candev)
 {
 	return 0;
 }