From 7cb55c2c6c12bd9e9f67115ad0f15cff43364053 Mon Sep 17 00:00:00 2001 From: yulong Date: Sun, 16 Oct 2016 23:54:22 -0400 Subject: [PATCH] component bt: added the WX_AIRSYNC_CFG macro to control the wechat profile --- .../bt/bluedroid/profiles/std/include/prf_defs.h | 2 +- .../app_profiles/app_WX_airsync/app_airsync_md5.c | 8 +++++++- .../app_profiles/app_WX_airsync/app_airsync_prf.c | 6 ++++++ .../bluedroid_demos/app_profiles/app_WX_airsync/epb.c | 6 ++++++ .../app_profiles/app_WX_airsync/epb_mmbp.c | 6 ++++++ .../app_profiles/app_WX_airsync/mpbledemo2.c | 7 +++++++ .../app_profiles/app_WX_airsync/wechar_crc.c | 7 +++++++ .../app_profiles/app_WX_airsync/wechat_aes.c | 7 +++++++ .../bluedroid_demos/include/app_airsync_md5.h | 5 +++++ .../bluedroid_demos/include/app_airsync_prf.h | 6 ++++++ .../bluedroid_demos/include/app_wechat_util.h | 4 ++++ .../components/bluedroid_demos/include/epb.h | 9 ++++++++- .../components/bluedroid_demos/include/epb_mmbp.h | 9 ++++++++- .../components/bluedroid_demos/include/mpbledemo2.h | 10 +++++++++- .../components/bluedroid_demos/include/wechar_crc.h | 9 +++++++-- .../components/bluedroid_demos/include/wechat_aes.h | 6 +++++- 16 files changed, 99 insertions(+), 8 deletions(-) diff --git a/components/bt/bluedroid/profiles/std/include/prf_defs.h b/components/bt/bluedroid/profiles/std/include/prf_defs.h index b9c03e3a59..790bfe2c08 100644 --- a/components/bt/bluedroid/profiles/std/include/prf_defs.h +++ b/components/bt/bluedroid/profiles/std/include/prf_defs.h @@ -26,7 +26,7 @@ #define ATT_UUID_128_LEN 0x0010 #define ATT_UUID_32_LEN 0x0004 -#define WX_AIRSYNC_CFG 1 +#define WX_AIRSYNC_CFG 0 #define BUT_PROFILE_CFG 0 #define HIDD_LE_PROFILE_CFG 1 diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/app_airsync_md5.c b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/app_airsync_md5.c index d2bebd9734..7271f6473a 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/app_airsync_md5.c +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/app_airsync_md5.c @@ -11,7 +11,10 @@ **************************************************************************************** */ - +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + + #include #include #include @@ -122,3 +125,6 @@ int32_t wechat_md5 (char *argv, uint8_t *md5_32) } + +#endif ///WX_AIRSYNC_CFG + diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/app_airsync_prf.c b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/app_airsync_prf.c index b22f96e476..60cc8329fc 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/app_airsync_prf.c +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/app_airsync_prf.c @@ -11,6 +11,9 @@ **************************************************************************************** */ +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + #include "app_airsync_prf.h" #include "wx_airsync_prf.h" #include "app_wechat_util.h" @@ -152,3 +155,6 @@ data_handler *app_wechat_datahandler(void) return pDataHandler; } + +#endif ///WX_AIRSYNC_CFG + diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/epb.c b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/epb.c index fb9c6234f7..3a830b064b 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/epb.c +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/epb.c @@ -7,6 +7,10 @@ // Version : 1.0.2 +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + + #include #include "epb.h" @@ -406,3 +410,5 @@ int epb_length_delimited_pack_size(uint16_t tag, int len) return epb_varint32_pack_size(tag, len, false) + len; } + +#endif ///WX_AIRSYNC_CFG \ No newline at end of file diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/epb_mmbp.c b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/epb_mmbp.c index 7b4b7379b2..48f9f7b937 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/epb_mmbp.c +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/epb_mmbp.c @@ -7,6 +7,10 @@ // Version : 1.0.4 +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + + #include #include #include @@ -557,3 +561,5 @@ void epb_unpack_switch_backgroud_push_free(SwitchBackgroudPush *push) GKI_freebuf(push); } +#endif ///WX_AIRSYNC_CFG + diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/mpbledemo2.c b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/mpbledemo2.c index 22f01564b5..68fd24d791 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/mpbledemo2.c +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/mpbledemo2.c @@ -4,6 +4,11 @@ * author by anqiren 2014/12/02 V1.0bat * **/ + +#include "prf_defs.h" + +#if (WX_AIRSYNC_CFG) + #include #include #include @@ -577,3 +582,5 @@ int32_t mpbledemo2_sendData(uint8_t* ptrData, uint32_t lengthInByte) return 0; } +#endif ///WX_AIRSYNC_CFG + diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/wechar_crc.c b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/wechar_crc.c index b0c662720b..2239a75ca4 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/wechar_crc.c +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/wechar_crc.c @@ -5,6 +5,10 @@ // Copyright 2014 Tencent. All rights reserved. // + +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + #include #include "wechar_crc.h" @@ -42,3 +46,6 @@ uint32_t crc32(uint32_t crc, const uint8_t *buf, int len) return crc ^ 0xffffffffL; } + +#endif ///WX_AIRSYNC_CFG + diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/wechat_aes.c b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/wechat_aes.c index 98284a3d74..9841f49117 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/wechat_aes.c +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/app_profiles/app_WX_airsync/wechat_aes.c @@ -4,6 +4,10 @@ // 创 建 人：Liangbofu // 创建日期：2009-07-17 /////////////////////////////////////////////////////////////////////////////// + +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + #include "wechat_aes.h" #include #include @@ -441,3 +445,6 @@ void AES_Decrypt(unsigned char *pPlainText, const unsigned char *pCipherText, } } + +#endif ///WX_AIRSYNC_CFG + diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_airsync_md5.h b/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_airsync_md5.h index 9a8c3a7632..6fe956d615 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_airsync_md5.h +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_airsync_md5.h @@ -14,6 +14,10 @@ #ifndef __APP_AIRSYNC_MD5__ #define __APP_AIRSYNC_MD5__ +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + + #include #include #include @@ -41,6 +45,7 @@ typedef struct int32_t wechat_md5 ( char *argv, uint8_t *md5_32); +#endif ///WX_AIRSYNC_CFG #endif /// __APP_AIRSYNC_MD5__ diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_airsync_prf.h b/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_airsync_prf.h index 3ad9e5da9a..5e5699d56f 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_airsync_prf.h +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_airsync_prf.h @@ -13,6 +13,10 @@ #ifndef _APP_AIRSYNC_PRF_H__ #define _APP_AIRSYNC_PRF_H__ +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + + #include "app_wechat_util.h" #include #include @@ -35,6 +39,8 @@ data_handler* app_wechat_datahandler(void); bool ble_wechat_is_last_data_sent_out(void); +#endif ///WX_AIRSYNC_CFG + #endif ///_APP_AIRSYNC_PRF_H__ diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_wechat_util.h b/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_wechat_util.h index f5ef80d09c..5de417deba 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_wechat_util.h +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/include/app_wechat_util.h @@ -1,6 +1,8 @@ #ifndef __APP_WECHAT_UTIL_H__ #define __APP_WECHAT_UTIL_H__ +#include "prf_defs.h" +if (WX_AIRSYNC_CFG) #include #include @@ -77,5 +79,7 @@ unsigned long t_ntohl(unsigned long n); void wechat_error_chack(data_handler *p_data_handler, int error_code); void data_handler_init(data_handler** p_data_handler, uint8_t product_type); +#endif ///WX_AIRSYNC_CFG + #endif ///__APP_WECHAT_UTIL_H__ diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/include/epb.h b/examples/06_bluedroid_demos/components/bluedroid_demos/include/epb.h index 4d078edf7e..b9d031d39f 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/include/epb.h +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/include/epb.h @@ -10,6 +10,10 @@ #ifndef __EPB_H__ #define __EPB_H__ +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + + #include #include @@ -106,5 +110,8 @@ int epb_varint32_pack_size(uint16_t tag, uint32_t value, bool is_signed); int epb_fixed32_pack_size(uint16_t tag); int epb_length_delimited_pack_size(uint16_t tag, int len); -#endif + +#endif ///WX_AIRSYNC_CFG + +#endif ///__EPB_H__ diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/include/epb_mmbp.h b/examples/06_bluedroid_demos/components/bluedroid_demos/include/epb_mmbp.h index b7574d9797..293b951836 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/include/epb_mmbp.h +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/include/epb_mmbp.h @@ -10,6 +10,10 @@ #ifndef __EPB_MMBP_H__ #define __EPB_MMBP_H__ +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + + #include "epb.h" typedef enum @@ -237,5 +241,8 @@ void epb_unpack_switch_view_push_free(SwitchViewPush *push); SwitchBackgroudPush *epb_unpack_switch_backgroud_push(const uint8_t *buf, int buf_len); void epb_unpack_switch_backgroud_push_free(SwitchBackgroudPush *push); -#endif + +#endif ///WX_AIRSYNC_CFG + +#endif ///__EPB_MMBP_H__ diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/include/mpbledemo2.h b/examples/06_bluedroid_demos/components/bluedroid_demos/include/mpbledemo2.h index 5fe8a44122..0a48058d40 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/include/mpbledemo2.h +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/include/mpbledemo2.h @@ -2,6 +2,11 @@ #ifndef __MPBLEDEMO2_H__ #define __MPBLEDEMO2_H__ +#include "prf_defs.h" + +#if (WX_AIRSYNC_CFG) + + #include #include #include @@ -128,5 +133,8 @@ extern void mpbledemo2_reset(void); extern void mpbledemo2_indication_state(bool isEnable); extern int32_t mpbledemo2_sendData(uint8_t* ptrData, uint32_t lengthInByte); -#endif + +#endif ///WX_AIRSYNC_CFG + +#endif ///__MPBLEDEMO2_H__ diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/include/wechar_crc.h b/examples/06_bluedroid_demos/components/bluedroid_demos/include/wechar_crc.h index d82689b933..9dbe222417 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/include/wechar_crc.h +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/include/wechar_crc.h @@ -8,6 +8,10 @@ #ifndef __CRC32_H__ #define __CRC32_H__ + +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + #include #ifdef __cplusplus @@ -17,8 +21,9 @@ uint32_t crc32(uint32_t crc, const uint8_t *buf, int len); #ifdef __cplusplus } -#endif +#endif ///__cplusplus +#endif ///WX_AIRSYNC_CFG -#endif +#endif ///__CRC32_H__ diff --git a/examples/06_bluedroid_demos/components/bluedroid_demos/include/wechat_aes.h b/examples/06_bluedroid_demos/components/bluedroid_demos/include/wechat_aes.h index 58d5a1f8d9..c663b326c6 100644 --- a/examples/06_bluedroid_demos/components/bluedroid_demos/include/wechat_aes.h +++ b/examples/06_bluedroid_demos/components/bluedroid_demos/include/wechat_aes.h @@ -7,6 +7,9 @@ #ifndef __WECHAT_AES_H #define __WECHAT_AES_H +#include "prf_defs.h" +#if (WX_AIRSYNC_CFG) + #ifdef __cplusplus extern "C" { #endif @@ -62,8 +65,9 @@ unsigned int AES_get_length(unsigned int length); void AES_free(unsigned char* p); #ifdef __cplusplus } -#endif +#endif ///__cplusplus +#endif ///WX_AIRSYNC_CFG #endif // __WECHAT_AES_H