Structured comments updated.

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

diff --git a/lincan/src/pccan.c b/lincan/src/pccan.c
index 06e9e05971b751712ec371430860c0d867744d73..6e32610f2eea474b1ca1bb284a97ffdb13df3823 100644 (file)
--- a/lincan/src/pccan.c
+++ b/lincan/src/pccan.c
@@ -7,14 +7,8 @@
  * Version lincan-0.2  9 Jul 2003
  */ 
 
-#include <linux/autoconf.h>
-
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
+#include "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/pccan.h"
 #include "../include/i82527.h"
@@ -175,7 +169,7 @@ int pccanq_reset(struct candevice_t *candev)
        int i=0,chip_nr=0;
 
        for (i=0; i<4; i++)
-               disable_irq(candev->chip[i]->chip_irq);
+               can_disable_irq(candev->chip[i]->chip_irq);
 
        DEBUGMSG("Resetting pccan-q hardware ...\n");
        while (i < 100000) {
@@ -220,7 +214,7 @@ int pccanq_reset(struct candevice_t *candev)
        }
 
        for (i=0; i<4; i++)
-               enable_irq(candev->chip[i]->chip_irq);
+               can_enable_irq(candev->chip[i]->chip_irq);
 
        return 0;
 }      
@@ -228,7 +222,7 @@ int pccanq_reset(struct candevice_t *candev)
 int pccan_init_hw_data(struct candevice_t *candev)
 {
        candev->res_addr=candev->io_addr+0x6001;
-       candev->flags |= PROGRAMMABLE_IRQ;
+       candev->flags |= CANDEV_PROGRAMMABLE_IRQ;
 
        if (!strcmp(candev->hwname,"pccan-q")) {
                candev->nr_82527_chips=2;
@@ -296,12 +290,10 @@ int pccan_init_obj_data(struct chip_t *chip, int objnr)
 {
        if (!strcmp(chip->chip_type,"sja1000")) {
                chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
-               chip->msgobj[objnr]->flags=0;
-       }
+               }
        else {  /* The spacing for this card is 0x3c0 */
                chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10+(int)((objnr+1)/4)*0x3c0;
-               chip->msgobj[objnr]->flags=0;
-       }
+               }
 
        return 0;
 }