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

Commit 23c211cc authored by Chris Manton's avatar Chris Manton
Browse files

enum-ify _INQUIRY both classic and ble 

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ic58e879c9b62fcba510111b178e0aa092873bcac
parent 2a8c3138

system/stack/btm/neighbor_inquiry.h

+23 −31
Original line number Diff line number Diff line
@@ -53,37 +53,29 @@ enum : uint16_t { 
/* Inquiry modes

 * Note: These modes are associated with the inquiry active values (BTM_*ACTIVE)

 */

#define BTM_INQUIRY_NONE 0

#define BTM_GENERAL_INQUIRY 0x01

#define BTM_BR_INQUIRY_MASK (BTM_GENERAL_INQUIRY)



/* high byte of inquiry mode for BLE inquiry mode */

#define BTM_BLE_INQUIRY_NONE 0x00

#define BTM_BLE_GENERAL_INQUIRY 0x10

#define BTM_BLE_INQUIRY_MASK (BTM_BLE_GENERAL_INQUIRY)



/* BTM_IsInquiryActive return values (Bit Mask)

 * Note: These bit masks are associated with the inquiry modes (BTM_*_INQUIRY)

 */

/* no inquiry in progress */

#define BTM_INQUIRY_INACTIVE 0x0

/* a general inquiry is in progress */

#define BTM_GENERAL_INQUIRY_ACTIVE BTM_GENERAL_INQUIRY

enum : uint8_t {

  BTM_INQUIRY_NONE = 0,

  BTM_INQUIRY_INACTIVE = 0x0,

  BTM_GENERAL_INQUIRY = 0x01,

  /* SSP is active, so inquiry is disallowed (work around for FW bug) */

#define BTM_SSP_INQUIRY_ACTIVE 0x4

  BTM_SSP_INQUIRY_ACTIVE = 0x4,

  /* high nibble of inquiry mode for BLE inquiry mode */

  BTM_BLE_GENERAL_INQUIRY = 0x10,

  BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),

  BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),

  BTM_BLE_INQUIRY_NONE = BTM_INQUIRY_NONE,

  BTM_GENERAL_INQUIRY_ACTIVE = BTM_GENERAL_INQUIRY,

  /* a general inquiry is in progress */

#define BTM_LE_GENERAL_INQUIRY_ACTIVE BTM_BLE_GENERAL_INQUIRY



/* inquiry activity mask */

  BTM_LE_GENERAL_INQUIRY_ACTIVE = BTM_BLE_GENERAL_INQUIRY,

  /* BR/EDR inquiry activity mask */

#define BTM_BR_INQ_ACTIVE_MASK (BTM_GENERAL_INQUIRY_ACTIVE)

  BTM_BR_INQ_ACTIVE_MASK = (BTM_GENERAL_INQUIRY_ACTIVE),

  /* LE scan activity mask */

#define BTM_BLE_SCAN_ACTIVE_MASK 0xF0

  BTM_BLE_SCAN_ACTIVE_MASK = 0xF0,

  /* LE inquiry activity mask*/

#define BTM_BLE_INQ_ACTIVE_MASK (BTM_LE_GENERAL_INQUIRY_ACTIVE)

  BTM_BLE_INQ_ACTIVE_MASK = (BTM_LE_GENERAL_INQUIRY_ACTIVE),

  /* inquiry activity mask */

#define BTM_INQUIRY_ACTIVE_MASK \

  (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_INQ_ACTIVE_MASK)

  BTM_INQUIRY_ACTIVE_MASK = (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_INQ_ACTIVE_MASK),

};



/* Define scan types */

#define BTM_SCAN_TYPE_STANDARD 0