Replace BUFFER_Q with list_t #2

rcv_hold_q -> rcv_pending_q

diff --git a/stack/btu/btu_init.c b/stack/btu/btu_init.c
index f24899c..7522edf 100644 (file)
--- a/stack/btu/btu_init.c
+++ b/stack/btu/btu_init.c
@@ -124,6 +124,8 @@ void btu_init_core(void)
 void btu_free_core(void)
 {
       /* Free the mandatory core stack components */
+      l2c_free();
+
 #if BLE_INCLUDED == TRUE
       gatt_free();
 #endif

diff --git a/stack/l2cap/l2c_int.h b/stack/l2cap/l2c_int.h
index 010078b..8e35667 100644 (file)
--- a/stack/l2cap/l2c_int.h
+++ b/stack/l2cap/l2c_int.h
@@ -24,10 +24,10 @@
 #ifndef L2C_INT_H
 #define L2C_INT_H
 
+#include "btm_api.h"
+#include "gki.h"
 #include "l2c_api.h"
 #include "l2cdefs.h"
-#include "gki.h"
-#include "btm_api.h"
 #include "list.h"
 
 #define L2CAP_MIN_MTU   48      /* Minimum acceptable MTU is 48 bytes */
@@ -446,7 +446,7 @@ typedef struct
     UINT16          num_lm_acl_bufs;                /* # of ACL buffers on controller   */
     UINT16          idle_timeout;                   /* Idle timeout                     */
 
-    BUFFER_Q        rcv_hold_q;                     /* Recv pending queue               */
+    list_t          *rcv_pending_q;                 /* Recv pending queue               */
     TIMER_LIST_ENT  rcv_hold_tle;                   /* Timer list entry for rcv hold    */
 
     tL2C_LCB        *p_cur_hcit_lcb;                /* Current HCI Transport buffer     */
@@ -537,7 +537,9 @@ extern tL2C_CB *l2c_cb_ptr;
 /* Functions provided by l2c_main.c
 ************************************
 */
-extern void     l2c_init (void);
+void l2c_init(void);
+void l2c_free(void);
+
 extern void     l2c_process_timeout (TIMER_LIST_ENT *p_tle);
 extern UINT8    l2c_data_write (UINT16 cid, BT_HDR *p_data, UINT16 flag);
 extern void     l2c_rcv_acl_data (BT_HDR *p_msg);

diff --git a/stack/l2cap/l2c_main.c b/stack/l2cap/l2c_main.c
index f0de9bb..e866928 100755 (executable)
--- a/stack/l2cap/l2c_main.c
+++ b/stack/l2cap/l2c_main.c
@@ -22,20 +22,21 @@
  *
  ******************************************************************************/
 
-#include "bt_target.h"
+#include <cutils/log.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "device/include/controller.h"
 #include "counter.h"
+#include "bt_target.h"
+#include "btm_int.h"
+#include "btu.h"
 #include "gki.h"
 #include "hcimsgs.h"
-#include "l2cdefs.h"
-#include "l2c_int.h"
 #include "l2c_api.h"
-#include "btu.h"
-#include "btm_int.h"
+#include "l2c_int.h"
+#include "l2cdefs.h"
 
 /********************************************************************************/
 /*              L O C A L    F U N C T I O N     P R O T O T Y P E S            */
@@ -150,23 +151,21 @@ void l2c_rcv_acl_data (BT_HDR *p_msg)
             STREAM_TO_UINT8  (cmd_code, p);
 
             if ((p_msg->layer_specific == 0) && (rcv_cid == L2CAP_SIGNALLING_CID)
-                && (cmd_code == L2CAP_CMD_INFO_REQ || cmd_code == L2CAP_CMD_CONN_REQ))
-            {
-                L2CAP_TRACE_WARNING ("L2CAP - holding ACL for unknown handle:%d ls:%d cid:%d opcode:%d cur count:%d",
-                                    handle, p_msg->layer_specific, rcv_cid, cmd_code,
-                                    GKI_queue_length(&l2cb.rcv_hold_q));
+                    && (cmd_code == L2CAP_CMD_INFO_REQ || cmd_code == L2CAP_CMD_CONN_REQ)) {
+                L2CAP_TRACE_WARNING ("L2CAP - holding ACL for unknown handle:%d ls:%d"
+                        "  cid:%d opcode:%d cur count:%d", handle, p_msg->layer_specific,
+                        rcv_cid, cmd_code, list_length(l2cb.rcv_pending_q));
                 p_msg->layer_specific = 2;
-                GKI_enqueue (&l2cb.rcv_hold_q, p_msg);
+                list_append(l2cb.rcv_pending_q, p_msg);
 
-                if (GKI_queue_length(&l2cb.rcv_hold_q) == 1)
+                if (list_length(l2cb.rcv_pending_q) == 1)
                     btu_start_timer (&l2cb.rcv_hold_tle, BTU_TTYPE_L2CAP_HOLD, BT_1SEC_TIMEOUT);
 
                 return;
-            }
-            else
-            {
-                L2CAP_TRACE_ERROR ("L2CAP - rcvd ACL for unknown handle:%d ls:%d cid:%d opcode:%d cur count:%d",
-                                    handle, p_msg->layer_specific, rcv_cid, cmd_code, GKI_queue_length(&l2cb.rcv_hold_q));
+            } else {
+                L2CAP_TRACE_ERROR ("L2CAP - rcvd ACL for unknown handle:%d ls:%d cid:%d"
+                        " opcode:%d cur count:%d", handle, p_msg->layer_specific, rcv_cid,
+                        cmd_code, list_length(l2cb.rcv_pending_q));
             }
             GKI_freebuf (p_msg);
             return;
@@ -807,38 +806,30 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, UINT8 *p, UINT16 pkt_len)
 ** Returns          void
 **
 *******************************************************************************/
-void l2c_process_held_packets (BOOLEAN timed_out)
-{
-    BT_HDR      *p_buf, *p_buf1;
-    BUFFER_Q    *p_rcv_hold_q = &l2cb.rcv_hold_q;
-
-    if (GKI_queue_is_empty(p_rcv_hold_q))
+void l2c_process_held_packets(BOOLEAN timed_out) {
+    if (list_is_empty(l2cb.rcv_pending_q))
         return;
 
-    if (!timed_out)
-    {
+    if (!timed_out) {
         btu_stop_timer(&l2cb.rcv_hold_tle);
         L2CAP_TRACE_WARNING("L2CAP HOLD CONTINUE");
-    }
-    else
-    {
+    } else {
         L2CAP_TRACE_WARNING("L2CAP HOLD TIMEOUT");
     }
 
-    /* Update the timeouts in the hold queue */
-    for (p_buf = (BT_HDR *)GKI_getfirst (p_rcv_hold_q); p_buf; p_buf = p_buf1)
-    {
-        p_buf1 = (BT_HDR *)GKI_getnext (p_buf);
-        if (!timed_out || (!p_buf->layer_specific) || (--p_buf->layer_specific == 0))
-        {
-            GKI_remove_from_queue (p_rcv_hold_q, p_buf);
+    for (const list_node_t *node = list_begin(l2cb.rcv_pending_q);
+        node != list_end(l2cb.rcv_pending_q);)  {
+        BT_HDR *p_buf = list_node(node);
+        node = list_next(node);
+        if (!timed_out || (!p_buf->layer_specific) || (--p_buf->layer_specific == 0)) {
+            list_remove(l2cb.rcv_pending_q, p_buf);
             p_buf->layer_specific = 0xFFFF;
-            l2c_rcv_acl_data (p_buf);
+            l2c_rcv_acl_data(p_buf);
         }
     }
 
     /* If anyone still in the queue, restart the timeout */
-    if (!GKI_queue_is_empty(p_rcv_hold_q))
+    if (!list_is_empty(l2cb.rcv_pending_q))
         btu_start_timer (&l2cb.rcv_hold_tle, BTU_TTYPE_L2CAP_HOLD, BT_1SEC_TIMEOUT);
 }
 
@@ -901,6 +892,13 @@ void l2c_init (void)
     l2cb.high_pri_min_xmit_quota = L2CAP_HIGH_PRI_MIN_XMIT_QUOTA;
 #endif
 
+    l2cb.rcv_pending_q = list_new(NULL);
+    if (l2cb.rcv_pending_q == NULL)
+        ALOGE("%s unable to allocate memory for link layer control block", __func__);
+}
+
+void l2c_free(void) {
+    list_free(l2cb.rcv_pending_q);
 }
 
 /*******************************************************************************