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

Commit c7e142a4 authored by Chris Manton's avatar Chris Manton
Browse files

Point BtmStatus to tBTM_STATUS 

Towards converging code

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

Change-Id: Id2c30a0deb41bb6cd1dd55099c17924e80e88335
parent 4c433352

system/main/shim/btm.h

+3 −27
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static constexpr uint8_t kPhyConnectionLe2M = 0x02; 
static constexpr uint8_t kPhyConnectionLeCoded = 0x03;



using LegacyInquiryCompleteCallback =

    std::function<void(uint16_t status, uint8_t inquiry_mode)>;

    std::function<void(tBTM_STATUS status, uint8_t inquiry_mode)>;



using DiscoverabilityState = struct {

  int mode;
@@ -79,35 +79,11 @@ using ConnectabilityState = DiscoverabilityState; 


using HACK_ScoDisconnectCallback = std::function<void(uint16_t, uint8_t)>;



using BtmStatus = tBTM_STATUS;



namespace bluetooth {

namespace shim {



using BtmStatus = enum : uint8_t {

  BTM_SUCCESS = 0,              /* Command succeeded                 */

  BTM_CMD_STARTED = 1,          /* Command started OK.               */

  BTM_BUSY = 2,                 /* Device busy with another command  */

  BTM_NO_RESOURCES = 3,         /* No resources to issue command     */

  BTM_MODE_UNSUPPORTED = 4,     /* Request for 1 or more unsupported modes */

  BTM_ILLEGAL_VALUE = 5,        /* Illegal parameter value           */

  BTM_WRONG_MODE = 6,           /* Device in wrong mode for request  */

  BTM_UNKNOWN_ADDR = 7,         /* Unknown remote BD address         */

  BTM_DEVICE_TIMEOUT = 8,       /* Device timeout                    */

  BTM_BAD_VALUE_RET = 9,        /* A bad value was received from HCI */

  BTM_ERR_PROCESSING = 10,      /* Generic error                     */

  BTM_NOT_AUTHORIZED = 11,      /* Authorization failed              */

  BTM_DEV_RESET = 12,           /* Device has been reset             */

  BTM_CMD_STORED = 13,          /* request is stored in control block */

  BTM_ILLEGAL_ACTION = 14,      /* state machine gets illegal command */

  BTM_DELAY_CHECK = 15,         /* delay the check on encryption */

  BTM_SCO_BAD_LENGTH = 16,      /* Bad SCO over HCI data length */

  BTM_SUCCESS_NO_SECURITY = 17, /* security passed, no security set  */

  BTM_FAILED_ON_SECURITY = 18,  /* security failed                   */

  BTM_REPEATED_ATTEMPTS = 19,   /* repeated attempts for LE security requests */

  BTM_MODE4_LEVEL4_NOT_SUPPORTED = 20, /* Secure Connections Only Mode can't be

                                     supported */

  BTM_DEV_RESTRICT_LISTED = 21,        /* The device is restrict listed */

};



class Btm {

 public:

  // |handler| is used to run timer tasks and scan callbacks