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

Commit d9aa7ee9 authored by Mike J. Chen's avatar Mike J. Chen
Browse files

Fix bug introduced in last change. GATT define was after BLE_INCLUDED define. 



The bug caused GATT_INCLUDED to be FALSE if not already defined.

Looks like the bluedroid codebase really can't support no GATT or SMP
if BLE_INCLUDED is true.  Lots of compiler failures (not just warnings but
real failures) if GATT or SMP are not set to TRUE when BLE_INCLUDED is true.

Not cleaning that up at this time but just fixing basic build breakage.

Change-Id: I561cd4dcb2b39e90158ce74e55dca294f55cb540
Signed-off-by: default avatarMike J. Chen <mjchen@google.com>
parent b01e6033

system/bta/dm/bta_dm_act.c

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 *

 ******************************************************************************/



#include "bt_target.h"

#include "bt_types.h"

#include "gki.h"

#include "bd.h"
@@ -385,7 +386,9 @@ static void bta_dm_sys_hw_cback( tBTA_SYS_HW_EVT status ) 
        {

            BTM_BleLoadLocalKeys(BTA_BLE_LOCAL_KEY_TYPE_ID, (tBTM_BLE_LOCAL_KEYS *)&id_key);

        }

#if ((defined BTA_GATT_INCLUDED) && (BTA_GATT_INCLUDED == TRUE))

        bta_dm_search_cb.conn_id = BTA_GATT_INVALID_CONN_ID;

#endif

#endif



        BTM_SecRegister((tBTM_APPL_INFO*)&bta_security);

system/bta/dm/bta_dm_api.c

+9 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,11 @@ void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services, 


        bta_sys_sendmsg(p_msg);

    }

#else

    UNUSED(bd_addr);

    UNUSED(p_services);

    UNUSED(p_cback);

    UNUSED(sdp_search);

#endif



}
@@ -1701,6 +1706,10 @@ void BTA_DmSearchExt(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK_EXT *p_services, t 


        bta_sys_sendmsg(p_msg);

    }

#else

    UNUSED(p_dm_inq);

    UNUSED(p_services);

    UNUSED(p_cback);

#endif

}

system/bta/include/bta_gatt_api.h

+1 −1
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
#include "gatt_api.h"



#ifndef     BTA_GATT_INCLUDED

#warning BTA_GATT_INCLUDED not defined

#define     BTA_GATT_INCLUDED     FALSE

#endif





#if ((BLE_INCLUDED == FALSE) && (BTA_GATT_INCLUDED == TRUE))

#undef BTA_GATT_INCLUDED

#define BTA_GATT_INCLUDED        FALSE

system/include/bt_target.h

+12 −12
Original line number Diff line number Diff line
@@ -263,18 +263,6 @@ 
#define BTA_JV_INCLUDED FALSE

#endif



#ifndef BTA_GATT_INCLUDED

#if BLE_INCLUDED == TRUE

#define BTA_GATT_INCLUDED TRUE

#else

#define BTA_GATT_INCLUDED FALSE

#endif

#endif



#if BTA_GATT_INCLUDED == TRUE && BLE_INCLUDED == FALSE

#error "can't have GATT without BLE"

#endif



#ifndef BTA_DISABLE_DELAY

#define BTA_DISABLE_DELAY 200 /* in milliseconds */

#endif
@@ -1424,6 +1412,18 @@ and USER_HW_DISABLE_API macros */ 
** ATT/GATT Protocol/Profile Settings

**

******************************************************************************/

#ifndef BTA_GATT_INCLUDED

#if BLE_INCLUDED == TRUE

#define BTA_GATT_INCLUDED TRUE

#else

#define BTA_GATT_INCLUDED FALSE

#endif

#endif



#if BTA_GATT_INCLUDED == TRUE && BLE_INCLUDED == FALSE

#error "can't have GATT without BLE"

#endif



#ifndef ATT_INCLUDED

#define ATT_INCLUDED         TRUE

#endif