Explorar o código

Merge pull request #93 from hathach/develop

logos !!!
hathach %!s(int64=6) %!d(string=hai) anos
pai
achega
2b7eadc479
Modificáronse 2 ficheiros con 8 adicións e 6 borrados
  1. 2 0
      README.md
  2. 6 6
      src/portable/nordic/nrf5x/dcd_nrf5x.c

+ 2 - 0
README.md

@@ -1,5 +1,7 @@
 # TinyUSB
 
+![tinyUSB_240x100](https://user-images.githubusercontent.com/249515/62646655-f9393200-b978-11e9-9c53-484862f15503.png)
+
 [![Build Status](https://travis-ci.org/hathach/tinyusb.svg?branch=master)](https://travis-ci.org/hathach/tinyusb) [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
 
 TinyUSB is an open-source cross-platform USB Host/Device stack for embedded system. It is designed to be memory-safe with no dynamic allocation and thread-safe with all interrupt events are deferred then handled in the stack's task function.

+ 6 - 6
src/portable/nordic/nrf5x/dcd_nrf5x.c

@@ -619,14 +619,14 @@ void tusb_hal_nrf_power_event (uint32_t event)
 {
   // Value is chosen to be as same as NRFX_POWER_USB_EVT_* in nrfx_power.h
   enum {
-    POWER_USB_EVT_DETECTED = 0,
-    POWER_USB_EVT_REMOVED = 1,
-    POWER_USB_EVT_READY = 2
+    USB_EVT_DETECTED = 0,
+    USB_EVT_REMOVED = 1,
+    USB_EVT_READY = 2
   };
 
   switch ( event )
   {
-    case POWER_USB_EVT_DETECTED:
+    case USB_EVT_DETECTED:
       if ( !NRF_USBD->ENABLE )
       {
         /* Prepare for READY event receiving */
@@ -674,7 +674,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
       }
     break;
 
-    case POWER_USB_EVT_READY:
+    case USB_EVT_READY:
       /* Waiting for USBD peripheral enabled */
       while ( !(USBD_EVENTCAUSE_READY_Msk & NRF_USBD->EVENTCAUSE) ) { }
 
@@ -740,7 +740,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
       nrf_usbd_pullup_enable();
     break;
 
-    case POWER_USB_EVT_REMOVED:
+    case USB_EVT_REMOVED:
       if ( NRF_USBD->ENABLE )
       {
         // Abort all transfers