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

Commit 35de2884 authored by Chris Manton's avatar Chris Manton
Browse files

Add hci error code ROLE_SWITCH_FAILED 

Seen in the wild with Bose soundtouch

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I29007526787876f148d664d95ffadaa5e52551d0
parent a879f63d

system/gd/hci/hci_packets.pdl

+1 −0
Original line number Diff line number Diff line
@@ -786,6 +786,7 @@ enum ErrorCode: 8 { 
  ROLE_CHANGE_NOT_ALLOWED = 0x21,

  LINK_LAYER_COLLISION = 0x23,

  ENCRYPTION_MODE_NOT_ACCEPTABLE = 0x25,

  ROLE_SWITCH_FAILED = 0x35,

  CONTROLLER_BUSY = 0x3A,

  CONNECTION_FAILED_ESTABLISHMENT = 0x3E,

}

system/main/shim/helpers.h

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ inline tHCI_STATUS ToLegacyHciErrorCode(hci::ErrorCode reason) { 
      return HCI_ERR_LMP_ERR_TRANS_COLLISION;

    case hci::ErrorCode::ENCRYPTION_MODE_NOT_ACCEPTABLE:

      return HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE;

    case hci::ErrorCode::ROLE_SWITCH_FAILED:

      return static_cast<tHCI_STATUS>(hci::ErrorCode::ROLE_SWITCH_FAILED);

    case hci::ErrorCode::CONTROLLER_BUSY:

      return static_cast<tHCI_STATUS>(hci::ErrorCode::CONTROLLER_BUSY);

    case hci::ErrorCode::CONNECTION_FAILED_ESTABLISHMENT:

system/stack/include/hci_error_code.h

+6 −5
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ typedef enum : uint8_t { 
  HCI_ERR_DIFF_TRANSACTION_COLLISION = 0x2A,  // stack/btm/btm_sec

  HCI_ERR_INSUFFCIENT_SECURITY = 0x2F,        // btif/btu

  HCI_ERR_ROLE_SWITCH_PENDING = 0x32,         // stack/btm/btm_sco

  HCI_ERR_ROLE_SWITCH_FAILED = 0x35,

  HCI_ERR_HOST_BUSY_PAIRING = 0x38,          // stack/btm/btm_sec

  HCI_ERR_UNACCEPT_CONN_INTERVAL = 0x3B,     // stack/l2cap/l2c_ble

  HCI_ERR_ADVERTISING_TIMEOUT = 0x3C,        // stack/btm/btm_ble