nrf: Move bluetooth driver to the 'bluetooth' folder

Author: arturo182

ports/nrf/.gitignore

@@ -1,6 +1,6 @@
 # Nordic files
 #####################
-drivers/bluetooth/s1*/
+bluetooth/s1*/
 
 # Build files
 #####################

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,16 +41,14 @@ 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
 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
 

ports/nrf/drivers/bluetooth/ble_drv.c renamed to ports/nrf/bluetooth/ble_drv.c

@@ -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                #
 #                                                     #
 #######################################################
 

ports/nrf/drivers/bluetooth/ble_drv.h renamed to ports/nrf/bluetooth/ble_drv.h

@@ -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`