clean up

2 files changed, 5 insertions, 108 deletions

diff --git a/examples/device/cdc_msc_hid_mynewt/readme.md b/examples/device/cdc_msc_hid_mynewt/readme.md
index 2d2f579fa..0dac39a88 100644
--- a/examples/device/cdc_msc_hid_mynewt/readme.md
+++ b/examples/device/cdc_msc_hid_mynewt/readme.md
@@ -1 +1 @@
-Please check out this repo https://github.com/hathach/mynewt-tinyusb-exmaple For mynewt example
\ No newline at end of file
+Please check out this repo https://github.com/hathach/mynewt-tinyusb-example For mynewt example
\ No newline at end of file
diff --git a/hw/bsp/pca10056/board_pca10056.c b/hw/bsp/pca10056/board_pca10056.c
index c48c00374..f237e1368 100644
--- a/hw/bsp/pca10056/board_pca10056.c
+++ b/hw/bsp/pca10056/board_pca10056.c
@@ -68,16 +68,9 @@ uint32_t tusb_hal_millis(void)
 /*------------------------------------------------------------------*/
 /* BOARD API
  *------------------------------------------------------------------*/
-enum {
-  QSPI_CMD_RSTEN = 0x66,
-  QSPI_CMD_RST = 0x99,
-  QSPI_CMD_WRSR = 0x01,
-  QSPI_CMD_READID = 0x90
-};
 
-/* tinyusb function that handles power event (detected, ready, removed)
- * We must call it within SD's SOC event handler, or set it as power event handler if SD is not enabled.
- */
+// tinyusb function that handles power event (detected, ready, removed)
+// We must call it within SD's SOC event handler, or set it as power event handler if SD is not enabled.
 extern void tusb_hal_nrf_power_event(uint32_t event);
 
 void board_init(void)
@@ -98,79 +91,6 @@ void board_init(void)
   SysTick_Config(SystemCoreClock/1000);
 #endif
 
-// 64 Mbit qspi flash
-#if 0 // def BOARD_MSC_FLASH_QSPI
-  nrfx_qspi_config_t qspi_cfg = {
-    .xip_offset = 0,
-    .pins = {
-       .sck_pin = 19,
-       .csn_pin = 17,
-       .io0_pin = 20,
-       .io1_pin = 21,
-       .io2_pin = 22,
-       .io3_pin = 23,
-    },
-    .prot_if = {
-      .readoc    = NRF_QSPI_READOC_READ4IO,
-      .writeoc = NRF_QSPI_WRITEOC_PP4IO,
-      .addrmode  = NRF_QSPI_ADDRMODE_24BIT,
-      .dpmconfig = false,  // deep power down
-    },
-    .phy_if = {
-      .sck_freq = NRF_QSPI_FREQ_32MDIV1,
-      .sck_delay = 1,
-      .spi_mode  = NRF_QSPI_MODE_0,
-      .dpmen     = false
-    },
-    .irq_priority   = 7,
-  };
-
-  // NULL callback for blocking API
-  nrfx_qspi_init(&qspi_cfg, NULL, NULL);
-
-  nrf_qspi_cinstr_conf_t cinstr_cfg = {
-    .opcode    = 0,
-    .length    = 0,
-    .io2_level = true,
-    .io3_level = true,
-    .wipwait   = false,
-    .wren      = false
-  };
-
-  // Send reset enable
-  cinstr_cfg.opcode = QSPI_CMD_RSTEN;
-  cinstr_cfg.length = NRF_QSPI_CINSTR_LEN_1B;
-  nrfx_qspi_cinstr_xfer(&cinstr_cfg, NULL, NULL);
-
-  // Send reset command
-  cinstr_cfg.opcode = QSPI_CMD_RST;
-  cinstr_cfg.length = NRF_QSPI_CINSTR_LEN_1B;
-  nrfx_qspi_cinstr_xfer(&cinstr_cfg, NULL, NULL);
-
-  NRFX_DELAY_US(100); // wait for flash reset
-
-  // Send (Read ID + 3 dummy bytes) + Receive 2 bytes of Manufacture + Device ID
-  uint8_t dummy[6] = { 0 };
-  uint8_t id_resp[6] = { 0 };
-  cinstr_cfg.opcode = QSPI_CMD_READID;
-  cinstr_cfg.length = 6;
-
-  // Bug with -nrf_qspi_cinstrdata_get() didn't combine data.
-  // https://devzone.nordicsemi.com/f/nordic-q-a/38540/bug-nrf_qspi_cinstrdata_get-didn-t-collect-data-from-both-cinstrdat1-and-cinstrdat0
-  nrfx_qspi_cinstr_xfer(&cinstr_cfg, dummy, id_resp);
-
-  // Due to the bug, we collect data manually
-  uint8_t dev_id = (uint8_t) NRF_QSPI->CINSTRDAT1;
-  uint8_t mfgr_id = (uint8_t) ( NRF_QSPI->CINSTRDAT0 >> 24 );
-
-  // Switch to quad mode
-  uint16_t sr_quad_en = 0x40;
-  cinstr_cfg.opcode = QSPI_CMD_WRSR;
-  cinstr_cfg.length = 3;
-  cinstr_cfg.wipwait = cinstr_cfg.wren = true;
-  nrfx_qspi_cinstr_xfer(&cinstr_cfg, &sr_quad_en, NULL);
-#endif
-
   NVIC_SetPriority(USBD_IRQn, 2);
 
   // USB power may already be ready at this time -> no event generated
@@ -178,23 +98,6 @@ void board_init(void)
   uint32_t usb_reg;
 
 #ifdef SOFTDEVICE_PRESENT
-
-// Enable to test enable SD before USB scenario
-#if 1
-  extern void nrf_error_cb(uint32_t id, uint32_t pc, uint32_t info);
-  nrf_clock_lf_cfg_t clock_cfg =
-  {
-      // LFXO
-      .source        = NRF_CLOCK_LF_SRC_XTAL,
-      .rc_ctiv       = 0,
-      .rc_temp_ctiv  = 0,
-      .accuracy      = NRF_CLOCK_LF_ACCURACY_20_PPM
-  };
-
-  sd_softdevice_enable(&clock_cfg, nrf_error_cb);
-  NVIC_EnableIRQ(SD_EVT_IRQn);
-#endif
-
   uint8_t sd_en = false;
   sd_softdevice_is_enabled(&sd_en);
 
@@ -220,13 +123,8 @@ void board_init(void)
     usb_reg = NRF_POWER->USBREGSTATUS;
   }
 
-  if ( usb_reg & POWER_USBREGSTATUS_VBUSDETECT_Msk ) {
-    tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_DETECTED);
-  }
-
-  if ( usb_reg & POWER_USBREGSTATUS_OUTPUTRDY_Msk ) {
-    tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_READY);
-  }
+  if ( usb_reg & POWER_USBREGSTATUS_VBUSDETECT_Msk ) tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_DETECTED);
+  if ( usb_reg & POWER_USBREGSTATUS_OUTPUTRDY_Msk  ) tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_READY);
 }
 
 void board_led_control(bool state)
@@ -262,7 +160,6 @@ int board_uart_write(void const * buf, int len)
 }
 
 #ifdef SOFTDEVICE_PRESENT
-
 // process SOC event from SD
 uint32_t proc_soc(void)
 {