From 544f9c1315e318884f62565dc1698a3f8c4412be Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Wed, 25 Jul 2018 21:21:33 +0700
Subject: [PATCH] add dcd_edpt_stalled() API

- implement control endpoint get status, endpoint set feature
---
 src/device/dcd.h                      |  1 +
 src/device/usbd.c                     | 21 ++++++++++++++++++---
 src/portable/nordic/nrf5x/dcd_nrf5x.c | 13 +++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/device/dcd.h b/src/device/dcd.h
index bee787d0..cbce366c 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -93,6 +93,7 @@ bool dcd_edpt_busy        (uint8_t rhport, uint8_t ep_addr);
 
 void dcd_edpt_stall       (uint8_t rhport, uint8_t ep_addr);
 void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr);
+bool dcd_edpt_stalled     (uint8_t rhport, uint8_t ep_addr);
 
 //------------- Control Endpoint -------------//
 bool dcd_control_xfer     (uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length);
diff --git a/src/device/usbd.c b/src/device/usbd.c
index bd169bb6..443ca805 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -411,11 +411,26 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request
   else if ( TUSB_REQ_RCPT_ENDPOINT == p_request->bmRequestType_bit.recipient &&
             TUSB_REQ_TYPE_STANDARD == p_request->bmRequestType_bit.type)
   {
-    if (TUSB_REQ_CLEAR_FEATURE == p_request->bRequest )
+    if (TUSB_REQ_GET_STATUS == p_request->bRequest )
     {
-      dcd_edpt_clear_stall(rhport, u16_low_u8(p_request->wIndex) );
+      uint16_t status = dcd_edpt_stalled(rhport, u16_low_u8(p_request->wIndex)) ? 0x0001 : 0x0000;
+      memcpy(_usbd_ctrl_buf, &status, 2);
+
+      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, _usbd_ctrl_buf, 2);
+    }
+    else if (TUSB_REQ_CLEAR_FEATURE == p_request->bRequest )
+    {
+      // only endpoint feature is halted/stalled
+      dcd_edpt_clear_stall(rhport, u16_low_u8(p_request->wIndex));
       dcd_control_status(rhport, p_request->bmRequestType_bit.direction);
-    } else
+    }
+    else if (TUSB_REQ_SET_FEATURE == p_request->bRequest )
+    {
+      // only endpoint feature is halted/stalled
+      dcd_edpt_stall(rhport, u16_low_u8(p_request->wIndex));
+      dcd_control_status(rhport, p_request->bmRequestType_bit.direction);
+    }
+    else
     {
       dcd_control_stall(rhport); // Stall unsupported request
     }
diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c
index 5444a0e9..44d1b93e 100644
--- a/src/portable/nordic/nrf5x/dcd_nrf5x.c
+++ b/src/portable/nordic/nrf5x/dcd_nrf5x.c
@@ -333,6 +333,17 @@ bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t
   return true;
 }
 
+bool dcd_edpt_stalled (uint8_t rhport, uint8_t ep_addr)
+{
+  (void) rhport;
+
+  // control is never got halted
+  if ( ep_addr == 0 ) return false;
+
+  uint8_t const epnum = edpt_number(ep_addr);
+  return (edpt_dir(ep_addr) == TUSB_DIR_IN ) ? NRF_USBD->HALTED.EPIN[epnum] : NRF_USBD->HALTED.EPOUT[epnum];
+}
+
 void dcd_edpt_stall (uint8_t rhport, uint8_t ep_addr)
 {
   (void) rhport;
@@ -351,9 +362,11 @@ void dcd_edpt_stall (uint8_t rhport, uint8_t ep_addr)
 void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr)
 {
   (void) rhport;
+
   if ( ep_addr )
   {
     NRF_USBD->EPSTALL = (USBD_EPSTALL_STALL_UnStall << USBD_EPSTALL_STALL_Pos) | ep_addr;
+    __ISB(); __DSB();
   }
 }