Merge branch 'master' into feature/btdm_avrc

# Conflicts:
#	components/bt/bluedroid/hci/packet_fragmenter.c
#	components/bt/bluedroid/stack/include/gatt_api.h
This commit is contained in:
wangmengyang
2017-01-17 10:36:26 +08:00
395 changed files with 34455 additions and 3574 deletions

View File

@@ -118,6 +118,13 @@ typedef union {
} audio_cfg;
} esp_a2d_cb_param_t;
/**
* @brief A2DP profile callback function, data is ou
* @param event : Event type
* @param param : Point to callback parameter
*/
typedef void (* esp_a2d_cb_t)(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param);
/**
* @brief A2DP profile data callback function, data is ou
*
@@ -140,7 +147,7 @@ typedef void (* esp_a2d_data_cb_t)(const uint8_t *buf, uint32_t len);
* - ESP_OK: success
*
*/
esp_err_t esp_a2d_register_callback(esp_profile_cb_t callback);
esp_err_t esp_a2d_register_callback(esp_a2d_cb_t callback);
/**