change the writeoc to NRF_QSPI_WRITEOC_PP4O

re-enable usb msc

Author: hathach

cores/nRF5/flash/flash_qspi.c

@@ -184,7 +184,7 @@ void flash_qspi_init (void)
   qspi_cfg.pins.io2_pin = g_ADigitalPinMap[PIN_QSPI_DATA2];
   qspi_cfg.pins.io3_pin = g_ADigitalPinMap[PIN_QSPI_DATA3];
   qspi_cfg.prot_if.readoc = NRF_QSPI_READOC_READ4IO;
-  qspi_cfg.prot_if.writeoc = NRF_QSPI_WRITEOC_PP4IO;
+  qspi_cfg.prot_if.writeoc = NRF_QSPI_WRITEOC_PP4O;
 #endif
 
   // No callback for blocking API

cores/nRF5/usb/tusb_config.h

@@ -85,7 +85,7 @@
 
 //------------- CLASS -------------//
 #define CFG_TUD_CDC                 1
-#define CFG_TUD_MSC                 0
+#define CFG_TUD_MSC                 1
 
 #define CFG_TUD_HID                 0
 #define CFG_TUD_HID_KEYBOARD        0

variants/feather_nrf52840_express/variant.cpp

@@ -24,6 +24,7 @@
 #include "nrf.h"
 
 #include "usb.h"
+#include "flash/flash_qspi.h"
 
 const uint32_t g_ADigitalPinMap[] =
 {
@@ -80,7 +81,10 @@ void initVariant()
   pinMode(PIN_LED2, OUTPUT);
   ledOff(PIN_LED2);
 
-  // USB init  TODO may have trouble with ISR when SD is enabled
+  // Init External Flash
+  flash_qspi_init();
+
+  // USB init
   usb_init();
 }
 

variants/pca10056/variant.cpp

@@ -54,7 +54,7 @@ void initVariant()
   // Init External Flash
   flash_qspi_init();
 
-  // USB init  TODO may have trouble with ISR when SD is enabled
+  // USB init
   usb_init();
 }