alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-05 08:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

component/bt : remove all GKI reference

Browse Source 
1. remove GKI(not use osi_free_and_reset)
2. modify mutex/semaphore to individual directory
3. set osi_malloc as malloc(previously use calloc)
4. change osi allocator debug osi_free
5. fix rebase of remove GKI
This commit is contained in:
Tian Hao
2017-08-17 21:13:45 +08:00
parent fc85cb683d
commit e4f63819a1
179 changed files with 2565 additions and 3599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/bt/bluedroid/stack/sdp/sdp_utils.c
View File

@@ -24,12 +24,11 @@
#include <stdlib.h>
#include <string.h>
//#include <netinet/in.h>
//#include <stdio.h>
#include "allocator.h"
#include "bt_defs.h"
#include "gki.h"
#include "bt_types.h"
#include "l2cdefs.h"
@@ -157,7 +156,7 @@ void sdpu_release_ccb (tCONN_CB *p_ccb)
if (p_ccb->rsp_list) {
SDP_TRACE_DEBUG("releasing SDP rsp_list\n");
GKI_freebuf(p_ccb->rsp_list);
osi_free(p_ccb->rsp_list);
p_ccb->rsp_list = NULL;
}
}
@@ -312,7 +311,7 @@ void sdpu_build_n_send_error (tCONN_CB *p_ccb, UINT16 trans_num, UINT16 error_co
error_code, p_ccb->connection_id);
/* Get a buffer to use to build and send the packet to L2CAP */
if ((p_buf = (BT_HDR *)GKI_getpoolbuf (SDP_POOL_ID)) == NULL) {
if ((p_buf = (BT_HDR *)osi_malloc(SDP_DATA_BUF_SIZE)) == NULL) {
SDP_TRACE_ERROR ("SDP - no buf for err msg\n");
return;
}
@@ -981,7 +980,7 @@ UINT8 *sdpu_build_partial_attrib_entry (UINT8 *p_out, tSDP_ATTRIBUTE *p_attr, UI
size_t len_to_copy;
UINT16 attr_len;
if ((p_attr_buff = (UINT8 *) GKI_getbuf(sizeof(UINT8) * SDP_MAX_ATTR_LEN )) == NULL) {
if ((p_attr_buff = (UINT8 *) osi_malloc(sizeof(UINT8) * SDP_MAX_ATTR_LEN )) == NULL) {
SDP_TRACE_ERROR("sdpu_build_partial_attrib_entry cannot get a buffer!\n");
return NULL;
}
@@ -997,7 +996,7 @@ UINT8 *sdpu_build_partial_attrib_entry (UINT8 *p_out, tSDP_ATTRIBUTE *p_attr, UI
p_out = &p_out[len_to_copy];
*offset += len_to_copy;
GKI_freebuf(p_attr_buff);
osi_free(p_attr_buff);
return p_out;
}
@@ -1024,4 +1023,4 @@ void sdpu_uuid16_to_uuid128(UINT16 uuid16, UINT8 *p_uuid128)
memcpy(p_uuid128 + 2, &uuid16_bo, sizeof(uint16_t));
}
#endif ///SDP_INCLUDED == TRUE
#endif ///SDP_INCLUDED == TRUE