diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2016-10-14 19:34:48 -0700 |
|---|---|---|
| committer | Pavlin Radoslavov <pavlin@google.com> | 2016-10-17 22:46:42 -0700 |
| commit | b2a292b5d8df2f359c38b0787bc01181225a9bc9 (patch) | |
| tree | 8f5f871981f241eb575cf70b758461c18242afda /include | |
| parent | 3c196348ee9922fde76502b107656b07f04b31f3 (diff) | |
| download | android_system_bt-b2a292b5d8df2f359c38b0787bc01181225a9bc9.tar.gz android_system_bt-b2a292b5d8df2f359c38b0787bc01181225a9bc9.tar.bz2 android_system_bt-b2a292b5d8df2f359c38b0787bc01181225a9bc9.zip | |
Renamed most C files to C++: *.c to *.cc
Also:
- Fixed C++ related compilation errors.
- Added missing 'extern "C"' guards in some of the header files.
- Added missing LOCAL_CPP_EXTENSION to Android.mk files.
- Added-back btif/src/btif_mce.cc and bta/mce/bta_mce_* to
btif/Android.mk and bta/Android.mk respectively.
- Fixed the alphabetical ordering of the *.cc files in some
of the Android.mk files.
- Added missing Copyright header to "osi/include/list.h"
- Updated "osi/src/wakelock.cc" to use C++ std::string
instead of dynamic allocation of C-style strings.
Test: code compilation, unit tests, and A2DP streaming
Change-Id: Ia2f7215ed9df32775c701b68fc86b09875b942c7
Diffstat (limited to 'include')
| -rw-r--r-- | include/bt_trace.h | 2 | ||||
| -rw-r--r-- | include/bte.h | 10 | ||||
| -rw-r--r-- | include/bte_appl.h | 8 |
3 files changed, 19 insertions, 1 deletions
diff --git a/include/bt_trace.h b/include/bt_trace.h index 5d142c495..168602bb8 100644 --- a/include/bt_trace.h +++ b/include/bt_trace.h @@ -107,7 +107,7 @@ static const char BTE_LOGMSG_MODULE[] = "bte_logmsg_module"; #define BTTRC_ID_AVDT_SCB 80 /* avdt scb */ #define BTTRC_ID_AVDT_CCB 81 /* avdt ccb */ -/* LayerIDs added for BTL-A. Probably should modify bte_logmsg.c in future. */ +/* LayerIDs added for BTL-A. Probably should modify bte_logmsg.cc in future. */ #define BTTRC_ID_STK_RFCOMM 82 #define BTTRC_ID_STK_RFCOMM_DATA 83 #define BTTRC_ID_STK_OBEX 84 diff --git a/include/bte.h b/include/bte.h index 17ad4e142..2f92528fa 100644 --- a/include/bte.h +++ b/include/bte.h @@ -29,6 +29,10 @@ #include <pthread.h> #include "bt_target.h" +#ifdef __cplusplus +extern "C" { +#endif + /* by default on shutdown, baudrate is reset 115kbits. this should NOT be need for platforms * that kill BTE driver and remove/reset BT chip */ @@ -96,6 +100,8 @@ extern void bte_hcisu_userial_oper( tUSERIAL_MSG_CBACK *p_cback, uint8_t port, u /* Pointer to function for sending HCI commands and data to the HCI tranport */ extern int (*p_bte_hci_send)(uint16_t port, BT_HDR *p_msg); +// Initialize control block memory for each stack component. +extern void BTE_InitStack(void); /* Protocol trace mask */ extern uint32_t bte_proto_trace_mask; @@ -111,4 +117,8 @@ typedef struct tBAUD_REG_tag { extern const tBAUD_REG baud_rate_regs[]; +#ifdef __cplusplus +} +#endif + #endif /* BTE_H */ diff --git a/include/bte_appl.h b/include/bte_appl.h index d3fc34678..8f3ed2db5 100644 --- a/include/bte_appl.h +++ b/include/bte_appl.h @@ -24,6 +24,10 @@ #pragma once +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { #if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE) uint8_t ble_auth_req; @@ -35,3 +39,7 @@ typedef struct { } tBTE_APPL_CFG; extern tBTE_APPL_CFG bte_appl_cfg; + +#ifdef __cplusplus +} +#endif |