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

diff --git a/lincan/src/pc_i03.c b/lincan/src/pc_i03.c
index bf64ff6..0490fe6 100644
--- a/lincan/src/pc_i03.c
+++ b/lincan/src/pc_i03.c
@@ -1,18 +1,13 @@
 /* pc-i03.c
  * Linux CAN-bus device driver.
  * Written by Arnaud Westenberg email:arnaud@wnadoo.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>
@@ -50,15 +45,13 @@ unsigned int pci03_base_addr;
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/pc-i03.c
  */
-int pci03_request_io(unsigned long io_addr)
+int pci03_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;
 }
@@ -75,9 +68,9 @@ int pci03_request_io(unsigned long io_addr)
  * Return Value: The function always returns zero
  * File: src/pc-i03.c
  */
-int pci03_release_io(unsigned long io_addr)
+int pci03_release_io(struct candevice_t *candev)
 {
-	release_region(io_addr,IO_RANGE);
+	can_release_io_region(candev->io_addr,IO_RANGE);
 
 	return 0;
 }
@@ -92,7 +85,7 @@ int pci03_release_io(unsigned long io_addr)
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/pc-i03.c
  */
-int pci03_reset(int card)
+int pci03_reset(struct candevice_t *candev)
 {
 	int i=0;
 
@@ -139,13 +132,12 @@ int pci03_reset(int card)
  * Return Value: The function always returns zero
  * File: src/pc-i03.c
  */
-int pci03_init_hw_data(int card) 
+int pci03_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 |= ~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;
 	return 0;
 }
 
@@ -179,14 +171,14 @@ int pci03_init_hw_data(int card)
  * Return Value: The function always returns zero
  * File: src/pc-i03.c
  */
-int pci03_init_chip_data(int card, int chipnr)
+int pci03_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-	pci03_base_addr = candevices_p[card]->io_addr;
-	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]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF;
-	candevices_p[card]->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | 
+	pci03_base_addr = candev->io_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]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF;
+	candev->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | 
 							OCR_TX0_HL | OCR_TX1_LZ;
 
 	return 0;
@@ -209,10 +201,10 @@ int pci03_init_chip_data(int card, int chipnr)
  * Return Value: The function always returns zero
  * File: src/pc-i03.c
  */
-int pci03_init_obj_data(int chipnr, int objnr)
+int pci03_init_obj_data(struct chip_t *chip, int objnr)
 {
-	chips_p[chipnr]->msgobj[objnr]->obj_base_addr=chips_p[chipnr]->chip_base_addr;
-	chips_p[chipnr]->msgobj[objnr]->flags=0;
+	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
+	chip->msgobj[objnr]->flags=0;
 	
 	return 0;
 }
@@ -229,7 +221,7 @@ int pci03_init_obj_data(int chipnr, int objnr)
  * Return value: The function returns zero on success or %-ENODEV on failure
  * File: src/pc-i03.c
  */
-int pci03_program_irq(int card)
+int pci03_program_irq(struct candevice_t *candev)
 {
 	return 0;
 }