Skip to content

Commit a9384c7

Browse files
committed
extmod/extmod.mk: Switch from drivers/cyw43/cywbt to lib/cyw43-drivers.
The cyw43-driver now provides the Bluetooth initialisation code, making `drivers/cyw43/cywbt.c` obsolete. To use the new code a port must enable the `CYW43_ENABLE_BLUETOOTH_OVER_UART` option. Some ports have yet to migrate to the new code, so in the meantime they can explicitly add the old source to their source list and continue to use it without change. Signed-off-by: Damien George <[email protected]>
1 parent 0ee160e commit a9384c7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

extmod/extmod.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,16 +454,14 @@ CYW43_DIR = lib/cyw43-driver
454454
GIT_SUBMODULES += $(CYW43_DIR)
455455
CFLAGS_EXTMOD += -DMICROPY_PY_NETWORK_CYW43=1
456456
SRC_THIRDPARTY_C += $(addprefix $(CYW43_DIR)/src/,\
457+
cyw43_bthci_uart.c \
457458
cyw43_ctrl.c \
458459
cyw43_lwip.c \
459460
cyw43_ll.c \
460461
cyw43_sdio.c \
461462
cyw43_spi.c \
462463
cyw43_stats.c \
463464
)
464-
ifeq ($(MICROPY_PY_BLUETOOTH),1)
465-
DRIVERS_SRC_C += drivers/cyw43/cywbt.c
466-
endif
467465

468466
$(BUILD)/$(CYW43_DIR)/src/cyw43_%.o: CFLAGS += -std=c11
469467
endif # MICROPY_PY_NETWORK_CYW43

ports/mimxrt/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ endif
280280

281281
ifeq ($(MICROPY_PY_BLUETOOTH),1)
282282
SRC_C += mpbthciport.c
283+
DRIVERS_SRC_C += drivers/cyw43/cywbt.c
283284
endif # MICROPY_PY_BLUETOOTH
284285

285286
ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)

ports/stm32/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ endif
432432

433433
ifeq ($(MICROPY_PY_BLUETOOTH),1)
434434
SRC_C += mpbthciport.c
435+
DRIVERS_SRC_C += drivers/cyw43/cywbt.c
435436

436437
ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
437438
SRC_C += mpnimbleport.c

0 commit comments

Comments
 (0)