adding code for nrf52 usbd start-up sequence

3 files changed, 231 insertions, 16 deletions

diff --git a/examples/device/nrf52840/segger/nrf.h b/examples/device/nrf52840/segger/nrf.h
index 927003f7b..a5b0d6c62 100644
--- a/examples/device/nrf52840/segger/nrf.h
+++ b/examples/device/nrf52840/segger/nrf.h
@@ -53,13 +53,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 
-#if defined(_WIN32)
-    /* Do not include nrf specific files when building for PC host */
-#elif defined(__unix)
-    /* Do not include nrf specific files when building for PC host */
-#elif defined(__APPLE__)
-    /* Do not include nrf specific files when building for PC host */
-#else
+//#if defined(_WIN32)
+//    /* Do not include nrf specific files when building for PC host */
+//#elif defined(__unix)
+//    /* Do not include nrf specific files when building for PC host */
+//#elif defined(__APPLE__)
+//    /* Do not include nrf specific files when building for PC host */
+//#else
 
     /* Device selection for device includes. */
     #if defined (NRF51)
@@ -87,7 +87,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
     #include "compiler_abstraction.h"
 
-#endif /* _WIN32 || __unix || __APPLE__ */
+//#endif /* _WIN32 || __unix || __APPLE__ */
 
 #endif /* NRF_H */
 
diff --git a/hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c b/hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c
index e70bde105..ab49b9e3f 100644
--- a/hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c
+++ b/hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c
@@ -37,7 +37,9 @@
 // TODO remove
 #include "nrf.h"
 #include "nrf_power.h"
-#include "nrf_drv_usbd.h"
+#include "nrf_usbd.h"
+
+#include "tusb_dcd.h"
 
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
@@ -50,18 +52,224 @@
 /*------------------------------------------------------------------*/
 /* Controller API
  *------------------------------------------------------------------*/
-bool tusb_dcd_init (uint8_t port)
+static void hfclk_ready(nrf_drv_clock_evt_type_t event)
+{
+
+}
+
+static void enable_usb(void)
 {
-  // TODO USB power detection
-  nrf_power_int_enable(
-                NRF_POWER_INT_USBDETECTED_MASK |
-                NRF_POWER_INT_USBREMOVED_MASK  |
-                NRF_POWER_INT_USBPWRRDY_MASK);
+  /* Prepare for READY event receiving */
+  nrf_usbd_eventcause_clear(NRF_USBD_EVENTCAUSE_READY_MASK);
+
+  /* Enable the peripheral */
+  nrf_usbd_enable();
+
+  // Enable HFCLK
+  nrf_drv_clock_handler_item_t clock_handler_item =
+  {
+      .event_handler = hfclk_ready
+  };
+  nrf_drv_clock_hfclk_request(&clock_handler_item);
+
+  /* Waiting for peripheral to enable, this should take a few us */
+  while ( 0 == (NRF_USBD_EVENTCAUSE_READY_MASK & nrf_usbd_eventcause_get()) ) { }
+  nrf_usbd_eventcause_clear(NRF_USBD_EVENTCAUSE_READY_MASK);
+
+  // Wait until power is ready
+  while (!nrf_power_usbregstatus_outrdy_get()) {}
+
+  // Wait until PHY is powered
+  while ( nrf_drv_clock_hfclk_is_running() ) {}
+
+  if ( nrf_drv_usbd_errata_166() )
+  {
+    *((volatile uint32_t *) (NRF_USBD_BASE + 0x800)) = 0x7E3;
+    *((volatile uint32_t *) (NRF_USBD_BASE + 0x804)) = 0x40;
+    __ISB();
+    __DSB();
+  }
+
+  nrf_usbd_isosplit_set(NRF_USBD_ISOSPLIT_Half);
+
+  // Enable interrupt
+  NRF_USBD->INTENSET = USBD_INTEN_USBRESET_Msk | USBD_INTEN_STARTED_Msk |
+      USBD_INTEN_ENDEPIN0_Msk | USBD_INTEN_EP0DATADONE_Msk | USBD_INTEN_ENDEPOUT0_Msk | USBD_INTEN_EP0SETUP_Msk |
+      USBD_INTEN_USBEVENT_Msk | USBD_INTEN_EPDATA_Msk | USBD_INTEN_ACCESSFAULT_Msk;
+      //USBD_INTEN_SOF_Msk
+
+//  if (enable_sof || nrf_drv_usbd_errata_104())
+//  {
+//    ints_to_enable |= NRF_USBD_INT_SOF_MASK;
+//  }
+
+  // Enable interrupt
+  NVIC_ClearPendingIRQ(USBD_IRQn);
+  NVIC_EnableIRQ(USBD_IRQn);
+
+  // Enable pull up
+  nrf_usbd_pullup_enable();
+}
+
+static void power_usb_event_handler(nrf_drv_power_usb_evt_t event)
+{
+  switch ( event )
+  {
+    case NRF_DRV_POWER_USB_EVT_DETECTED:
+      if ( !NRF_USBD->ENABLE )
+      {
+        enable_usb();
+      }
+    break;
+
+    case NRF_DRV_POWER_USB_EVT_REMOVED:
+      if ( NRF_USBD->ENABLE )
+      {
+        nrf_drv_usbd_stop();
 
-  nrf_drv_usbd_enable();
+        NRF_USBD->INTENCLR = NRF_USBD->INTEN; // disable all interrupt
+        nrf_usbd_disable();
+      }
+    break;
+
+    case NRF_DRV_POWER_USB_EVT_READY:
+    break;
+
+    default: break;
+  }
+}
+
+bool tusb_dcd_init (uint8_t port)
+{
+  // USB Power detection
+  const nrf_drv_power_usbevt_config_t config =
+  {
+      .handler = power_usb_event_handler
+  };
+  VERIFY( NRF_SUCCESS == nrf_drv_power_usbevt_init(&config) );
 }
 
 void tusb_dcd_connect          (uint8_t port);
 void tusb_dcd_disconnect       (uint8_t port);
 void tusb_dcd_set_address      (uint8_t port, uint8_t dev_addr);
 void tusb_dcd_set_config       (uint8_t port, uint8_t config_num);
+
+void USBD_IRQHandler(void)
+{
+  uint32_t const inten  = NRF_USBD->INTEN;
+  uint32_t int_status = 0;
+
+  volatile uint32_t* regclr = &NRF_USBD->EVENTS_USBRESET;
+
+  for(int i=0; i<32; i++)
+  {
+    if ( BIT_TEST_(inten, i) && regclr[i]  )
+    {
+      int_status |= BIT_(i);
+
+      // nrf_usbd_event_clear()
+      regclr[i] = 0;
+      __ISB();
+      __DSB();
+    }
+  }
+
+#if 0
+    if (nrf_drv_usbd_errata_104())
+    {
+        /* Event correcting */
+        if ((0 == m_dma_pending) && (0 != (active & (USBD_INTEN_SOF_Msk))))
+        {
+            uint8_t usbi, uoi, uii;
+            /* Testing */
+            *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7A9;
+            uii = (uint8_t)(*((volatile uint32_t *)(NRF_USBD_BASE + 0x804)));
+            if (0 != uii)
+            {
+                uii &= (uint8_t)(*((volatile uint32_t *)(NRF_USBD_BASE + 0x804)));
+            }
+
+            *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7AA;
+            uoi = (uint8_t)(*((volatile uint32_t *)(NRF_USBD_BASE + 0x804)));
+            if (0 != uoi)
+            {
+                uoi &= (uint8_t)(*((volatile uint32_t *)(NRF_USBD_BASE + 0x804)));
+            }
+            *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7AB;
+            usbi = (uint8_t)(*((volatile uint32_t *)(NRF_USBD_BASE + 0x804)));
+            if (0 != usbi)
+            {
+                usbi &= (uint8_t)(*((volatile uint32_t *)(NRF_USBD_BASE + 0x804)));
+            }
+            /* Processing */
+            *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7AC;
+            uii &= (uint8_t)*((volatile uint32_t *)(NRF_USBD_BASE + 0x804));
+            if (0 != uii)
+            {
+                uint8_t rb;
+                m_simulated_dataepstatus |= ((uint32_t)uii) << USBD_EPIN_BITPOS_0;
+                *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7A9;
+                *((volatile uint32_t *)(NRF_USBD_BASE + 0x804)) = uii;
+                rb = (uint8_t)*((volatile uint32_t *)(NRF_USBD_BASE + 0x804));
+            NRF_DRV_USBD_LOG_PROTO1_FIX_PRINTF("   uii: 0x%.2x (0x%.2x)", uii, rb);
+            }
+
+            *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7AD;
+            uoi &= (uint8_t)*((volatile uint32_t *)(NRF_USBD_BASE + 0x804));
+            if (0 != uoi)
+            {
+                uint8_t rb;
+                m_simulated_dataepstatus |= ((uint32_t)uoi) << USBD_EPOUT_BITPOS_0;
+                *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7AA;
+                *((volatile uint32_t *)(NRF_USBD_BASE + 0x804)) = uoi;
+                rb = (uint8_t)*((volatile uint32_t *)(NRF_USBD_BASE + 0x804));
+            NRF_DRV_USBD_LOG_PROTO1_FIX_PRINTF("   uoi: 0x%.2u (0x%.2x)", uoi, rb);
+            }
+
+            *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7AE;
+            usbi &= (uint8_t)*((volatile uint32_t *)(NRF_USBD_BASE + 0x804));
+            if (0 != usbi)
+            {
+                uint8_t rb;
+                if (usbi & 0x01)
+                {
+                    active |= USBD_INTEN_EP0SETUP_Msk;
+                }
+                if (usbi & 0x10)
+                {
+                    active |= USBD_INTEN_USBRESET_Msk;
+                }
+                *((volatile uint32_t *)(NRF_USBD_BASE + 0x800)) = 0x7AB;
+                *((volatile uint32_t *)(NRF_USBD_BASE + 0x804)) = usbi;
+                rb = (uint8_t)*((volatile uint32_t *)(NRF_USBD_BASE + 0x804));
+            NRF_DRV_USBD_LOG_PROTO1_FIX_PRINTF("   usbi: 0x%.2u (0x%.2x)", usbi, rb);
+            }
+
+            if (0 != (m_simulated_dataepstatus &
+                ~((1U << USBD_EPOUT_BITPOS_0) | (1U << USBD_EPIN_BITPOS_0))))
+            {
+                active |= enabled & NRF_USBD_INT_DATAEP_MASK;
+            }
+            if (0 != (m_simulated_dataepstatus &
+                ((1U << USBD_EPOUT_BITPOS_0) | (1U << USBD_EPIN_BITPOS_0))))
+            {
+                if (0 != (enabled & NRF_USBD_INT_EP0DATADONE_MASK))
+                {
+                    m_simulated_dataepstatus &=
+                        ~((1U << USBD_EPOUT_BITPOS_0) | (1U << USBD_EPIN_BITPOS_0));
+                    active |= NRF_USBD_INT_EP0DATADONE_MASK;
+                }
+            }
+        }
+    }
+#endif
+
+    /*------------- Interrupt Processing -------------*/
+
+    if ( int_status & USBD_INTEN_USBRESET_Msk )
+    {
+
+
+      tusb_dcd_bus_event(0, USBD_BUS_EVENT_RESET);
+    }
+}
diff --git a/hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c b/hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c
index 13e5de46f..571021139 100644
--- a/hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c
+++ b/hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c
@@ -38,6 +38,9 @@
 #include "nrf.h"
 #include "nrf_gpio.h"
 #include "nrf_drv_systick.h"
+#include "nrf_drv_clock.h"
+
+#include "tusb_hal.h"
 
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
@@ -62,6 +65,10 @@ void SysTick_Handler (void)
 
 bool tusb_hal_init(void)
 {
+  VERIFY( NRF_SUCCESS == nrf_drv_clock_init() );
+
+
+
   return true;
 }