commit 30e58068c1adaac7c5ccb3aa9cfb045d41d2a10e
author Zach Johnson <zachoverflow@google.com> Fri Sep 26 21:14:34 2014 -0700
committer Andre Eisenbach <eisenbach@google.com> Mon Mar 16 16:51:35 2015 -0700
tree 7b92b8cc37422eb2bc82f41e1f3e19791a42ea4c
parent cc0ca141ad1e81826b71c0bacdb2e8ab186f9155

Refactor btm_devctl reset sequence

* Controller bring up on blockable thread now
* Removed some duplicate and commands during controller bring up
* The code to make commands for controller bring up is smaller and better

stack/l2cap/l2c_main.c

diff --git a/stack/l2cap/l2c_main.c b/stack/l2cap/l2c_main.c
index 6324c11..4ca28eb 100755
--- a/stack/l2cap/l2c_main.c
+++ b/stack/l2cap/l2c_main.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "controller.h"
 #include "gki.h"
 #include "hcimsgs.h"
 #include "l2cdefs.h"
@@ -82,10 +83,11 @@
     /* First, the HCI transport header */
     UINT16_TO_STREAM (p, 0x0050 | (L2CAP_PKT_START << 12) | (2 << 14));
 
+    uint16_t acl_data_size = controller_get_interface()->get_acl_data_size_classic();
     /* The HCI transport will segment the buffers. */
-    if (p_buf->len > btu_cb.hcit_acl_data_size)
+    if (p_buf->len > acl_data_size)
     {
-        UINT16_TO_STREAM (p, btu_cb.hcit_acl_data_size);
+        UINT16_TO_STREAM (p, acl_data_size);
     }
     else
     {
@@ -99,7 +101,7 @@
 
     p_buf->len += HCI_DATA_PREAMBLE_SIZE;
 
-    if (p_buf->len <= btu_cb.hcit_acl_pkt_size)
+    if (p_buf->len <= controller_get_interface()->get_acl_packet_size_classic())
     {
         bte_main_hci_send(p_buf, BT_EVT_TO_LM_HCI_ACL);
     }