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

Commit cca904bb authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge "Replace bta::BTA_DM_[NON|DISC] => stack::btm::BTM_[NON_]DISCOVERABLE" into main

parents d7a80e3c 7910fd9f

system/bta/dm/bta_dm_act.cc

+4 −4
Original line number Diff line number Diff line
@@ -417,22 +417,22 @@ bool BTA_DmSetVisibility(bt_scan_mode_t mode) { 


  switch (mode) {

    case BT_SCAN_MODE_NONE:

      disc_mode_param = BTA_DM_NON_DISC;

      disc_mode_param = BTM_NON_DISCOVERABLE;

      conn_mode_param = BTM_NON_CONNECTABLE;

      break;



    case BT_SCAN_MODE_CONNECTABLE:

      disc_mode_param = BTA_DM_NON_DISC;

      disc_mode_param = BTM_NON_DISCOVERABLE;

      conn_mode_param = BTM_CONNECTABLE;

      break;



    case BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE:

      disc_mode_param = BTA_DM_GENERAL_DISC;

      disc_mode_param = BTM_GENERAL_DISCOVERABLE;

      conn_mode_param = BTM_CONNECTABLE;

      break;



    case BT_SCAN_MODE_CONNECTABLE_LIMITED_DISCOVERABLE:

      disc_mode_param = BTA_DM_LIMITED_DISC;

      disc_mode_param = BTM_LIMITED_DISCOVERABLE;

      conn_mode_param = BTM_CONNECTABLE;

      break;

system/bta/include/bta_api.h

+0 −6
Original line number Diff line number Diff line
@@ -96,12 +96,6 @@ typedef uint32_t tBTA_SERVICE_MASK; 
#define BTA_ALL_APP_ID 0xFF



/* Discoverable Modes */

#define BTA_DM_NON_DISC BTM_NON_DISCOVERABLE /* Device is not discoverable. */

#define BTA_DM_GENERAL_DISC                         \

  BTM_GENERAL_DISCOVERABLE /* General discoverable. \

                              */

#define BTA_DM_LIMITED_DISC BTM_LIMITED_DISCOVERABLE



typedef uint16_t

    tBTA_DM_DISC; /* this discoverability mode is a bit mask among BR mode and

                     LE mode */