OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace BT_HDR => BT_HDR_RIGID
[android-x86/system-bt.git]
/
bta
/
hf_client
/
bta_hf_client_sco.cc
diff --git
a/bta/hf_client/bta_hf_client_sco.cc
b/bta/hf_client/bta_hf_client_sco.cc
index
d1db614
..
ee906ec
100644
(file)
--- a/
bta/hf_client/bta_hf_client_sco.cc
+++ b/
bta/hf_client/bta_hf_client_sco.cc
@@
-16,15
+16,13
@@
* limitations under the License.
*
******************************************************************************/
* limitations under the License.
*
******************************************************************************/
-#include <string.h>
-#include "bt_trace.h"
-#include "bt_utils.h"
-#include "bta_ag_api.h"
-#include "bta_hf_client_api.h"
-#include "bta_hf_client_int.h"
+#include <cstdint>
+
+#include "bta/hf_client/bta_hf_client_int.h"
+#include "bta/include/bta_ag_api.h"
#include "device/include/esco_parameters.h"
#include "device/include/esco_parameters.h"
-#include "osi/include/
osi
.h"
+#include "osi/include/
allocator
.h"
#include "stack/include/btm_api.h"
#define BTA_HF_CLIENT_NO_EDR_ESCO \
#include "stack/include/btm_api.h"
#define BTA_HF_CLIENT_NO_EDR_ESCO \
@@
-184,7
+182,7
@@
static void bta_hf_client_sco_conn_cback(uint16_t sco_idx) {
return;
}
return;
}
- BT_HDR
* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR
));
+ BT_HDR
_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID
));
p_buf->event = BTA_HF_CLIENT_SCO_OPEN_EVT;
p_buf->layer_specific = client_cb->handle;
bta_sys_sendmsg(p_buf);
p_buf->event = BTA_HF_CLIENT_SCO_OPEN_EVT;
p_buf->layer_specific = client_cb->handle;
bta_sys_sendmsg(p_buf);
@@
-209,7
+207,7
@@
static void bta_hf_client_sco_disc_cback(uint16_t sco_idx) {
return;
}
return;
}
- BT_HDR
* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR
));
+ BT_HDR
_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID
));
p_buf->event = BTA_HF_CLIENT_SCO_CLOSE_EVT;
p_buf->layer_specific = client_cb->handle;
bta_sys_sendmsg(p_buf);
p_buf->event = BTA_HF_CLIENT_SCO_CLOSE_EVT;
p_buf->layer_specific = client_cb->handle;
bta_sys_sendmsg(p_buf);