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

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

Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE 



Change-Id: I14acefd66291adc2119daf97bd364b2eecf18d51
Signed-off-by: default avatarMike J. Chen <mjchen@google.com>
parent 25cb90a7

system/bta/pan/bta_pan_api.c

+35 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


#include "bt_target.h"



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



#include "bta_api.h"

#include "bta_sys.h"

#include "pan_api.h"
@@ -35,6 +33,9 @@ 
#include "bta_pan_int.h"

#include "bd.h"

#include <string.h>

#include "bt_utils.h"



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



static const tBTA_SYS_REG bta_pan_reg =

{
@@ -211,4 +212,36 @@ BTA_API void BTA_PanClose(UINT16 handle) 
        bta_sys_sendmsg(p_buf);

    }

}

#else



void BTA_PanEnable(tBTA_PAN_CBACK p_cback)

{

    UNUSED(p_cback);

}



void BTA_PanDisable(void)

{

}



void BTA_PanSetRole(tBTA_PAN_ROLE role, tBTA_PAN_ROLE_INFO *p_user_info, tBTA_PAN_ROLE_INFO *p_gn_info,

                    tBTA_PAN_ROLE_INFO *p_nap_info)

{

    UNUSED(role);

    UNUSED(p_user_info);

    UNUSED(p_gn_info);

    UNUSED(p_nap_info);

}



void BTA_PanOpen(BD_ADDR bd_addr, tBTA_PAN_ROLE local_role, tBTA_PAN_ROLE peer_role)

{

    UNUSED(bd_addr);

    UNUSED(local_role);

    UNUSED(peer_role);

}



void BTA_PanClose(UINT16 handle)

{

    UNUSED(handle);

}



#endif /* BTA_PAN_INCLUDED */

system/bta/pan/bta_pan_ci.c

+58 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


#include "bt_target.h"



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



#include <string.h>



#include "gki.h"
@@ -35,7 +33,9 @@ 
#include "bta_pan_api.h"

#include "bta_pan_ci.h"

#include "bta_pan_int.h"

#include "bt_utils.h"



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



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

**
@@ -256,5 +256,61 @@ void bta_pan_ci_set_pfilters(UINT16 handle, UINT16 num_filters, UINT16 *p_start_ 
    PAN_SetProtocolFilters(handle, num_filters, p_start_array, p_end_array );



}

#else



void bta_pan_ci_tx_ready(UINT16 handle)

{

    UNUSED(handle);

}



void bta_pan_ci_rx_ready(UINT16 handle)

{

    UNUSED(handle);

}



void bta_pan_ci_tx_flow(UINT16 handle, BOOLEAN enable)

{

    UNUSED(handle);

    UNUSED(enable);

}



void bta_pan_ci_rx_writebuf(UINT16 handle, BD_ADDR src, BD_ADDR dst, UINT16 protocol, BT_HDR *p_buf, BOOLEAN ext)

{

    UNUSED(handle);

    UNUSED(src);

    UNUSED(dst);

    UNUSED(protocol);

    UNUSED(p_buf);

    UNUSED(ext);

}



BT_HDR * bta_pan_ci_readbuf(UINT16 handle, BD_ADDR src, BD_ADDR dst, UINT16 *p_protocol,

                            BOOLEAN* p_ext, BOOLEAN* p_forward)

{

    UNUSED(handle);

    UNUSED(src);

    UNUSED(dst);

    UNUSED(p_protocol);

    UNUSED(p_ext);

    UNUSED(p_forward);

    return NULL;

}



void bta_pan_ci_set_pfilters(UINT16 handle, UINT16 num_filters, UINT16 *p_start_array, UINT16 *p_end_array)

{

    UNUSED(handle);

    UNUSED(num_filters);

    UNUSED(p_start_array);

    UNUSED(p_end_array);

}



void bta_pan_ci_set_mfilters(UINT16 handle, UINT16 num_mcast_filters, UINT8 *p_start_array,

                             UINT8 *p_end_array)

{

    UNUSED(handle);

    UNUSED(num_mcast_filters);

    UNUSED(p_start_array);

    UNUSED(p_end_array);

}



#endif /* BTA_PAN_API */

system/btif/src/btif_pan.c

+18 −1
Original line number Diff line number Diff line
@@ -204,9 +204,13 @@ static bt_status_t btpan_enable(int local_role) 
    int bta_pan_role;

    BTIF_TRACE_DEBUG1("local_role:%d", local_role);

    bta_pan_role = btpan_role_to_bta(local_role);

#if BTA_PAN_INCLUDED == TRUE

    BTA_PanSetRole(bta_pan_role, &bta_panu_info, NULL, &bta_pan_nap_info);

    btpan_dev_local_role = local_role;

    return BT_STATUS_SUCCESS;

#else

    return BT_STATUS_FAIL;

#endif

}

static int btpan_get_local_role()

{
@@ -488,8 +492,22 @@ static inline int should_forward(tETH_HDR* hdr) 
    BTIF_TRACE_DEBUG1("unknown proto:%x", ntohs(hdr->h_proto));

    return FALSE;

}

#if BTA_PAN_INCLUDED == TRUE

extern void bta_pan_ci_rx_write(UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protocol,

        UINT8 *p_data, UINT16 len, BOOLEAN ext);

#else

static void bta_pan_ci_rx_write(UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protocol,

        UINT8 *p_data, UINT16 len, BOOLEAN ext)

{

    UNUSED(handle);

    UNUSED(dst);

    UNUSED(src);

    UNUSED(protocol);

    UNUSED(p_data);

    UNUSED(len);

    UNUSED(ext);

}

#endif

static void forward_bnep(tETH_HDR* eth_hdr, char * packet, int size)

{

    int broadcast = eth_hdr->h_dest[0] & 1;
@@ -636,4 +654,3 @@ static void btpan_tap_fd_signaled(int fd, int type, int flags, uint32_t user_id) 
    }

}