Merge branch 'master' into can-usb1

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

diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h
index 3be84691cce7d0647c78051cbfc7bedd0911c002..42eeef4bae5c7f5d7862fed3d938a6d17caefaa4 100644 (file)
--- a/lincan/include/can_queue.h
+++ b/lincan/include/can_queue.h
@@ -273,7 +273,7 @@ int canque_fifo_init_slots(struct canque_fifo_t *fifo);
 
 /* Forward declarations for external types */
 struct msgobj_t;
-struct chip_t;
+struct canchip_t;
 
 /**
  * struct canque_edge_t - CAN message delivery subsystem graph edge
@@ -382,7 +382,7 @@ struct canque_ends_t {
            #endif /*CAN_WITH_RTL*/
                struct {
                        struct msgobj_t *msgobj;
-                       struct chip_t *chip;
+                       struct canchip_t *chip;
                    #ifndef CAN_WITH_RTL
                        wait_queue_head_t daemonq;
                    #else /*CAN_WITH_RTL*/
@@ -545,7 +545,7 @@ void canque_edge_do_dead(struct canque_edge_t *edge);
 
 /**
  * canque_edge_incref - increments edge reference count
- * @qedg: pointer to the edge structure
+ * @edge: pointer to the edge structure
  */
 static inline
 void canque_edge_incref(struct canque_edge_t *edge)
@@ -554,24 +554,24 @@ void canque_edge_incref(struct canque_edge_t *edge)
 }
 
 static inline
-can_spin_irqflags_t canque_edge_lock_both_ends(struct canque_edge_t *edge)
+can_spin_irqflags_t canque_edge_lock_both_ends(struct canque_ends_t *inends, struct canque_ends_t *outends)
 {
        can_spin_irqflags_t  flags;
-       if(edge->inends<edge->outends) {
-               can_spin_lock_irqsave(&edge->inends->ends_lock, flags);
-               can_spin_lock(&edge->outends->ends_lock);
+       if(inends<outends) {
+               can_spin_lock_irqsave(&inends->ends_lock, flags);
+               can_spin_lock(&outends->ends_lock);
        }else{
-               can_spin_lock_irqsave(&edge->outends->ends_lock, flags);
-               if(edge->outends!=edge->inends) can_spin_lock(&edge->inends->ends_lock);
+               can_spin_lock_irqsave(&outends->ends_lock, flags);
+               if(outends!=inends) can_spin_lock(&inends->ends_lock);
        }
        return flags;   
 }
 
 static inline
-void canque_edge_unlock_both_ends(struct canque_edge_t *edge, can_spin_irqflags_t flags)
+void canque_edge_unlock_both_ends(struct canque_ends_t *inends, struct canque_ends_t *outends, can_spin_irqflags_t flags)
 {
-       if(edge->outends!=edge->inends) can_spin_unlock(&edge->outends->ends_lock);
-       can_spin_unlock_irqrestore(&edge->inends->ends_lock, flags);
+       if(outends!=inends) can_spin_unlock(&outends->ends_lock);
+       can_spin_unlock_irqrestore(&inends->ends_lock, flags);
 }
 
 /* Non-inlined version of edge reference decrement */
@@ -582,22 +582,24 @@ void __canque_edge_decref_body(struct canque_edge_t *edge)
 {
        can_spin_irqflags_t flags;
        int dead_fl=0;
+       struct canque_ends_t *inends=edge->inends;
+       struct canque_ends_t *outends=edge->outends;
        
-       flags=canque_edge_lock_both_ends(edge);
+       flags=canque_edge_lock_both_ends(inends, outends);
        if(atomic_dec_and_test(&edge->edge_used)) {
                dead_fl=!canque_fifo_test_and_set_fl(&edge->fifo,DEAD);
                /* Because of former evolution of edge references 
                   management notify of CANQUEUE_NOTIFY_NOUSR could
                   be moved to canque_edge_do_dead :-) */
        }
-       canque_edge_unlock_both_ends(edge, flags);
+       canque_edge_unlock_both_ends(inends, outends, flags);
        if(dead_fl) canque_edge_do_dead(edge);
 }
 
 #ifndef CAN_HAVE_ARCH_CMPXCHG
 /**
  * canque_edge_decref - decrements edge reference count
- * @qedg: pointer to the edge structure
+ * @edge: pointer to the edge structure
  *
  * This function has to be called without lock held for both ends of edge.
  * If reference count drops to 0, function canque_edge_do_dead()