no _bleio for litex; ESP32S2 defines BIT() already

2020-10-15 16:34:19 -04:00 · 2020-10-15 16:34:19 -04:00 · 1d05ad6b22
commit 1d05ad6b22
parent f51e75c1d2
2 changed files with 4 additions and 0 deletions
--- 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
--- 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