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

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

diff --git a/lincan/src/devcommon.c b/lincan/src/devcommon.c
index bf6585a42adf4d6e511224474f698b5e05511bbd..2af0f86e98eecc2e7148b2af9226c40b38b80fdc 100644 (file)
--- a/lincan/src/devcommon.c
+++ b/lincan/src/devcommon.c
@@ -3,7 +3,7 @@
  * 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 "../include/can.h"
@@ -14,7 +14,7 @@
 
 #ifdef CAN_WITH_RTL
 static inline
-void canqueue_wake_chip_worker(struct canque_ends_t *qends, struct chip_t *chip, struct msgobj_t *obj)
+void canqueue_wake_chip_worker(struct canque_ends_t *qends, struct canchip_t *chip, struct msgobj_t *obj)
 {
        if(qends->endinfo.chipinfo.worker_thread){
                can_msgobj_set_fl(obj,WORKER_WAKE);
@@ -46,7 +46,7 @@ void canqueue_wake_chip_worker(struct canque_ends_t *qends, struct chip_t *chip,
  */
 void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qedge, int what)
 {
-       struct chip_t *chip=qends->endinfo.chipinfo.chip;
+       struct canchip_t *chip=qends->endinfo.chipinfo.chip;
        struct msgobj_t *obj=qends->endinfo.chipinfo.msgobj;
 
        DEBUGMSG("canqueue_notify_chip for edge %d and event %d\n",qedge->edge_num,what);
@@ -93,7 +93,7 @@ void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qed
  * @chip: pointer to the corresponding CAN chip structure
  * @obj: pointer to the corresponding message object structure
  */
-int canqueue_ends_init_chip(struct canque_ends_t *qends, struct chip_t *chip, struct msgobj_t *obj)
+int canqueue_ends_init_chip(struct canque_ends_t *qends, struct canchip_t *chip, struct msgobj_t *obj)
 {
        int ret;
        ret=canqueue_ends_init_gen(qends);