nrf: Move bluetooth driver to the 'bluetooth' folder

11 files changed, 10 insertions, 12 deletions

diff --git a/ports/nrf/.gitignore b/ports/nrf/.gitignore
index ace93515a..227a82e50 100644
--- a/ports/nrf/.gitignore
+++ b/ports/nrf/.gitignore
@@ -1,6 +1,6 @@
 # Nordic files
 #####################
-drivers/bluetooth/s1*/
+bluetooth/s1*/
 
 # Build files
 #####################
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index b059569ab..9f8993977 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -21,7 +21,7 @@ include ../../py/mkenv.mk
 -include mpconfigport.mk
 
 ifneq ($(SD), )
-	include drivers/bluetooth/bluetooth_common.mk
+	include bluetooth/bluetooth_common.mk
 endif
 
 FROZEN_MPY_DIR = freeze
@@ -41,6 +41,7 @@ INC += -I$(BUILD)
 INC += -I$(BUILD)/genhdr
 INC += -I./../../lib/cmsis/inc
 INC += -I./boards/$(BOARD)
+INC += -I./bluetooth
 INC += -I./modules/ubluepy
 INC += -I./modules/ble
 INC += -I./nrfx
@@ -48,9 +49,6 @@ INC += -I./nrfx/hal
 INC += -I./nrfx/mdk
 INC += -I./nrfx/drivers/include
 INC += -I../../lib/mp-readline
-INC += -I./drivers/bluetooth
-INC += -I./drivers
-INC += -I./peripherals
 INC += -I../../lib/tinyusb/src
 INC += -I./usb
 
diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/bluetooth/ble_drv.c
index 0b6daf711..0b6daf711 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/bluetooth/ble_drv.c
diff --git a/ports/nrf/drivers/bluetooth/ble_drv.h b/ports/nrf/bluetooth/ble_drv.h
index 426354a19..426354a19 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.h
+++ b/ports/nrf/bluetooth/ble_drv.h
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/bluetooth/ble_uart.c
index b1d54eefa..b1d54eefa 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/bluetooth/ble_uart.c
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.h b/ports/nrf/bluetooth/ble_uart.h
index b57a75229..b57a75229 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.h
+++ b/ports/nrf/bluetooth/ble_uart.h
diff --git a/ports/nrf/drivers/bluetooth/bluetooth_common.mk b/ports/nrf/bluetooth/bluetooth_common.mk
index 81e50e333..7dad38e9e 100644
--- a/ports/nrf/drivers/bluetooth/bluetooth_common.mk
+++ b/ports/nrf/bluetooth/bluetooth_common.mk
@@ -15,11 +15,11 @@ endif
 
 CFLAGS += -DBLUETOOTH_SD_DEBUG=1
 
-INC += -Idrivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
-INC += -Idrivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
+INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
+INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
 
 SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex
-SOFTDEV_HEX_PATH = drivers/bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)
+SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)
 SOFTDEV_HEX = $(SOFTDEV_HEX_PATH)/$(SOFTDEV_HEX_NAME)
 
 define STACK_MISSING_ERROR
@@ -32,7 +32,7 @@ define STACK_MISSING_ERROR
 #                                                     #
 # Please run the download script:                     #
 #                                                     #
-#      drivers/bluetooth/download_ble_stack.sh        #
+#      bluetooth/download_ble_stack.sh                #
 #                                                     #
 #######################################################
 
diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/bluetooth/download_ble_stack.sh
index 385dbb451..385dbb451 100755
--- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh
+++ b/ports/nrf/bluetooth/download_ble_stack.sh
diff --git a/ports/nrf/drivers/bluetooth/ringbuffer.h b/ports/nrf/bluetooth/ringbuffer.h
index 3438b5c9b..3438b5c9b 100644
--- a/ports/nrf/drivers/bluetooth/ringbuffer.h
+++ b/ports/nrf/bluetooth/ringbuffer.h
diff --git a/ports/nrf/boards/feather_nrf52832/README.md b/ports/nrf/boards/feather_nrf52832/README.md
index b5acd6360..ef910509a 100644
--- a/ports/nrf/boards/feather_nrf52832/README.md
+++ b/ports/nrf/boards/feather_nrf52832/README.md
@@ -18,7 +18,7 @@ You then need to download the SD and Nordic SDK files via:
 
 ```
 $ cd ports/nrf
-$ ./drivers/bluetooth/download_ble_stack.sh
+$ ./bluetooth/download_ble_stack.sh
 ```
 
 ## Installing `adafruit-nrfutil`
diff --git a/ports/nrf/boards/feather_nrf52840_express/README.md b/ports/nrf/boards/feather_nrf52840_express/README.md
index 5d2177ff3..8d515010f 100644
--- a/ports/nrf/boards/feather_nrf52840_express/README.md
+++ b/ports/nrf/boards/feather_nrf52840_express/README.md
@@ -33,7 +33,7 @@ You then need to download the SD and Nordic SDK files via:
 
 ```
 $ cd ports/nrf
-$ ./drivers/bluetooth/download_ble_stack.sh
+$ ./bluetooth/download_ble_stack.sh
 ```
 
 ## Installing the Serial Bootloader
@@ -198,4 +198,4 @@ Converting to uf2, output size: 392192, start address: 0x26000
 Wrote 392192 bytes to build-feather52840-s140/firmware.uf2.
 ```
 
-Simply drag and drop firmware.uf2 to the MSC, the nrf52840 will blink fast and reset after done.
\ No newline at end of file
+Simply drag and drop firmware.uf2 to the MSC, the nrf52840 will blink fast and reset after done.