Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6915e00 authored by Sharvil Nanavati's avatar Sharvil Nanavati
Browse files

Logging cleanup: HCI and BTM trace macros. 

Change-Id: Icdea5aede9fde2c11d0cde745a9bedc26d69640c

Conflicts:
	stack/btm/btm_acl.c
	stack/btm/btm_ble.c
	stack/btm/btm_ble_bgconn.c
	stack/btm/btm_ble_gap.c
	stack/btm/btm_inq.c
	stack/btm/btm_pm.c
	stack/btm/btm_sec.c
parent 7614ebcd

system/include/bt_trace.h

+20 −141
Original line number Diff line number Diff line
@@ -621,80 +621,20 @@ EXPORT_API extern void BTTRC_StackTrace6(tBTTRC_LAYER_ID layer_id, 


/* Define tracing for the HCI unit

*/

#define HCI_TRACE_ERROR0(m)                     {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_ERROR, m);}

#define HCI_TRACE_ERROR1(m,p1)                  {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_ERROR, m,p1);}

#define HCI_TRACE_ERROR2(m,p1,p2)               {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_ERROR, m,p1,p2);}

#define HCI_TRACE_ERROR3(m,p1,p2,p3)            {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_ERROR, m,p1,p2,p3);}

#define HCI_TRACE_ERROR4(m,p1,p2,p3,p4)         {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_ERROR, m,p1,p2,p3,p4);}

#define HCI_TRACE_ERROR5(m,p1,p2,p3,p4,p5)      {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5);}

#define HCI_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6)   {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5,p6);}



#define HCI_TRACE_WARNING0(m)                   {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_WARNING, m);}

#define HCI_TRACE_WARNING1(m,p1)                {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_WARNING, m,p1);}

#define HCI_TRACE_WARNING2(m,p1,p2)             {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_WARNING, m,p1,p2);}

#define HCI_TRACE_WARNING3(m,p1,p2,p3)          {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_WARNING, m,p1,p2,p3);}

#define HCI_TRACE_WARNING4(m,p1,p2,p3,p4)       {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_WARNING, m,p1,p2,p3,p4);}

#define HCI_TRACE_WARNING5(m,p1,p2,p3,p4,p5)    {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5);}

#define HCI_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6) {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5,p6);}



#define HCI_TRACE_EVENT0(m)                     {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_EVENT, m);}

#define HCI_TRACE_EVENT1(m,p1)                  {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_EVENT, m, p1);}

#define HCI_TRACE_EVENT2(m,p1,p2)               {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_EVENT, m,p1,p2);}

#define HCI_TRACE_EVENT3(m,p1,p2,p3)            {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_EVENT, m,p1,p2,p3);}

#define HCI_TRACE_EVENT4(m,p1,p2,p3,p4)         {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_EVENT, m,p1,p2,p3,p4);}

#define HCI_TRACE_EVENT5(m,p1,p2,p3,p4,p5)      {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5);}

#define HCI_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6)   {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5,p6);}



#define HCI_TRACE_DEBUG0(m)                     {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_DEBUG, m);}

#define HCI_TRACE_DEBUG1(m,p1)                  {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_DEBUG, m,p1);}

#define HCI_TRACE_DEBUG2(m,p1,p2)               {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_DEBUG, m,p1,p2);}

#define HCI_TRACE_DEBUG3(m,p1,p2,p3)            {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_DEBUG, m,p1,p2,p3);}

#define HCI_TRACE_DEBUG4(m,p1,p2,p3,p4)         {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4);}

#define HCI_TRACE_DEBUG5(m,p1,p2,p3,p4,p5)      {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5);}

#define HCI_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6)   {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5,p6);}



#define HCI_TRACE_ERROR(...)                   {if (btu_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_ERROR, ##__VA_ARGS__);}

#define HCI_TRACE_WARNING(...)                 {if (btu_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_WARNING, ##__VA_ARGS__);}

#define HCI_TRACE_EVENT(...)                   {if (btu_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_EVENT, ##__VA_ARGS__);}

#define HCI_TRACE_DEBUG(...)                   {if (btu_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_HCI, TRACE_TYPE_DEBUG, ##__VA_ARGS__);}





/* Define tracing for BTM

*/

#define BTM_TRACE_ERROR0(m)                     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_ERROR, m);}

#define BTM_TRACE_ERROR1(m,p1)                  {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_ERROR, m,p1);}

#define BTM_TRACE_ERROR2(m,p1,p2)               {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_ERROR, m,p1,p2);}

#define BTM_TRACE_ERROR3(m,p1,p2,p3)            {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_ERROR, m,p1,p2,p3);}

#define BTM_TRACE_ERROR4(m,p1,p2,p3,p4)         {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_ERROR, m,p1,p2,p3,p4);}

#define BTM_TRACE_ERROR5(m,p1,p2,p3,p4,p5)      {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5);}

#define BTM_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6)   {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_ERROR, m,p1,p2,p3,p4,p5,p6);}



#define BTM_TRACE_WARNING0(m)                   {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_WARNING, m);}

#define BTM_TRACE_WARNING1(m,p1)                {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_WARNING, m,p1);}

#define BTM_TRACE_WARNING2(m,p1,p2)             {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_WARNING, m,p1,p2);}

#define BTM_TRACE_WARNING3(m,p1,p2,p3)          {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_WARNING, m,p1,p2,p3);}

#define BTM_TRACE_WARNING4(m,p1,p2,p3,p4)       {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_WARNING, m,p1,p2,p3,p4);}

#define BTM_TRACE_WARNING5(m,p1,p2,p3,p4,p5)    {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5);}

#define BTM_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6) {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_WARNING, m,p1,p2,p3,p4,p5,p6);}



#define BTM_TRACE_API0(m)                       {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_API, m);}

#define BTM_TRACE_API1(m,p1)                    {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_API, m, p1);}

#define BTM_TRACE_API2(m,p1,p2)                 {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_API, m,p1,p2);}

#define BTM_TRACE_API3(m,p1,p2,p3)              {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_API, m,p1,p2,p3);}

#define BTM_TRACE_API4(m,p1,p2,p3,p4)           {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_API, m,p1,p2,p3,p4);}

#define BTM_TRACE_API5(m,p1,p2,p3,p4,p5)        {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_API, m,p1,p2,p3,p4,p5);}

#define BTM_TRACE_API6(m,p1,p2,p3,p4,p5,p6)     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_API, m,p1,p2,p3,p4,p5,p6);}



#define BTM_TRACE_EVENT0(m)                     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_EVENT, m);}

#define BTM_TRACE_EVENT1(m,p1)                  {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_EVENT, m, p1);}

#define BTM_TRACE_EVENT2(m,p1,p2)               {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_EVENT, m,p1,p2);}

#define BTM_TRACE_EVENT3(m,p1,p2,p3)            {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_EVENT, m,p1,p2,p3);}

#define BTM_TRACE_EVENT4(m,p1,p2,p3,p4)         {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_EVENT, m,p1,p2,p3,p4);}

#define BTM_TRACE_EVENT5(m,p1,p2,p3,p4,p5)      {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5);}

#define BTM_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6)   {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_EVENT, m,p1,p2,p3,p4,p5,p6);}



#define BTM_TRACE_DEBUG0(m)                     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_DEBUG, m);}

#define BTM_TRACE_DEBUG1(m,p1)                  {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_DEBUG, m,p1);}

#define BTM_TRACE_DEBUG2(m,p1,p2)               {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_DEBUG, m,p1,p2);}

#define BTM_TRACE_DEBUG3(m,p1,p2,p3)            {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_DEBUG, m,p1,p2,p3);}

#define BTM_TRACE_DEBUG4(m,p1,p2,p3,p4)         {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4);}

#define BTM_TRACE_DEBUG5(m,p1,p2,p3,p4,p5)      {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5);}

#define BTM_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6)   {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_DEBUG, m,p1,p2,p3,p4,p5,p6);}

#define BTM_TRACE_ERROR(...)                     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_ERROR, ##__VA_ARGS__);}

#define BTM_TRACE_WARNING(...)                   {if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_WARNING, ##__VA_ARGS__);}

#define BTM_TRACE_API(...)                       {if (btm_cb.trace_level >= BT_TRACE_LEVEL_API) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_API, ##__VA_ARGS__);}

#define BTM_TRACE_EVENT(...)                     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_EVENT, ##__VA_ARGS__);}

#define BTM_TRACE_DEBUG(...)                     {if (btm_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) BT_TRACE(TRACE_LAYER_BTM, TRACE_TYPE_DEBUG, ##__VA_ARGS__);}





/* Define tracing for the L2CAP unit
@@ -2535,80 +2475,19 @@ EXPORT_API extern void BTTRC_StackTrace6(tBTTRC_LAYER_ID layer_id, 


/* Define tracing for the HCI unit

*/

#define HCI_TRACE_ERROR0(m)

#define HCI_TRACE_ERROR1(m,p1)

#define HCI_TRACE_ERROR2(m,p1,p2)

#define HCI_TRACE_ERROR3(m,p1,p2,p3)

#define HCI_TRACE_ERROR4(m,p1,p2,p3,p4)

#define HCI_TRACE_ERROR5(m,p1,p2,p3,p4,p5)

#define HCI_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6)



#define HCI_TRACE_WARNING0(m)

#define HCI_TRACE_WARNING1(m,p1)

#define HCI_TRACE_WARNING2(m,p1,p2)

#define HCI_TRACE_WARNING3(m,p1,p2,p3)

#define HCI_TRACE_WARNING4(m,p1,p2,p3,p4)

#define HCI_TRACE_WARNING5(m,p1,p2,p3,p4,p5)

#define HCI_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6)



#define HCI_TRACE_EVENT0(m)

#define HCI_TRACE_EVENT1(m,p1)

#define HCI_TRACE_EVENT2(m,p1,p2)

#define HCI_TRACE_EVENT3(m,p1,p2,p3)

#define HCI_TRACE_EVENT4(m,p1,p2,p3,p4)

#define HCI_TRACE_EVENT5(m,p1,p2,p3,p4,p5)

#define HCI_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6)



#define HCI_TRACE_DEBUG0(m)

#define HCI_TRACE_DEBUG1(m,p1)

#define HCI_TRACE_DEBUG2(m,p1,p2)

#define HCI_TRACE_DEBUG3(m,p1,p2,p3)

#define HCI_TRACE_DEBUG4(m,p1,p2,p3,p4)

#define HCI_TRACE_DEBUG5(m,p1,p2,p3,p4,p5)

#define HCI_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6)

#define HCI_TRACE_ERROR(...)

#define HCI_TRACE_WARNING(...)

#define HCI_TRACE_EVENT(...)

#define HCI_TRACE_DEBUG(...)





/* Define tracing for BTM

*/

#define BTM_TRACE_ERROR0(m)

#define BTM_TRACE_ERROR1(m,p1)

#define BTM_TRACE_ERROR2(m,p1,p2)

#define BTM_TRACE_ERROR3(m,p1,p2,p3)

#define BTM_TRACE_ERROR4(m,p1,p2,p3,p4)

#define BTM_TRACE_ERROR5(m,p1,p2,p3,p4,p5)

#define BTM_TRACE_ERROR6(m,p1,p2,p3,p4,p5,p6)



#define BTM_TRACE_WARNING0(m)

#define BTM_TRACE_WARNING1(m,p1)

#define BTM_TRACE_WARNING2(m,p1,p2)

#define BTM_TRACE_WARNING3(m,p1,p2,p3)

#define BTM_TRACE_WARNING4(m,p1,p2,p3,p4)

#define BTM_TRACE_WARNING5(m,p1,p2,p3,p4,p5)

#define BTM_TRACE_WARNING6(m,p1,p2,p3,p4,p5,p6)



#define BTM_TRACE_API0(m)

#define BTM_TRACE_API1(m,p1)

#define BTM_TRACE_API2(m,p1,p2)

#define BTM_TRACE_API3(m,p1,p2,p3)

#define BTM_TRACE_API4(m,p1,p2,p3,p4)

#define BTM_TRACE_API5(m,p1,p2,p3,p4,p5)

#define BTM_TRACE_API6(m,p1,p2,p3,p4,p5,p6)



#define BTM_TRACE_EVENT0(m)

#define BTM_TRACE_EVENT1(m,p1)

#define BTM_TRACE_EVENT2(m,p1,p2)

#define BTM_TRACE_EVENT3(m,p1,p2,p3)

#define BTM_TRACE_EVENT4(m,p1,p2,p3,p4)

#define BTM_TRACE_EVENT5(m,p1,p2,p3,p4,p5)

#define BTM_TRACE_EVENT6(m,p1,p2,p3,p4,p5,p6)



#define BTM_TRACE_DEBUG0(m)

#define BTM_TRACE_DEBUG1(m,p1)

#define BTM_TRACE_DEBUG2(m,p1,p2)

#define BTM_TRACE_DEBUG3(m,p1,p2,p3)

#define BTM_TRACE_DEBUG4(m,p1,p2,p3,p4)

#define BTM_TRACE_DEBUG5(m,p1,p2,p3,p4,p5)

#define BTM_TRACE_DEBUG6(m,p1,p2,p3,p4,p5,p6)

#define BTM_TRACE_ERROR(...)

#define BTM_TRACE_WARNING(...)

#define BTM_TRACE_API(...)

#define BTM_TRACE_EVENT(...)

#define BTM_TRACE_DEBUG(...)





/* Define tracing for the L2CAP unit

system/stack/btm/btm_acl.c

+135 −135

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/btm/btm_ble.c

+141 −141

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/btm/btm_ble_addr.c

+19 −19
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
static void btm_gen_resolve_paddr_cmpl(tSMP_ENC *p)

{

    tBTM_LE_RANDOM_CB *p_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;

    BTM_TRACE_EVENT0 ("btm_gen_resolve_paddr_cmpl");

    BTM_TRACE_EVENT ("btm_gen_resolve_paddr_cmpl");



    if (p)

    {
@@ -77,7 +77,7 @@ static void btm_gen_resolve_paddr_cmpl(tSMP_ENC *p) 
    else

    {

        /* random address set failure */

        BTM_TRACE_DEBUG0("set random address failed");

        BTM_TRACE_DEBUG("set random address failed");

    }

}

/*******************************************************************************
@@ -96,7 +96,7 @@ void btm_gen_resolve_paddr_low(tBTM_RAND_ENC *p) 
    tBTM_LE_RANDOM_CB *p_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;

    tSMP_ENC    output;



    BTM_TRACE_EVENT0 ("btm_gen_resolve_paddr_low");

    BTM_TRACE_EVENT ("btm_gen_resolve_paddr_low");

    if (p)

    {

        p->param_buf[2] &= (~BLE_RESOLVE_ADDR_MASK);
@@ -129,7 +129,7 @@ void btm_gen_resolve_paddr_low(tBTM_RAND_ENC *p) 
*******************************************************************************/

void btm_gen_resolvable_private_addr (void *p_cmd_cplt_cback)

{

    BTM_TRACE_EVENT0 ("btm_gen_resolvable_private_addr");

    BTM_TRACE_EVENT ("btm_gen_resolvable_private_addr");

    /* generate 3B rand as BD LSB, SRK with it, get BD MSB */

    if (!btsnd_hcic_ble_rand((void *)p_cmd_cplt_cback))

        btm_gen_resolve_paddr_cmpl(NULL);
@@ -152,7 +152,7 @@ static void btm_gen_non_resolve_paddr_cmpl(tBTM_RAND_ENC *p) 
    UINT8   *pp;

    BD_ADDR     static_random;



    BTM_TRACE_EVENT0 ("btm_gen_non_resolve_paddr_cmpl");

    BTM_TRACE_EVENT ("btm_gen_non_resolve_paddr_cmpl");



    p_cb->p_generate_cback = NULL;

    if (p)
@@ -169,7 +169,7 @@ static void btm_gen_non_resolve_paddr_cmpl(tBTM_RAND_ENC *p) 
    }

    else

    {

        BTM_TRACE_DEBUG0("btm_gen_non_resolvable_private_addr failed");

        BTM_TRACE_DEBUG("btm_gen_non_resolvable_private_addr failed");

        if (p_cback)

            (* p_cback)(NULL, p_data);

    }
@@ -188,7 +188,7 @@ void btm_gen_non_resolvable_private_addr (tBTM_BLE_ADDR_CBACK *p_cback, void *p) 
{

    tBTM_LE_RANDOM_CB   *p_mgnt_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;



    BTM_TRACE_EVENT0 ("btm_gen_non_resolvable_private_addr");

    BTM_TRACE_EVENT ("btm_gen_non_resolvable_private_addr");



    if (p_mgnt_cb->p_generate_cback != NULL)

        return;
@@ -220,7 +220,7 @@ static void btm_ble_resolve_address_cmpl(void) 
    tBTM_LE_RANDOM_CB   *p_mgnt_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;

    tBTM_SEC_DEV_REC    *p_dev_rec = NULL;



    BTM_TRACE_EVENT1 ("btm_ble_resolve_address_cmpl p_mgnt_cb->index = %d", p_mgnt_cb->index);

    BTM_TRACE_EVENT ("btm_ble_resolve_address_cmpl p_mgnt_cb->index = %d", p_mgnt_cb->index);



    if (p_mgnt_cb->index < BTM_SEC_MAX_DEVICE_RECORDS)

    {
@@ -245,7 +245,7 @@ static BOOLEAN btm_ble_proc_resolve_x(tSMP_ENC *p) 
{

    tBTM_LE_RANDOM_CB   *p_mgnt_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;

    UINT8    comp[3];

    BTM_TRACE_EVENT0 ("btm_ble_proc_resolve_x");

    BTM_TRACE_EVENT ("btm_ble_proc_resolve_x");

    /* compare the hash with 3 LSB of bd address */

    comp[0] = p_mgnt_cb->random_bda[5];

    comp[1] = p_mgnt_cb->random_bda[4];
@@ -256,7 +256,7 @@ static BOOLEAN btm_ble_proc_resolve_x(tSMP_ENC *p) 
        if (!memcmp(p->param_buf, &comp[0], 3))

        {

            /* match is found */

            BTM_TRACE_EVENT0 ("match is found");

            BTM_TRACE_EVENT ("match is found");

            btm_ble_resolve_address_cmpl();

            return TRUE;

        }
@@ -287,13 +287,13 @@ static BOOLEAN btm_ble_match_random_bda(UINT16 rec_index) 
    rand[1] = p_mgnt_cb->random_bda[1];

    rand[2] = p_mgnt_cb->random_bda[0];



    BTM_TRACE_EVENT1("btm_ble_match_random_bda rec_index = %d", rec_index);

    BTM_TRACE_EVENT("btm_ble_match_random_bda rec_index = %d", rec_index);



    if (rec_index < BTM_SEC_MAX_DEVICE_RECORDS)

    {

        p_dev_rec = &btm_cb.sec_dev_rec[rec_index];



        BTM_TRACE_DEBUG2("sec_flags = %02x device_type = %d", p_dev_rec->sec_flags, p_dev_rec->device_type);

        BTM_TRACE_DEBUG("sec_flags = %02x device_type = %d", p_dev_rec->sec_flags, p_dev_rec->device_type);



        if ((p_dev_rec->device_type == BT_DEVICE_TYPE_BLE) &&

            (p_dev_rec->ble.key_type & BTM_LE_KEY_PID))
@@ -331,7 +331,7 @@ void btm_ble_resolve_random_addr(BD_ADDR random_bda, tBTM_BLE_RESOLVE_CBACK * p_ 
{

    tBTM_LE_RANDOM_CB   *p_mgnt_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;



    BTM_TRACE_EVENT0 ("btm_ble_resolve_random_addr");

    BTM_TRACE_EVENT ("btm_ble_resolve_random_addr");

    if ( !p_mgnt_cb->busy)

    {

        p_mgnt_cb->p = p;
@@ -368,7 +368,7 @@ void btm_ble_resolve_random_addr(BD_ADDR random_bda, tBTM_BLE_RESOLVE_CBACK * p_ 
tBLE_ADDR_TYPE btm_ble_map_bda_to_conn_bda(BD_ADDR bd_addr)

{

    tBTM_SEC_DEV_REC    *p_dev_rec = NULL;

    BTM_TRACE_EVENT0 ("btm_ble_map_bda_to_conn_bda");

    BTM_TRACE_EVENT ("btm_ble_map_bda_to_conn_bda");

    if ((p_dev_rec = btm_find_dev (bd_addr)) != NULL &&

        p_dev_rec->device_type == BT_DEVICE_TYPE_BLE)

    {
@@ -424,7 +424,7 @@ BOOLEAN btm_public_addr_to_random_pseudo(BD_ADDR bd_addr, UINT8 *p_addr_type) 
{

    tBTM_SEC_DEV_REC    *p_dev_rec = btm_find_dev_by_public_static_addr(bd_addr);



    BTM_TRACE_EVENT0 ("btm_public_addr_to_random_pseudo");

    BTM_TRACE_EVENT ("btm_public_addr_to_random_pseudo");



    /* evt reported on static address, map static address to random pseudo */

    if (p_dev_rec  != NULL &&
@@ -439,7 +439,7 @@ BOOLEAN btm_public_addr_to_random_pseudo(BD_ADDR bd_addr, UINT8 *p_addr_type) 
        /* always be a resolvable random if a match is found */

        *p_addr_type = BLE_ADDR_RANDOM;



        BTM_TRACE_ERROR0("matched a public/reconnect address and map to random pseudo");

        BTM_TRACE_ERROR("matched a public/reconnect address and map to random pseudo");



        return TRUE;

    }
@@ -465,7 +465,7 @@ BOOLEAN btm_random_pseudo_to_public(BD_ADDR random_pseudo, UINT8 *p_static_addr_ 
            BTM_BLE_IS_RESOLVE_BDA(p_dev_rec->bd_addr) &&

            (p_dev_rec->ble.key_type & BTM_LE_KEY_PID) != 0)

        {

            BTM_TRACE_EVENT0 ("btm_random_pseudo_to_public found the puclic static address!");

            BTM_TRACE_EVENT ("btm_random_pseudo_to_public found the puclic static address!");

            * p_static_addr_type = p_dev_rec->ble.static_addr_type;

            memcpy(random_pseudo, p_dev_rec->ble.static_addr, BD_ADDR_LEN);

            return TRUE;
@@ -490,7 +490,7 @@ void btm_ble_refresh_rra(BD_ADDR static_bda, BD_ADDR rra) 
    UINT8               rra_dummy = FALSE;

    BD_ADDR             dummy_bda = {0};



    BTM_TRACE_ERROR0("btm_ble_refresh_rra");

    BTM_TRACE_ERROR("btm_ble_refresh_rra");



    if (memcmp(dummy_bda, rra, BD_ADDR_LEN) == 0)

        rra_dummy = TRUE;
@@ -518,7 +518,7 @@ void btm_ble_refresh_rra(BD_ADDR static_bda, BD_ADDR rra) 
    }

    else

    {

        BTM_TRACE_ERROR0("No matching known device in record");

        BTM_TRACE_ERROR("No matching known device in record");

    }



}

system/stack/btm/btm_ble_bgconn.c

+17 −17
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static void btm_resume_wl_activity(tBTM_BLE_WL_STATE wl_state); 
void btm_update_scanner_filter_policy(tBTM_BLE_SFP scan_policy)

{

    tBTM_BLE_INQ_CB *p_inq = &btm_cb.ble_ctr_cb.inq_var;

    BTM_TRACE_EVENT0 ("btm_update_scanner_filter_policy");

    BTM_TRACE_EVENT ("btm_update_scanner_filter_policy");



    p_inq->sfp = scan_policy;

    p_inq->scan_type = (p_inq->scan_type == BTM_BLE_SCAN_MODE_NONE) ? BTM_BLE_SCAN_MODE_ACTI: p_inq->scan_type;
@@ -180,7 +180,7 @@ void btm_enq_wl_dev_operation(BOOLEAN to_add, BD_ADDR bd_addr, UINT8 attr) 
    }

    else

    {

        BTM_TRACE_ERROR0("max pending WL operation reached, discard");

        BTM_TRACE_ERROR("max pending WL operation reached, discard");

    }

    return;

}
@@ -200,7 +200,7 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, UINT8 attr 
    if ((to_add && p_cb->num_empty_filter == 0) ||

        (!to_add && p_cb->num_empty_filter == p_cb->max_filter_entries))

    {

        BTM_TRACE_ERROR1("WL full or empty, unable to update to WL. num_entry available: %d",

        BTM_TRACE_ERROR("WL full or empty, unable to update to WL. num_entry available: %d",

                          p_cb->num_empty_filter);

        return started;

    }
@@ -222,7 +222,7 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, UINT8 attr 
*******************************************************************************/

void btm_ble_clear_white_list (void)

{

    BTM_TRACE_EVENT0 ("btm_ble_clear_white_list");

    BTM_TRACE_EVENT ("btm_ble_clear_white_list");

    btsnd_hcic_ble_clear_white_list();

}
@@ -238,7 +238,7 @@ void btm_ble_clear_white_list_complete(UINT8 *p_data, UINT16 evt_len) 
    UINT8       status;

    UNUSED(evt_len);



    BTM_TRACE_EVENT0 ("btm_ble_clear_white_list_complete");

    BTM_TRACE_EVENT ("btm_ble_clear_white_list_complete");

    STREAM_TO_UINT8  (status, p_data);



    if (status == HCI_SUCCESS)
@@ -254,7 +254,7 @@ void btm_ble_clear_white_list_complete(UINT8 *p_data, UINT16 evt_len) 
void btm_ble_add_2_white_list_complete(UINT8 status)

{

    tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb;

    BTM_TRACE_EVENT0 ("btm_ble_add_2_white_list_complete");

    BTM_TRACE_EVENT ("btm_ble_add_2_white_list_complete");



    if (status == HCI_SUCCESS)

    {
@@ -272,7 +272,7 @@ void btm_ble_remove_from_white_list_complete(UINT8 *p, UINT16 evt_len) 
    tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb;

    UNUSED(evt_len);



    BTM_TRACE_EVENT0 ("btm_ble_remove_from_white_list_complete");

    BTM_TRACE_EVENT ("btm_ble_remove_from_white_list_complete");

    if (*p == HCI_SUCCESS)

    {

        p_cb->num_empty_filter ++;
@@ -314,11 +314,11 @@ BOOLEAN btm_update_bg_conn_list(BOOLEAN to_add, BD_ADDR bd_addr, UINT8 *p_attr_t 
    BOOLEAN             ret = FALSE;

    UNUSED(p_attr_tag);



    BTM_TRACE_EVENT0 ("btm_update_bg_conn_list");

    BTM_TRACE_EVENT ("btm_update_bg_conn_list");



    if ((to_add && (p_cb->bg_dev_num == BTM_BLE_MAX_BG_CONN_DEV_NUM || p_cb->num_empty_filter == 0)))

    {

        BTM_TRACE_DEBUG1("num_empty_filter = %d", p_cb->num_empty_filter);

        BTM_TRACE_DEBUG("num_empty_filter = %d", p_cb->num_empty_filter);

        return ret;

    }
@@ -340,7 +340,7 @@ BOOLEAN btm_update_bg_conn_list(BOOLEAN to_add, BD_ADDR bd_addr, UINT8 *p_attr_t 
        }

        else if (!p_bg_dev->in_use && to_add)

        {

            BTM_TRACE_DEBUG0("add new WL entry in bg_dev_list");

            BTM_TRACE_DEBUG("add new WL entry in bg_dev_list");



            memcpy(p_bg_dev->bd_addr, bd_addr, BD_ADDR_LEN);

            p_bg_dev->in_use = TRUE;
@@ -428,7 +428,7 @@ BOOLEAN btm_ble_start_auto_conn(BOOLEAN start) 
        else

        {

#if 0

            BTM_TRACE_ERROR1("conn_st = %d, not in auto conn state, can not stop.", p_cb->conn_state);

            BTM_TRACE_ERROR("conn_st = %d, not in auto conn state, can not stop.", p_cb->conn_state);

            exec = FALSE;

#endif

        }
@@ -454,7 +454,7 @@ BOOLEAN btm_ble_start_select_conn(BOOLEAN start,tBTM_BLE_SEL_CBACK *p_select_c 
    tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb;

    UINT16 scan_int, scan_win;



    BTM_TRACE_EVENT0 ("btm_ble_start_select_conn");

    BTM_TRACE_EVENT ("btm_ble_start_select_conn");



    scan_int = (p_cb->scan_int == BTM_BLE_CONN_PARAM_UNDEF) ? BTM_BLE_SCAN_FAST_INT : p_cb->scan_int;

    scan_win = (p_cb->scan_win == BTM_BLE_CONN_PARAM_UNDEF) ? BTM_BLE_SCAN_FAST_WIN : p_cb->scan_win;
@@ -481,7 +481,7 @@ BOOLEAN btm_ble_start_select_conn(BOOLEAN start,tBTM_BLE_SEL_CBACK *p_select_c 


            if (!btm_ble_topology_check(BTM_BLE_STATE_PASSIVE_SCAN))

            {

                BTM_TRACE_ERROR0("peripheral device cannot initiate passive scan for a selective connection");

                BTM_TRACE_ERROR("peripheral device cannot initiate passive scan for a selective connection");

                return FALSE;

            }

            else if (p_cb->bg_dev_num > 0 && btm_ble_count_unconn_dev_in_whitelist() > 0 )
@@ -496,7 +496,7 @@ BOOLEAN btm_ble_start_select_conn(BOOLEAN start,tBTM_BLE_SEL_CBACK *p_select_c 
        }

        else

        {

            BTM_TRACE_ERROR0("scan active, can not start selective connection procedure");

            BTM_TRACE_ERROR("scan active, can not start selective connection procedure");

            return FALSE;

        }

    }
@@ -533,12 +533,12 @@ BOOLEAN btm_ble_start_select_conn(BOOLEAN start,tBTM_BLE_SEL_CBACK *p_select_c 
*******************************************************************************/

void btm_ble_initiate_select_conn(BD_ADDR bda)

{

    BTM_TRACE_EVENT0 ("btm_ble_initiate_select_conn");

    BTM_TRACE_EVENT ("btm_ble_initiate_select_conn");



    /* use direct connection procedure to initiate connection */

    if (!L2CA_ConnectFixedChnl(L2CAP_ATT_CID, bda))

    {

        BTM_TRACE_ERROR0("btm_ble_initiate_select_conn failed");

        BTM_TRACE_ERROR("btm_ble_initiate_select_conn failed");

    }

}

/*******************************************************************************
@@ -556,7 +556,7 @@ void btm_ble_initiate_select_conn(BD_ADDR bda) 
void btm_ble_suspend_bg_conn(void)

{

    tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb;

    BTM_TRACE_EVENT0 ("btm_ble_suspend_bg_conn");

    BTM_TRACE_EVENT ("btm_ble_suspend_bg_conn");



    if (p_cb->bg_conn_type == BTM_BLE_CONN_AUTO)

    {