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

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

diff --git a/lincan/src/c_can_irq.c b/lincan/src/c_can_irq.c
index 71e84fcf18855b8f6286763da722f8b1099302cc..eb03ac8f440f680a0f869bf75a8b7236b6b962fc 100644 (file)
--- a/lincan/src/c_can_irq.c
+++ b/lincan/src/c_can_irq.c
@@ -23,11 +23,11 @@ union c_can_data
 
 
 // prototypes
-inline void c_can_irq_read_handler( struct chip_t *pchip, int idxobj, u32 msgid  );
+inline void c_can_irq_read_handler( struct canchip_t *pchip, int idxobj, u32 msgid  );
 
-inline void c_can_irq_write_handler( struct chip_t *pchip, int idxobj);
+inline void c_can_irq_write_handler( struct canchip_t *pchip, int idxobj);
 
-void c_can_irq_rtr_handler( struct chip_t *pchip, int idxobj, u32 msgid );
+void c_can_irq_rtr_handler( struct canchip_t *pchip, int idxobj, u32 msgid );
 
 u16 readMaskCM = IFXCM_ARB | IFXCM_CNTRL | IFXCM_CLRINTPND
   | IFXCM_TRND | IFXCM_DA | IFXCM_DB;
@@ -41,7 +41,7 @@ u16 msgLstWriteMaskCM =  IFXCM_CNTRL | IFXCM_WRRD;
 // Send a message from the output fifo ( if any ).
 //
 
-inline void c_can_irq_write_handler( struct chip_t *pchip, int idxobj)
+inline void c_can_irq_write_handler( struct canchip_t *pchip, int idxobj)
 {
        int cmd;
        struct msgobj_t *pmsgobj = pchip->msgobj[idxobj];
@@ -103,7 +103,7 @@ inline void c_can_irq_write_handler( struct chip_t *pchip, int idxobj)
 // Message received form the line. Write it in the input fifo->
 //
 
-inline void c_can_irq_read_handler( struct chip_t *pchip,
+inline void c_can_irq_read_handler( struct canchip_t *pchip,
                                    int idxobj, u32 msgid  )
 {
        int i=0;
@@ -184,7 +184,7 @@ inline void c_can_irq_read_handler( struct chip_t *pchip,
        // while
 }
 
-void c_can_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
+void c_can_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
 {
        while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)) {
 
@@ -214,7 +214,7 @@ void c_can_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
 // c_can_irq_handler
 //
 
-int c_can_irq_handler(int irq, struct chip_t *chip)
+int c_can_irq_handler(int irq, struct canchip_t *chip)
 {
        struct rtr_id *rtr_search = hardware_p->rtr_queue;
        u16 chip_status;
@@ -482,7 +482,7 @@ int c_can_irq_handler(int irq, struct chip_t *chip)
 // c_can_irq_rtr_handler
 //
 
-void c_can_irq_rtr_handler( struct chip_t *pchip, int idxobj, u32 msgid   )
+void c_can_irq_rtr_handler( struct canchip_t *pchip, int idxobj, u32 msgid   )
 {
        short int i=0;
        struct rtr_id *prtr_search = hardware_p->rtr_queue;