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

Commit 5dc107b1 authored by Chris Manton's avatar Chris Manton
Browse files

enum-ify _DISCOVERABLE both classic and ble 

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I063d0092569663c25166f15d369b57e6bf88388d
parent 3896bdd9

system/stack/btm/neighbor_inquiry.h

+14 −14
Original line number Diff line number Diff line
@@ -23,20 +23,20 @@ 
#include "types/raw_address.h"



/* Discoverable modes */

#define BTM_NON_DISCOVERABLE 0

#define BTM_LIMITED_DISCOVERABLE 1

#define BTM_GENERAL_DISCOVERABLE 2

#define BTM_DISCOVERABLE_MASK \

  (BTM_LIMITED_DISCOVERABLE | BTM_GENERAL_DISCOVERABLE)

#define BTM_MAX_DISCOVERABLE BTM_GENERAL_DISCOVERABLE

enum : uint16_t {

  BTM_NON_DISCOVERABLE = 0,

  BTM_LIMITED_DISCOVERABLE = (1 << 0),

  BTM_GENERAL_DISCOVERABLE = (1 << 1),

  BTM_MAX_DISCOVERABLE = BTM_GENERAL_DISCOVERABLE,

  BTM_DISCOVERABLE_MASK = (BTM_LIMITED_DISCOVERABLE | BTM_GENERAL_DISCOVERABLE),

  /* high byte for BLE Discoverable modes */

#define BTM_BLE_NON_DISCOVERABLE 0x0000

#define BTM_BLE_LIMITED_DISCOVERABLE 0x0100

#define BTM_BLE_GENERAL_DISCOVERABLE 0x0200

#define BTM_BLE_MAX_DISCOVERABLE BTM_BLE_GENERAL_DISCOVERABLE

#define BTM_BLE_DISCOVERABLE_MASK                            \

  (BTM_BLE_NON_DISCOVERABLE | BTM_BLE_LIMITED_DISCOVERABLE | \

   BTM_BLE_GENERAL_DISCOVERABLE)

  BTM_BLE_NON_DISCOVERABLE = 0x0000,

  BTM_BLE_LIMITED_DISCOVERABLE = 0x0100,

  BTM_BLE_GENERAL_DISCOVERABLE = 0x0200,

  BTM_BLE_MAX_DISCOVERABLE = BTM_BLE_GENERAL_DISCOVERABLE,

  BTM_BLE_DISCOVERABLE_MASK =

      (BTM_BLE_LIMITED_DISCOVERABLE | BTM_BLE_GENERAL_DISCOVERABLE),

};



/* Connectable modes */

#define BTM_NON_CONNECTABLE 0