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

Commit 2ffd0555 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Andre Eisenbach
Browse files

HID service discovery refactor 

This patch changes how HID is initialized.
Up till now, HID discovery was intricately chained,
to make sure two operations are not scheduled at same time.
From now on, all discovery is done and all operations are
scheduled for execution right away. There is separate set
of functions making sure all operations will be executed
without collisions.

This patch also removes BTA_HH_SCPP_INST_DEF, which was
used as hardcoded service id.

Bug: 27698756
Change-Id: I30a7388e129844c5e4727b2ed2b7c05867cc73a8
parent 19e7ef24

system/bta/hh/bta_hh_int.h

+3 −4
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ typedef struct 
    UINT8                   char_inst_id;

    tBTA_HH_RPT_TYPE        rpt_type;

    UINT16                  uuid;

    UINT8                   prop;

    UINT8                   rpt_id;

    BOOLEAN                 client_cfg_exist;

    UINT16                  client_cfg_value;
@@ -211,9 +210,8 @@ typedef struct 
    UINT8                   srvc_inst_id;

    tBTA_HH_LE_RPT          report[BTA_HH_LE_RPT_MAX];



#define BTA_HH_LE_PROTO_MODE_BIT        0x01

#define BTA_HH_LE_CP_BIT                0x02

    UINT8                   option_char; /* control point char exisit or not */

    UINT16                  proto_mode_handle;

    UINT8                   control_point_handle;



    BOOLEAN                 expl_incl_srvc;

    UINT8                   incl_srvc_inst; /* assuming only one included service : battery service */
@@ -268,6 +266,7 @@ typedef struct 
    UINT16              conn_id;

    BOOLEAN             in_bg_conn;

    UINT8               clt_cfg_idx;

    UINT16              scan_refresh_char_handle;

    BOOLEAN             scps_supported;



#define BTA_HH_LE_SCPS_NOTIFY_NONE    0

system/bta/hh/bta_hh_le.c

+484 −742

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/include/bta_hh_co.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ typedef struct 
    tBTA_HH_RPT_TYPE    rpt_type;

    UINT8               srvc_inst_id;

    UINT8               char_inst_id;

    UINT8               prop;

}tBTA_HH_RPT_CACHE_ENTRY;



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