---
src/adapter.c | 15 ++++-----------
src/eir.h | 9 +++++++++
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 88d94b4..68940e0 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -72,15 +72,6 @@
#define ADAPTER_INTERFACE "org.bluez.Adapter1"
-/* Flags Descriptions */
-#define EIR_LIM_DISC 0x01 /* LE Limited Discoverable Mode */
-#define EIR_GEN_DISC 0x02 /* LE General Discoverable Mode */
-#define EIR_BREDR_UNSUP 0x04 /* BR/EDR Not Supported */
-#define EIR_SIM_CONTROLLER 0x08 /* Simultaneous LE and BR/EDR to Same
- Device Capable (Controller) */
-#define EIR_SIM_HOST 0x10 /* Simultaneous LE and BR/EDR to Same
- Device Capable (Host) */
-
#define MODE_OFF 0x00
#define MODE_CONNECTABLE 0x01
#define MODE_DISCOVERABLE 0x02
@@ -4314,7 +4305,8 @@ static void update_found_devices(struct btd_adapter *adapter,
if (bdaddr_type == BDADDR_BREDR)
discoverable = true;
else
- discoverable = eir_data.flags & (EIR_LIM_DISC | EIR_GEN_DISC);
+ discoverable = eir_data.flags &
+ (EIR_FLAG_LIM_DISC | EIR_FLAG_GEN_DISC);
ba2str(bdaddr, addr);
@@ -4351,7 +4343,8 @@ static void update_found_devices(struct btd_adapter *adapter,
device_update_last_seen(dev, bdaddr_type);
- if (bdaddr_type != BDADDR_BREDR && !(eir_data.flags & EIR_BREDR_UNSUP))
+ if (bdaddr_type != BDADDR_BREDR &&
+ !(eir_data.flags & EIR_FLAG_BREDR_UNSUP))
device_set_bredr_support(dev, true);
if (eir_data.name != NULL && eir_data.name_complete)
diff --git a/src/eir.h b/src/eir.h
index 9e53983..b861b33 100644
--- a/src/eir.h
+++ b/src/eir.h
@@ -38,6 +38,15 @@
#define EIR_DEVICE_ID 0x10 /* device ID */
#define EIR_GAP_APPEARANCE 0x19 /* GAP appearance */
+/* Flags Descriptions */
+#define EIR_FLAG_LIM_DISC 0x01 /* LE Limited Discoverable Mode */
+#define EIR_FLAG_GEN_DISC 0x02 /* LE General Discoverable Mode */
+#define EIR_FLAG_BREDR_UNSUP 0x04 /* BR/EDR Not Supported */
+#define EIR_FLAG_CONTROLLER 0x08 /* Simultaneous LE and BR/EDR to Same
+ Device Capable (Controller) */
+#define EIR_FLAG_SIM_HOST 0x10 /* Simultaneous LE and BR/EDR to Same
+ Device Capable (Host) */
+
struct eir_data {
GSList *services;
unsigned int flags;
--
1.8.5.3
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
