summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2020-10-15 16:34:19 -0400
committerDan Halbert <halbert@halwitz.org>2020-10-15 16:34:19 -0400
commit1d05ad6b22bedc52c5a1b9e44e806aa09fafd16c (patch)
tree5fc8c0b3c8eae17cb18f1ebda09b8bb238856086
parentf51e75c1d216de5ce0c4cdb985756d9cf2b73f4c (diff)
no _bleio for litex; ESP32S2 defines BIT() already
-rw-r--r--devices/ble_hci/common-hal/_bleio/hci_include/hci.h3
-rw-r--r--ports/litex/mpconfigport.mk1
2 files changed, 4 insertions, 0 deletions
diff --git a/devices/ble_hci/common-hal/_bleio/hci_include/hci.h b/devices/ble_hci/common-hal/_bleio/hci_include/hci.h
index b6c5ee34b..5213edbf0 100644
--- a/devices/ble_hci/common-hal/_bleio/hci_include/hci.h
+++ b/devices/ble_hci/common-hal/_bleio/hci_include/hci.h
@@ -17,7 +17,10 @@
#include "addr.h"
+// ESP32S2 build environment defines this already.
+#ifndef BIT
#define BIT(n) (1UL << (n))
+#endif
/* Special own address types for LL privacy (used in adv & scan parameters) */
#define BT_HCI_OWN_ADDR_RPA_OR_PUBLIC 0x02
diff --git a/ports/litex/mpconfigport.mk b/ports/litex/mpconfigport.mk
index 427e9ea84..485a75fde 100644
--- a/ports/litex/mpconfigport.mk
+++ b/ports/litex/mpconfigport.mk
@@ -16,6 +16,7 @@ CIRCUITPY_ANALOGIO = 0
CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_AUDIOIO = 0
CIRCUITPY_BITBANGIO = 0
+CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_BOARD = 0
CIRCUITPY_BUSIO = 0
CIRCUITPY_COUNTIO = 0