Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4170d8e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Allow HID Device to connect to a specific device"

parents 655fb1b9 e99093ba

system/bta/hd/bta_hd_act.cc

+8 −2
Original line number Diff line number Diff line
@@ -256,13 +256,19 @@ void bta_hd_unregister2_act(tBTA_HD_DATA* p_data) { 
 * Returns          void

 *

 ******************************************************************************/

extern void bta_hd_connect_act(UNUSED_ATTR tBTA_HD_DATA* p_data) {

extern void bta_hd_connect_act(tBTA_HD_DATA* p_data) {

  tHID_STATUS ret;

  tBTA_HD_DEVICE_CTRL* p_ctrl = (tBTA_HD_DEVICE_CTRL*)p_data;



  APPL_TRACE_API("%s", __func__);



  ret = HID_DevConnect();

  ret = HID_DevPlugDevice(p_ctrl->addr);

  if (ret != HID_SUCCESS) {

    APPL_TRACE_WARNING("%s: HID_DevPlugDevice returned %d", __func__, ret);

    return;

  }



  ret = HID_DevConnect();

  if (ret != HID_SUCCESS) {

    APPL_TRACE_WARNING("%s: HID_DevConnect returned %d", __func__, ret);

  }

system/bta/hd/bta_hd_api.cc

+7 −4
Original line number Diff line number Diff line
@@ -236,13 +236,16 @@ extern void BTA_HdVirtualCableUnplug(void) { 
 * Returns          void

 *

 ******************************************************************************/

extern void BTA_HdConnect(void) {

  BT_HDR* p_buf;

extern void BTA_HdConnect(BD_ADDR addr) {

  tBTA_HD_DEVICE_CTRL* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR))) != NULL) {

    p_buf->event = BTA_HD_API_CONNECT_EVT;

  if ((p_buf = (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL))) !=

      NULL) {

    p_buf->hdr.event = BTA_HD_API_CONNECT_EVT;



    memcpy(p_buf->addr, addr, sizeof(BD_ADDR));



    bta_sys_sendmsg(p_buf);

  }

system/bta/include/bta_hd_api.h

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ extern void BTA_HdVirtualCableUnplug(void); 
 * Returns          void

 *

 ******************************************************************************/

extern void BTA_HdConnect(void);

extern void BTA_HdConnect(BD_ADDR addr);



/*******************************************************************************

 *

system/btif/src/btif_hd.cc

+2 −2
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static bt_status_t unregister_app(void) { 
 * Returns          bt_status_t

 *

 ******************************************************************************/

static bt_status_t connect(void) {

static bt_status_t connect(bt_bdaddr_t* bd_addr) {

  BTIF_TRACE_API("%s", __func__);



  if (!btif_hd_cb.app_registered) {
@@ -484,7 +484,7 @@ static bt_status_t connect(void) { 
    return BT_STATUS_NOT_READY;

  }



  BTA_HdConnect();

  BTA_HdConnect(bd_addr->address);



  return BT_STATUS_SUCCESS;

}