X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/3129fcd8094edcb910b708463fdf1a234f11fb55..2827b727d2910a3b48f9de7d67b3a67f59e256c7:/lincan/src/pcm3680.c

diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c
index 22330cb..cfe5856 100644
--- a/lincan/src/pcm3680.c
+++ b/lincan/src/pcm3680.c
@@ -7,13 +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 "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/pcm3680.h"
 #include "../include/i82527.h"
@@ -129,7 +124,7 @@ int pcm3680_reset(struct candevice_t *candev)
  * %RESET_ADDR represents the io-address of the hardware reset register.
  * %NR_82527 represents the number of intel 82527 chips on the board.
  * %NR_SJA1000 represents the number of philips sja1000 chips on the board.
- * The flags entry can currently only be %PROGRAMMABLE_IRQ to indicate that
+ * The flags entry can currently only be %CANDEV_PROGRAMMABLE_IRQ to indicate that
  * the hardware uses programmable interrupts.
  * Return Value: The function always returns zero
  * File: src/template.c
@@ -140,7 +135,7 @@ int pcm3680_init_hw_data(struct candevice_t *candev)
 	candev->nr_82527_chips=NR_82527;
 	candev->nr_sja1000_chips=NR_SJA1000;
 	candev->nr_all_chips=NR_82527+NR_SJA1000;
-	candev->flags &= ~PROGRAMMABLE_IRQ;
+	candev->flags &= ~CANDEV_PROGRAMMABLE_IRQ;
 
 	return 0;
 }
@@ -210,7 +205,6 @@ int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr)
 int pcm3680_init_obj_data(struct chip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
-	chip->msgobj[objnr]->flags=0;
 	
 	return 0;
 }
@@ -221,7 +215,7 @@ int pcm3680_init_obj_data(struct chip_t *chip, int objnr)
  *
  * The function template_program_irq() is used for hardware that uses 
  * programmable interrupts. If your hardware doesn't use programmable interrupts
- * you should not set the @candevices_t->flags entry to %PROGRAMMABLE_IRQ and 
+ * you should not set the @candevices_t->flags entry to %CANDEV_PROGRAMMABLE_IRQ and 
  * leave this function unedited. Again this function is hardware specific so 
  * there's no example code.
  * Return value: The function returns zero on success or %-ENODEV on failure