From 055285c55932af1396b92a31248f1df0ead25ffb Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Mon, 9 Dec 2013 11:28:11 +0700
Subject: [PATCH] minor refractor

---
 tinyusb/device/dcd_lpc_11uxx_13uxx.c | 56 +++++++++++++++-------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/tinyusb/device/dcd_lpc_11uxx_13uxx.c b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
index 1b64154e8..5e162a2eb 100644
--- a/tinyusb/device/dcd_lpc_11uxx_13uxx.c
+++ b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
@@ -255,6 +255,35 @@ static void endpoint_non_control_isr(uint32_t int_status)
   }
 }
 
+static void endpoint_control_isr(uint32_t int_status)
+{
+  uint8_t const ep_id = ( int_status & BIT_(0) ) ? 0 : 1;
+
+  // there are still data to transfer.
+  if ( (dcd_data.qhd[ep_id][0].total_bytes == 0) && (dcd_data.current_td[ep_id].remaining_bytes > 0) )
+  {
+    queue_xfer_to_buffer(ep_id, 0, dcd_data.qhd[ep_id][0].buff_addr_offset, dcd_data.current_td[ep_id].remaining_bytes);
+  }else
+  {
+    dcd_data.current_td[ep_id].remaining_bytes = 0;
+
+    if ( BIT_TEST_(dcd_data.current_ioc, ep_id) )
+    {
+      endpoint_handle_t edpt_hdl =
+      {
+          .coreid     = 0,
+          .index      = 0,
+          .class_code = 0
+      };
+
+      dcd_data.current_ioc = BIT_CLR_(dcd_data.current_ioc, edpt_hdl.index);
+
+      // FIXME xferred_byte for control xfer is not needed now !!!
+      usbd_xfer_isr(edpt_hdl, TUSB_EVENT_XFER_COMPLETE, 0);
+    }
+  }
+}
+
 void dcd_isr(uint8_t coreid)
 {
   (void) coreid;
@@ -317,31 +346,8 @@ void dcd_isr(uint8_t coreid)
   }
   //------------- Control Endpoint -------------//
   else if ( int_status & 0x03 )
-  { // either control endpoints
-    uint8_t const ep_id = ( int_status & BIT_(0) ) ? 0 : 1;
-
-    // there are still data to transfer.
-    if ( (dcd_data.qhd[ep_id][0].total_bytes == 0) && (dcd_data.current_td[ep_id].remaining_bytes > 0) )
-    {
-      queue_xfer_to_buffer(ep_id, 0, dcd_data.qhd[ep_id][0].buff_addr_offset, dcd_data.current_td[ep_id].remaining_bytes);
-    }else
-    {
-      dcd_data.current_td[ep_id].remaining_bytes = 0;
-
-      if ( BIT_TEST_(dcd_data.current_ioc, ep_id) )
-      {
-        endpoint_handle_t edpt_hdl =
-        {
-            .coreid     = coreid,
-            .index      = 0
-        };
-
-        dcd_data.current_ioc = BIT_CLR_(dcd_data.current_ioc, edpt_hdl.index);
-
-        // FIXME xferred_byte for control xfer is not needed now !!!
-        usbd_xfer_isr(edpt_hdl, TUSB_EVENT_XFER_COMPLETE, 0);
-      }
-    }
+  {
+    endpoint_control_isr(int_status);
   }
 
   //------------- Non-Control Endpoints -------------//