add qspi device printf for testing

Author: hathach

cores/nRF5/flash/flash_qspi.c

@@ -152,9 +152,9 @@ void flash_qspi_init (void)
   nrfx_qspi_config_t qspi_cfg = {
     .xip_offset = 0,
     .pins = {
-      .sck_pin = PIN_QSPI_SCK,
-      .csn_pin = PIN_QSPI_CS,
-      .io0_pin = PIN_QSPI_DATA0,
+      .sck_pin = g_ADigitalPinMap[PIN_QSPI_SCK],
+      .csn_pin = g_ADigitalPinMap[PIN_QSPI_CS],
+      .io0_pin = g_ADigitalPinMap[PIN_QSPI_DATA0],
       .io1_pin = NRF_QSPI_PIN_NOT_CONNECTED,
       .io2_pin = NRF_QSPI_PIN_NOT_CONNECTED,
       .io3_pin = NRF_QSPI_PIN_NOT_CONNECTED,
@@ -175,16 +175,16 @@ void flash_qspi_init (void)
     .irq_priority = 7,
   };
 
-#if QSPI_FLASH_MODE > 1
-  qspi_cfg.pins.io1_pin = PIN_QSPI_DATA1;
+#if QSPI_FLASH_MODE == 2
+  qspi_cfg.pins.io1_pin = g_ADigitalPinMap[PIN_QSPI_DATA1];
   qspi_cfg.prot_if.readoc = NRF_QSPI_READOC_READ2IO;
   qspi_cfg.prot_if.writeoc = NRF_QSPI_WRITEOC_PP2O;
-#if QSPI_FLASH_MODE > 2
-  qspi_cfg.pins.io2_pin = PIN_QSPI_DATA2;
-  qspi_cfg.pins.io3_pin = PIN_QSPI_DATA3;
+#elif QSPI_FLASH_MODE == 4
+  qspi_cfg.pins.io1_pin = g_ADigitalPinMap[PIN_QSPI_DATA1];
+  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;
-#endif
 #endif
 
   // No callback for blocking API
@@ -225,6 +225,10 @@ void flash_qspi_init (void)
   uint8_t dev_id = (uint8_t) NRF_QSPI->CINSTRDAT1;
   uint8_t mfgr_id = (uint8_t) ( NRF_QSPI->CINSTRDAT0 >> 24);
 
+  // quick hack
+  printf("qspi mfgr id  : 0x%02X\n", mfgr_id);
+  printf("qspi device id: 0x%02X\n", dev_id);
+
   // Look up the flash device in supported array
   for ( int i = 0; i < FLASH_DEVICE_COUNT; i++ )
   {

cores/nRF5/main.cpp

@@ -103,3 +103,20 @@ void suspendLoop(void)
 {
   vTaskSuspend(_loopHandle);
 }
+
+extern "C"
+{
+
+// nanolib printf() retarget
+int _write (int fd, const void *buf, size_t count)
+{
+  (void) fd;
+
+  if ( Serial )
+  {
+    Serial.write( (const uint8_t *) buf, count);
+  }
+}
+
+}
+

cores/nRF5/utility/debug.cpp

@@ -62,14 +62,6 @@ void HardFault_Handler(void)
   NVIC_SystemReset();
 }
 
-// nanolib printf() retarget
-int _write (int fd, const void *buf, size_t count)
-{
-  (void) fd;
-
-  Serial.write( (const uint8_t *) buf, count);
-}
-
 int dbgHeapTotal(void)
 {
   return ((uint32_t) __HeapLimit) - ((uint32_t) __HeapBase);