To prevent future name collisions "chip_t" changed to "canchip_t"

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

diff --git a/lincan/src/pip.c b/lincan/src/pip.c
index 72ede897e6318b4995ff387c2fad177233b3ca22..1f3418ebca01bda3e3034226c2111d626dba7e6d 100644 (file)
--- a/lincan/src/pip.c
+++ b/lincan/src/pip.c
@@ -4,17 +4,11 @@
  * 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 lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */ 
 
-#include <linux/autoconf.h>
-
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/string.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-
+#include "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/pip.h"
 #include "../include/i82527.h"
@@ -125,14 +119,14 @@ int pip_init_hw_data(struct candevice_t *candev)
        candev->nr_82527_chips=1;
        candev->nr_sja1000_chips=0;
        candev->nr_all_chips=1;
-       candev->flags |= PROGRAMMABLE_IRQ;
+       candev->flags |= CANDEV_PROGRAMMABLE_IRQ;
 
        return 0;
 }
 
 int pip_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-       candev->chip[chipnr]->chip_type="i82527";
+       i82527_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_base_addr=candev->io_addr;
        candev->chip[chipnr]->clock = 16000000;
        if (!strcmp(candev->hwname,"pip5"))
@@ -147,10 +141,9 @@ int pip_init_chip_data(struct candevice_t *candev, int chipnr)
        return 0;
 }
 
-int pip_init_obj_data(struct chip_t *chip, int objnr)
+int pip_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10;
-       chip->msgobj[objnr]->flags=0;
        
        return 0;
 }
@@ -204,7 +197,7 @@ int pip6_program_irq(struct candevice_t *candev)
        return 0;
 }
 
-void pip_write_register(unsigned char data, unsigned long address)
+void pip_write_register(unsigned data, unsigned long address)
 {
        outb(data,address);
 }