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

[lincan.git] / lincan / include / sja1000p.h

diff --git a/lincan/include/sja1000p.h b/lincan/include/sja1000p.h
index cd21c227ea36625abcf489f4af87a510e8e00bff..9ca166b7262feefd3dfcbcf234135be3ebb72dbf 100644 (file)
--- a/lincan/include/sja1000p.h
+++ b/lincan/include/sja1000p.h
@@ -9,17 +9,17 @@
  * Version lincan-0.3  17 Jun 2004
  */
 
-int sja1000p_chip_config(struct chip_t *chip);
-int sja1000p_extended_mask(struct chip_t *chip, unsigned long code, unsigned long mask);
-int sja1000p_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
+int sja1000p_chip_config(struct canchip_t *chip);
+int sja1000p_extended_mask(struct canchip_t *chip, unsigned long code, unsigned long mask);
+int sja1000p_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
                int sampl_pt, int flags);
-int sja1000p_pre_read_config(struct chip_t *chip, struct msgobj_t *obj);
-int sja1000p_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
+int sja1000p_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj);
+int sja1000p_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj,
                struct canmsg_t *msg);
-int sja1000p_send_msg(struct chip_t *chip, struct msgobj_t *obj,
+int sja1000p_send_msg(struct canchip_t *chip, struct msgobj_t *obj,
                struct canmsg_t *msg);
-int sja1000p_fill_chipspecops(struct chip_t *chip);
-int sja1000p_irq_handler(int irq, struct chip_t *chip);
+int sja1000p_fill_chipspecops(struct canchip_t *chip);
+int sja1000p_irq_handler(int irq, struct canchip_t *chip);
 
 
 /* PeliCAN mode */