Merge pull request #13 from hathach/devlocal

add unplugged event for nrf5x

3 files changed, 5 insertions, 12 deletions

diff --git a/src/device/dcd.h b/src/device/dcd.h
index f07bda2d3..db84df839 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -49,13 +49,6 @@
  extern "C" {

 #endif

 

-enum

-{

-  DCD_XFER_SUCCESS = 0,

-  DCD_XFER_FAILED,

-  DCD_XFER_STALLED

-};

-

 typedef enum

 {

   DCD_EVENT_BUS_RESET = 1,

diff --git a/src/device/usbd.c b/src/device/usbd.c
index f39605987..8c7e588e0 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -92,7 +92,7 @@ typedef struct {
   tusb_error_t (* open           ) (uint8_t rhport, tusb_desc_interface_t const * desc_intf, uint16_t* p_length);

   bool         (* control_request ) (uint8_t rhport, tusb_control_request_t const * request);

   bool (* control_request_complete ) (uint8_t rhport, tusb_control_request_t const * request);

-  tusb_error_t (* xfer_cb        ) (uint8_t rhport, uint8_t ep_addr, tusb_event_t, uint32_t);

+  tusb_error_t (* xfer_cb        ) (uint8_t rhport, uint8_t ep_addr, xfer_result_t, uint32_t);

   void         (* sof            ) (uint8_t rhport);

   void         (* reset          ) (uint8_t);

 } usbd_class_driver_t;

@@ -174,7 +174,7 @@ static bool process_set_config(uint8_t rhport, uint8_t config_number);
 static void const* get_descriptor(tusb_control_request_t const * p_request, uint16_t* desc_len);

 

 void usbd_control_reset (uint8_t rhport);

-bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes);

+bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);

 void usbd_control_set_complete_callback( bool (*fp) (uint8_t, tusb_control_request_t const * ) );

 

 //--------------------------------------------------------------------+

@@ -581,7 +581,7 @@ void dcd_event_handler(dcd_event_t const * event, bool in_isr)
       if ( 0 == edpt_number(event->xfer_complete.ep_addr) && event->xfer_complete.len == 0) break;

 

       osal_queue_send(_usbd_q, event, in_isr);

-      TU_ASSERT(event->xfer_complete.result == DCD_XFER_SUCCESS,);

+      TU_ASSERT(event->xfer_complete.result == XFER_RESULT_SUCCESS,);

     break;

 

     default: break;

diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index 8564d1ae9..31d74edf0 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -64,7 +64,7 @@ typedef struct
 

 static usbd_control_xfer_t _control_state;

 

-CFG_TUSB_ATTR_USBRAM CFG_TUSB_MEM_ALIGN uint8_t _usbd_ctrl_buf[CFG_TUD_ENDOINT0_SIZE];

+CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t _usbd_ctrl_buf[CFG_TUD_ENDOINT0_SIZE];

 

 void usbd_control_reset (uint8_t rhport)

 {

@@ -126,7 +126,7 @@ bool usbd_control_xfer(uint8_t rhport, tusb_control_request_t const * request, v
 }

 

 // callback when a transaction complete on DATA stage of control endpoint

-bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes)

+bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)

 {

   if ( _control_state.request.bmRequestType_bit.direction == TUSB_DIR_OUT )

   {