CAN driver infrastructure redesign to LinCAN-0.2 version

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

diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c
index d679b526aa5a9076d2030613a484e9a1846fa4cf..da8afc087a34e8447ce765fb30249de05e119c20 100644 (file)
--- a/lincan/src/aim104.c
+++ b/lincan/src/aim104.c
@@ -1,18 +1,13 @@
 /* aim104.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>
@@ -44,15 +39,13 @@
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/template.c
  */
-int aim104_request_io(unsigned long io_addr)
+int aim104_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;
 }
@@ -69,9 +62,9 @@ int aim104_request_io(unsigned long io_addr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int aim104_release_io(unsigned long io_addr)
+int aim104_release_io(struct candevice_t *candev)
 {
-       release_region(io_addr,IO_RANGE);
+       can_release_io_region(candev->io_addr,IO_RANGE);
 
        return 0;
 }
@@ -86,17 +79,17 @@ int aim104_release_io(unsigned long io_addr)
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/template.c
  */
-int aim104_reset(int card)
+int aim104_reset(struct candevice_t *candev)
 {
        int i=0;
 
        DEBUGMSG("Resetting aim104 hardware ...\n");
 
-       aim104_write_register(0x00, candevices_p[card]->io_addr + SJACR);
+       aim104_write_register(0x00, candev->io_addr + SJACR);
                                                                        
        /* Check hardware reset status chip 0 */
        i=0;
-       while ( (aim104_read_register(candevices_p[card]->io_addr + SJACR) 
+       while ( (aim104_read_register(candev->io_addr + SJACR) 
                                                        & CR_RR) && (i<=15) ) {
                udelay(20000);
                i++;
@@ -130,12 +123,13 @@ int aim104_reset(int card)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int aim104_init_hw_data(int card) 
+int aim104_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;
 }
@@ -170,14 +164,14 @@ int aim104_init_hw_data(int card)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int aim104_init_chip_data(int card, int chipnr)
+int aim104_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 = 0x08;
-       candevices_p[card]->chip[chipnr]->sja_ocr_reg = 0xfa;
+       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 = 0x08;
+       candev->chip[chipnr]->sja_ocr_reg = 0xfa;
 
        return 0;
 }
@@ -199,10 +193,10 @@ int aim104_init_chip_data(int card, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int aim104_init_obj_data(int chipnr, int objnr)
+int aim104_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;
 }
@@ -219,7 +213,7 @@ int aim104_init_obj_data(int chipnr, int objnr)
  * Return value: The function returns zero on success or %-ENODEV on failure
  * File: src/template.c
  */
-int aim104_program_irq(int card)
+int aim104_program_irq(struct candevice_t *candev)
 {
        return 0;
 }