CAN driver infrastructure redesign to LinCAN-0.2 version

[lincan.git] / lincan / src / cc_can104.c

diff --git a/lincan/src/cc_can104.c b/lincan/src/cc_can104.c
index 8530a76feca5d3b7322e635493a3129bba0bfb59..521bec762d0829aae496818cd1cfe58db6f81390 100644 (file)
--- a/lincan/src/cc_can104.c
+++ b/lincan/src/cc_can104.c
@@ -1,18 +1,13 @@
 /* cc_can104.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>
@@ -45,15 +40,13 @@
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/template.c
  */
-int cc104_request_io(unsigned long io_addr)
+int cc104_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;
 }
@@ -70,9 +63,9 @@ int cc104_request_io(unsigned long io_addr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int cc104_release_io(unsigned long io_addr)
+int cc104_release_io(struct candevice_t *candev)
 {
-       release_region(io_addr,IO_RANGE);
+       can_release_io_region(candev->io_addr,IO_RANGE);
 
        return 0;
 }
@@ -87,7 +80,7 @@ int cc104_release_io(unsigned long io_addr)
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/template.c
  */
-int cc104_reset(int card)
+int cc104_reset(struct candevice_t *candev)
 {
        return 0;
 }
@@ -110,12 +103,13 @@ int cc104_reset(int card)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int cc104_init_hw_data(int card) 
+int cc104_init_hw_data(struct candevice_t *candev) 
 {
-       candevices_p[card]->res_addr=RESET_ADDR;
-       candevices_p[card]->nr_82527_chips=0;
-       candevices_p[card]->nr_sja1000_chips=1;
-       candevices_p[card]->flags |= ~PROGRAMMABLE_IRQ;
+       candev->res_addr=RESET_ADDR;
+       candev->nr_82527_chips=0;
+       candev->nr_sja1000_chips=1;
+        candev->nr_all_chips=1;
+       candev->flags &= ~PROGRAMMABLE_IRQ;
 
        return 0;
 }
@@ -150,14 +144,14 @@ int cc104_init_hw_data(int card)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int cc104_init_chip_data(int card, int chipnr)
+int cc104_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]->flags = 0;
-       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 = 16000000;
+       candev->chip[chipnr]->flags = 0;
+       candev->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF;
+       candev->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL |
                                                                OCR_TX0_LH;
 
        return 0;
@@ -180,10 +174,10 @@ int cc104_init_chip_data(int card, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int cc104_init_obj_data(int chipnr, int objnr)
+int cc104_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;
 }
@@ -200,7 +194,7 @@ int cc104_init_obj_data(int chipnr, int objnr)
  * Return value: The function returns zero on success or %-ENODEV on failure
  * File: src/template.c
  */
-int cc104_program_irq(int card)
+int cc104_program_irq(struct candevice_t *candev)
 {
        return 0;
 }