Header-files cleanup and CAN queue edges and ends locking reimplemented.

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

diff --git a/lincan/src/template.c b/lincan/src/template.c
index 6a8275708a0334f2892fee8cf61cc841b3d58088..9b72902614bc18857fe8eb330dcddbc67566fb42 100644 (file)
--- a/lincan/src/template.c
+++ b/lincan/src/template.c
@@ -12,13 +12,8 @@
  * possible to load the driver with the hardware option hw=template.
  */
 
-#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/template.h"
 #include "../include/i82527.h"
@@ -103,7 +98,7 @@ int template_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
@@ -114,7 +109,7 @@ int template_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;
 }
@@ -198,7 +193,7 @@ int template_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