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

Commit 06a8baa3 authored by Yuyang Huang's avatar Yuyang Huang Committed by Gerrit Code Review
Browse files

Merge "update CSIS bit support and reserved capabilities bits based on updated... 

Merge "update CSIS bit support and reserved capabilities bits based on updated ASHA documentation" into main
parents 82d5049b 1c888c2b

system/bta/hearing_aid/hearing_aid.cc

+4 −2
Original line number Original line Diff line number Diff line
@@ -905,8 +905,10 @@ class HearingAidImpl : public HearingAid { 
    hearingDevice->capabilities = capabilities;

    hearingDevice->capabilities = capabilities;

    bool side = capabilities & CAPABILITY_SIDE;

    bool side = capabilities & CAPABILITY_SIDE;

    bool standalone = capabilities & CAPABILITY_BINAURAL;

    bool standalone = capabilities & CAPABILITY_BINAURAL;

    LOG_DEBUG("capabilities: %s, %s", (side ? "right" : "left"),

    bool csis_capable = capabilities & CAPABILITY_CSIS;

              (standalone ? "binaural" : "monaural"));

    LOG_DEBUG("capabilities: %s, %s, CSIS %s", (side ? "right" : "left"),

              (standalone ? "binaural" : "monaural"),

              (csis_capable ? "capable" : "not capable"));





    if (capabilities & CAPABILITY_RESERVED) {

    if (capabilities & CAPABILITY_RESERVED) {

      LOG_WARN("reserved capabilities are set");

      LOG_WARN("reserved capabilities are set");

system/bta/include/bta_hearing_aid_api.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,8 @@ constexpr uint16_t HA_INTERVAL_20_MS = 20; 
// Masks for checking capability support

// Masks for checking capability support

constexpr uint8_t CAPABILITY_SIDE = 0x01;

constexpr uint8_t CAPABILITY_SIDE = 0x01;

constexpr uint8_t CAPABILITY_BINAURAL = 0x02;

constexpr uint8_t CAPABILITY_BINAURAL = 0x02;

constexpr uint8_t CAPABILITY_RESERVED = 0xFC;

constexpr uint8_t CAPABILITY_CSIS = 0x04;

constexpr uint8_t CAPABILITY_RESERVED = 0xF8;





// Number of retry for phy update. This targets to reduce phy update collision.

// Number of retry for phy update. This targets to reduce phy update collision.

const static uint8_t PHY_UPDATE_RETRY_LIMIT =

const static uint8_t PHY_UPDATE_RETRY_LIMIT =