house keeping

3 files changed, 2 insertions, 770 deletions

diff --git a/tinyusb/device/dcd_lpc175x_6x.c b/tinyusb/device/dcd_lpc175x_6x.c
deleted file mode 100644
index f8870ccee..000000000
--- a/tinyusb/device/dcd_lpc175x_6x.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/**************************************************************************/

-/*!

-    @file     dcd_lpc175x_6x.c

-    @author   hathach (tinyusb.org)

-

-    @section LICENSE

-

-    Software License Agreement (BSD License)

-

-    Copyright (c) 2013, hathach (tinyusb.org)

-    All rights reserved.

-

-    Redistribution and use in source and binary forms, with or without

-    modification, are permitted provided that the following conditions are met:

-    1. Redistributions of source code must retain the above copyright

-    notice, this list of conditions and the following disclaimer.

-    2. Redistributions in binary form must reproduce the above copyright

-    notice, this list of conditions and the following disclaimer in the

-    documentation and/or other materials provided with the distribution.

-    3. Neither the name of the copyright holders nor the

-    names of its contributors may be used to endorse or promote products

-    derived from this software without specific prior written permission.

-

-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY

-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY

-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-    This file is part of the tinyusb stack.

-*/

-/**************************************************************************/

-

-#include "tusb_option.h"

-

-#if MODE_DEVICE_SUPPORTED && (TUSB_CFG_MCU == MCU_LPC175X_6X)

-

-#define _TINY_USB_SOURCE_FILE_

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

-// INCLUDE

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

-#include "dcd.h"

-#include "dcd_lpc175x_6x.h"

-#include "usbd_dcd.h"

-

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

-// MACRO CONSTANT TYPEDEF

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

-#define DCD_QHD_MAX 32

-#define DCD_QTD_MAX  32 // TODO scale with configure

-

-typedef struct {

-  volatile dcd_dma_descriptor_t* udca[DCD_QHD_MAX]; // must be 128 byte aligned

-  dcd_dma_descriptor_t dd[DCD_QTD_MAX][2]; // each endpoints can have up to 2 DD queued at a time TODO 0-1 are not used, offset to reduce memory

-

-  uint8_t class_code[DCD_QHD_MAX];

-

-  struct {

-    uint8_t* p_data;

-    uint16_t remaining_bytes;

-    uint8_t  int_on_complete;

-  }control_dma;

-

-}dcd_data_t;

-

-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(128) STATIC_VAR dcd_data_t dcd_data;

-

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

-// INTERNAL OBJECT & FUNCTION DECLARATION

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

-static void bus_reset(void);

-static tusb_error_t pipe_control_read(void * buffer, uint16_t length);

-static tusb_error_t pipe_control_write(void const * buffer, uint16_t length);

-static tusb_error_t pipe_control_xfer(uint8_t ep_id, uint8_t* p_buffer, uint16_t length);

-

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

-// PIPE HELPER

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

-static inline uint8_t edpt_addr2phy(uint8_t endpoint_addr) ATTR_CONST ATTR_ALWAYS_INLINE;

-static inline uint8_t edpt_addr2phy(uint8_t endpoint_addr)

-{

-  return 2*(endpoint_addr & 0x0F) + ((endpoint_addr & TUSB_DIR_IN_MASK) ? 1 : 0);

-}

-

-static inline void edpt_set_max_packet_size(uint8_t ep_id, uint16_t max_packet_size) ATTR_ALWAYS_INLINE;

-static inline void edpt_set_max_packet_size(uint8_t ep_id, uint16_t max_packet_size)

-{ // follows example in 11.10.4.2

-  LPC_USB->USBReEp    |= BIT_(ep_id);

-  LPC_USB->USBEpInd    = ep_id; // select index before setting packet size

-  LPC_USB->USBMaxPSize = max_packet_size;

-

-#ifndef _TEST_

-  while ((LPC_USB->USBDevIntSt & DEV_INT_ENDPOINT_REALIZED_MASK) == 0) {} // TODO can be omitted

-  LPC_USB->USBDevIntClr = DEV_INT_ENDPOINT_REALIZED_MASK;

-#endif

-

-}

-

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

-// USBD-DCD API

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

-static void bus_reset(void)

-{

-  // step 7 : slave mode set up

-  LPC_USB->USBEpIntClr     = 0xFFFFFFFF;          // clear all pending interrupt

-	LPC_USB->USBDevIntClr    = 0xFFFFFFFF;          // clear all pending interrupt

-	LPC_USB->USBEpIntEn      = (uint32_t) BIN8(11); // control endpoint cannot use DMA, non-control all use DMA

-	LPC_USB->USBEpIntPri     = 0;                   // same priority for all endpoint

-

-	// step 8 : DMA set up

-	LPC_USB->USBEpDMADis     = 0xFFFFFFFF; // firstly disable all dma

-	LPC_USB->USBDMARClr      = 0xFFFFFFFF; // clear all pending interrupt

-	LPC_USB->USBEoTIntClr    = 0xFFFFFFFF;

-	LPC_USB->USBNDDRIntClr   = 0xFFFFFFFF;

-	LPC_USB->USBSysErrIntClr = 0xFFFFFFFF;

-

-	memclr_(&dcd_data, sizeof(dcd_data_t));

-}

-

-bool tusb_dcd_init(uint8_t port)

-{

-  (void) port;

-

-  //------------- user manual 11.13 usb device controller initialization -------------//  LPC_USB->USBEpInd = 0;

-  // step 6 : set up control endpoint

-  edpt_set_max_packet_size(0, TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE);

-  edpt_set_max_packet_size(1, TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE);

-

-  bus_reset();

-

-  LPC_USB->USBDevIntEn = (DEV_INT_DEVICE_STATUS_MASK | DEV_INT_ENDPOINT_SLOW_MASK | DEV_INT_ERROR_MASK);

-	LPC_USB->USBUDCAH    = (uint32_t) dcd_data.udca;

-	LPC_USB->USBDMAIntEn = (DMA_INT_END_OF_XFER_MASK | DMA_INT_ERROR_MASK );

-

-	sie_write(SIE_CMDCODE_DEVICE_STATUS, 1, 1); // connect

-

-  return TUSB_ERROR_NONE;

-}

-

-static void endpoint_non_control_isr(uint32_t eot_int)

-{

-  for(uint8_t ep_id = 2; ep_id < DCD_QHD_MAX; ep_id++ )

-  {

-    if ( BIT_TEST_(eot_int, ep_id) )

-    {

-      dcd_dma_descriptor_t* const p_first_dd = &dcd_data.dd[ep_id][0];

-      dcd_dma_descriptor_t* const p_last_dd  = dcd_data.dd[ep_id] + (p_first_dd->is_next_valid ? 1 : 0); // Maximum is 2 QTD are queued in an endpoint

-

-      // only handle when Controller already finished the last DD

-      if ( dcd_data.udca[ep_id] == p_last_dd )

-      {

-        dcd_data.udca[ep_id] = p_first_dd; // UDCA currently points to the last DD, change to the fixed DD

-        p_first_dd->buffer_length = 0; // buffer length is used to determined if first dd is queued in pipe xfer function

-

-        if ( p_last_dd->int_on_complete )

-        {

-          edpt_hdl_t edpt_hdl =

-          {

-              .port     = 0,

-              .index      = ep_id,

-              .class_code = dcd_data.class_code[ep_id]

-          };

-          bool succeeded = (p_last_dd->status == DD_STATUS_NORMAL || p_last_dd->status == DD_STATUS_DATA_UNDERUN) ? true : false;

-

-          tusb_dcd_xfer_complete(edpt_hdl, p_last_dd->present_count, succeeded); // report only xferred bytes in the IOC qtd

-        }

-      }

-    }

-  }

-}

-

-static void endpoint_control_isr(void)

-{

-  uint32_t const interrupt_enable = LPC_USB->USBEpIntEn;

-  uint32_t const endpoint_int_status = LPC_USB->USBEpIntSt & interrupt_enable;

-//  LPC_USB->USBEpIntClr = endpoint_int_status; // acknowledge interrupt TODO cannot immediately acknowledge setup packet

-

-  //------------- Setup Recieved-------------//

-  if ( (endpoint_int_status & BIT_(0)) &&

-       (sie_read(SIE_CMDCODE_ENDPOINT_SELECT+0, 1) & SIE_SELECT_ENDPOINT_SETUP_RECEIVED_MASK) )

-  {

-    (void) sie_read(SIE_CMDCODE_ENDPOINT_SELECT_CLEAR_INTERRUPT+0, 1); // clear setup bit

-

-    tusb_control_request_t control_request;

-    pipe_control_read(&control_request, 8); // TODO read before clear setup above

-    tusb_dcd_setup_received(0, (uint8_t*) &control_request);

-  }

-  else if (endpoint_int_status & 0x03)

-  {

-    uint8_t const ep_id = ( endpoint_int_status & BIT_(0) ) ? 0 : 1;

-

-    if ( dcd_data.control_dma.remaining_bytes > 0 )

-    { // there are still data to transfer

-      pipe_control_xfer(ep_id, dcd_data.control_dma.p_data, dcd_data.control_dma.remaining_bytes);

-    }

-    else

-    {

-      dcd_data.control_dma.remaining_bytes = 0;

-

-      if ( BIT_TEST_(dcd_data.control_dma.int_on_complete, ep_id) )

-      {

-        edpt_hdl_t edpt_hdl = { .port = 0, .class_code = 0 };

-        dcd_data.control_dma.int_on_complete = 0;

-

-        // FIXME xferred_byte for control xfer is not needed now !!!

-        tusb_dcd_xfer_complete(edpt_hdl, 0, true);

-      }

-    }

-  }

-

-  LPC_USB->USBEpIntClr = endpoint_int_status; // acknowledge interrupt TODO cannot immediately acknowledge setup packet

-}

-

-void hal_dcd_isr(uint8_t port)

-{

-  (void) port;

-  uint32_t const device_int_enable = LPC_USB->USBDevIntEn;

-  uint32_t const device_int_status = LPC_USB->USBDevIntSt & device_int_enable;

-  LPC_USB->USBDevIntClr = device_int_status;// Acknowledge handled interrupt

-

-  //------------- usb bus event -------------//

-  if (device_int_status & DEV_INT_DEVICE_STATUS_MASK)

-  {

-    uint8_t const dev_status_reg = sie_read(SIE_CMDCODE_DEVICE_STATUS, 1);

-    if (dev_status_reg & SIE_DEV_STATUS_RESET_MASK)

-    {

-      bus_reset();

-      tusb_dcd_bus_event(0, USBD_BUS_EVENT_RESET);

-    }

-

-    if (dev_status_reg & SIE_DEV_STATUS_CONNECT_CHANGE_MASK)

-    { // device is disconnected, require using VBUS (P1_30)

-      tusb_dcd_bus_event(0, USBD_BUS_EVENT_UNPLUGGED);

-    }

-

-    if (dev_status_reg & SIE_DEV_STATUS_SUSPEND_CHANGE_MASK)

-    {

-      if (dev_status_reg & SIE_DEV_STATUS_SUSPEND_MASK)

-      {

-        tusb_dcd_bus_event(0, USBD_BUS_EVENT_SUSPENDED);

-      }

-//      else

-//      {

-//        tusb_dcd_bus_event(0, USBD_BUS_EVENT_RESUME);

-//      }

-    }

-  }

-

-  //------------- Control Endpoint (Slave Mode) -------------//

-  if (device_int_status & DEV_INT_ENDPOINT_SLOW_MASK)

-  {

-    endpoint_control_isr();

-  }

-

-  //------------- Non-Control Endpoint (DMA Mode) -------------//

-  uint32_t const dma_int_enable = LPC_USB->USBDMAIntEn;

-  uint32_t const dma_int_status = LPC_USB->USBDMAIntSt & dma_int_enable;

-

-  if (dma_int_status & DMA_INT_END_OF_XFER_MASK)

-  {

-    uint32_t eot_int = LPC_USB->USBEoTIntSt;

-    LPC_USB->USBEoTIntClr = eot_int; // acknowledge interrupt source

-

-    endpoint_non_control_isr(eot_int);

-  }

-

-  if (device_int_status & DEV_INT_ERROR_MASK || dma_int_status & DMA_INT_ERROR_MASK)

-  {

-    uint32_t error_status = sie_read(SIE_CMDCODE_READ_ERROR_STATUS, 1);

-    (void) error_status;

-//    ASSERT(false, (void) 0);

-  }

-}

-

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

-// USBD API - CONTROLLER

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

-void tusb_dcd_connect(uint8_t port)

-{

-  (void) port;

-  sie_write(SIE_CMDCODE_DEVICE_STATUS, 1, 1);

-}

-

-void tusb_dcd_set_address(uint8_t port, uint8_t dev_addr)

-{

-  (void) port;

-  sie_write(SIE_CMDCODE_SET_ADDRESS, 1, 0x80 | dev_addr); // 7th bit is : device_enable

-}

-

-void tusb_dcd_set_config(uint8_t port, uint8_t config_num)

-{

-  (void) port;

-  (void) config_num;

-  sie_write(SIE_CMDCODE_CONFIGURE_DEVICE, 1, 1);

-}

-

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

-// PIPE CONTROL HELPER

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

-static inline uint16_t length_byte2dword(uint16_t length_in_bytes) ATTR_ALWAYS_INLINE ATTR_CONST;

-static inline uint16_t length_byte2dword(uint16_t length_in_bytes)

-{

-  return (length_in_bytes + 3) / 4; // length_in_dword

-}

-

-static tusb_error_t pipe_control_xfer(uint8_t ep_id, uint8_t* p_buffer, uint16_t length)

-{

-  uint16_t const packet_len = min16_of(length, TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE);

-

-  if (ep_id)

-  {

-    ASSERT_STATUS ( pipe_control_write(p_buffer, packet_len) );

-  }else

-  {

-    ASSERT_STATUS ( pipe_control_read(p_buffer, packet_len) );

-  }

-

-  dcd_data.control_dma.remaining_bytes -= packet_len;

-  dcd_data.control_dma.p_data          += packet_len;

-

-  return TUSB_ERROR_NONE;

-}

-

-static tusb_error_t pipe_control_write(void const * buffer, uint16_t length)

-{

-  uint32_t const * p_write_data = (uint32_t const *) buffer;

-

-  LPC_USB->USBCtrl   = USBCTRL_WRITE_ENABLE_MASK; // logical endpoint = 0

-	LPC_USB->USBTxPLen = length;

-

-	for (uint16_t count = 0; count < length_byte2dword(length); count++)

-	{

-		LPC_USB->USBTxData = *p_write_data; // NOTE: cortex M3 have no problem with alignment

-		p_write_data++;

-	}

-

-	LPC_USB->USBCtrl   = 0;

-

-	// select control IN & validate the endpoint

-	sie_write(SIE_CMDCODE_ENDPOINT_SELECT+1, 0, 0);

-	sie_write(SIE_CMDCODE_BUFFER_VALIDATE  , 0, 0);

-

-  return TUSB_ERROR_NONE;

-}

-

-static tusb_error_t pipe_control_read(void * buffer, uint16_t length)

-{

-  LPC_USB->USBCtrl = USBCTRL_READ_ENABLE_MASK; // logical endpoint = 0

-  while ((LPC_USB->USBRxPLen & USBRXPLEN_PACKET_READY_MASK) == 0) {} // TODO blocking, should have timeout

-

-  uint16_t actual_length = min16_of(length, (uint16_t) (LPC_USB->USBRxPLen & USBRXPLEN_PACKET_LENGTH_MASK) );

-  uint32_t *p_read_data = (uint32_t*) buffer;

-  for( uint16_t count=0; count < length_byte2dword(actual_length); count++)

-  {

-    *p_read_data = LPC_USB->USBRxData;

-    p_read_data++; // increase by 4 ( sizeof(uint32_t) )

-  }

-

-  LPC_USB->USBCtrl = 0;

-

-  // select control OUT & clear the endpoint

-  sie_write(SIE_CMDCODE_ENDPOINT_SELECT+0, 0, 0);

-  sie_write(SIE_CMDCODE_BUFFER_CLEAR     , 0, 0);

-

-  return TUSB_ERROR_NONE;

-}

-

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

-// CONTROL PIPE API

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

-void tusb_dcd_control_stall(uint8_t port)

-{

-  sie_write(SIE_CMDCODE_ENDPOINT_SET_STATUS+0, 1, SIE_SET_ENDPOINT_STALLED_MASK | SIE_SET_ENDPOINT_CONDITION_STALLED_MASK);

-}

-

-bool tusb_dcd_control_xfer(uint8_t port, tusb_dir_t dir, uint8_t * p_buffer, uint16_t length, bool int_on_complete)

-{

-  (void) port;

-

-  VERIFY( !(length != 0 && p_buffer == NULL) );

-

-  // determine Endpoint where Data & Status phase occurred (IN or OUT)

-  uint8_t const ep_data   = (dir == TUSB_DIR_IN) ? 1 : 0;

-  uint8_t const ep_status = 1 - ep_data;

-

-  dcd_data.control_dma.int_on_complete = int_on_complete ? BIT_(ep_status) : 0;

-

-  //------------- Data Phase -------------//

-  if ( length )

-  {

-    dcd_data.control_dma.p_data          = (uint8_t*) p_buffer;

-    dcd_data.control_dma.remaining_bytes = length;

-

-    // lpc17xx already received the first DATA OUT packet by now

-    VERIFY_STATUS ( pipe_control_xfer(ep_data, p_buffer, length), false );

-  }

-

-  //------------- Status Phase (opposite direct to Data) -------------//

-  if (dir == TUSB_DIR_OUT)

-  { // only write for CONTROL OUT, CONTROL IN data will be retrieved in hal_dcd_isr // TODO ????

-    VERIFY_STATUS ( pipe_control_write(NULL, 0), false );

-  }

-

-  return true;

-}

-

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

-// BULK/INTERRUPT/ISO PIPE API

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

-edpt_hdl_t tusb_dcd_edpt_open(uint8_t port, tusb_descriptor_endpoint_t const * p_endpoint_desc, uint8_t class_code)

-{

-  (void) port;

-

-  edpt_hdl_t const null_handle = { 0 };

-

-  // TODO refractor to universal pipe open validation function

-  if (p_endpoint_desc->bmAttributes.xfer == TUSB_XFER_ISOCHRONOUS) return null_handle; // TODO not support ISO yet

-  ASSERT (p_endpoint_desc->wMaxPacketSize.size <= 64, null_handle); // TODO ISO can be 1023, but ISO not supported now

-

-  uint8_t ep_id = edpt_addr2phy( p_endpoint_desc->bEndpointAddress );

-

-  //------------- Realize Endpoint with Max Packet Size -------------//

-  edpt_set_max_packet_size(ep_id, p_endpoint_desc->wMaxPacketSize.size);

-	dcd_data.class_code[ep_id] = class_code;

-

-	//------------- first DD prepare -------------//

-	dcd_dma_descriptor_t* const p_dd = &dcd_data.dd[ep_id][0];

-	memclr_(p_dd, sizeof(dcd_dma_descriptor_t));

-

-	p_dd->is_isochronous  = (p_endpoint_desc->bmAttributes.xfer == TUSB_XFER_ISOCHRONOUS) ? 1 : 0;

-	p_dd->max_packet_size = p_endpoint_desc->wMaxPacketSize.size;

-	p_dd->is_retired      = 1; // inactive at first

-

-	dcd_data.udca[ ep_id ] = p_dd; // hook to UDCA

-

-	sie_write(SIE_CMDCODE_ENDPOINT_SET_STATUS+ep_id, 1, 0); // clear all endpoint status

-

-  return (edpt_hdl_t)

-      {

-          .port     = 0,

-          .index      = ep_id,

-          .class_code = class_code

-      };

-}

-

-bool tusb_dcd_edpt_busy(edpt_hdl_t edpt_hdl)

-{

-  return (dcd_data.udca[edpt_hdl.index] != NULL && !dcd_data.udca[edpt_hdl.index]->is_retired);

-}

-

-void tusb_dcd_edpt_stall(edpt_hdl_t edpt_hdl)

-{

-  sie_write(SIE_CMDCODE_ENDPOINT_SET_STATUS+edpt_hdl.index, 1, SIE_SET_ENDPOINT_STALLED_MASK);

-}

-

-void tusb_dcd_edpt_clear_stall(uint8_t port, uint8_t edpt_addr)

-{

-  uint8_t ep_id = edpt_addr2phy(edpt_addr);

-

-  sie_write(SIE_CMDCODE_ENDPOINT_SET_STATUS+ep_id, 1, 0);

-}

-

-void dd_xfer_init(dcd_dma_descriptor_t* p_dd, void* buffer, uint16_t total_bytes)

-{

-  p_dd->next                  = 0;

-  p_dd->is_next_valid         = 0;

-  p_dd->buffer_addr           = (uint32_t) buffer;

-  p_dd->buffer_length         = total_bytes;

-  p_dd->status                = DD_STATUS_NOT_SERVICED;

-  p_dd->iso_last_packet_valid = 0;

-  p_dd->present_count         = 0;

-}

-

-tusb_error_t tusb_dcd_edpt_queue_xfer(edpt_hdl_t edpt_hdl, uint8_t * buffer, uint16_t total_bytes)

-{ // NOTE for sure the qhd has no dds

-  dcd_dma_descriptor_t* const p_fixed_dd = &dcd_data.dd[edpt_hdl.index][0]; // always queue with the fixed DD

-

-  dd_xfer_init(p_fixed_dd, buffer, total_bytes);

-  p_fixed_dd->is_retired      = 1;

-  p_fixed_dd->int_on_complete = 0;

-

-  return TUSB_ERROR_NONE;

-}

-

-tusb_error_t tusb_dcd_edpt_xfer(edpt_hdl_t edpt_hdl, uint8_t* buffer, uint16_t total_bytes, bool int_on_complete)

-{

-  dcd_dma_descriptor_t* const p_first_dd = &dcd_data.dd[edpt_hdl.index][0];

-

-  //------------- fixed DD is already queued a xfer -------------//

-  if ( p_first_dd->buffer_length )

-  {

-    // setup new dd

-    dcd_dma_descriptor_t* const p_dd = &dcd_data.dd[ edpt_hdl.index ][1];

-    memclr_(p_dd, sizeof(dcd_dma_descriptor_t));

-

-    dd_xfer_init(p_dd, buffer, total_bytes);

-

-    p_dd->max_packet_size     = p_first_dd->max_packet_size;

-    p_dd->is_isochronous      = p_first_dd->is_isochronous;

-    p_dd->int_on_complete     = int_on_complete;

-

-    // hook to fixed dd

-    p_first_dd->next          = (uint32_t) p_dd;

-    p_first_dd->is_next_valid = 1;

-  }

-  //------------- fixed DD is free -------------//

-  else

-  {

-    dd_xfer_init(p_first_dd, buffer, total_bytes);

-    p_first_dd->int_on_complete = int_on_complete;

-  }

-

-  p_first_dd->is_retired = 0; // activate xfer

-  dcd_data.udca[edpt_hdl.index] = p_first_dd;

-  LPC_USB->USBEpDMAEn = BIT_(edpt_hdl.index);

-

-  if ( edpt_hdl.index % 2 )

-  { // endpoint IN need to actively raise DMA request

-    LPC_USB->USBDMARSet = BIT_(edpt_hdl.index);

-  }

-

-  return TUSB_ERROR_NONE;

-}

-

-#endif

diff --git a/tinyusb/device/dcd_lpc175x_6x.h b/tinyusb/device/dcd_lpc175x_6x.h
deleted file mode 100644
index 75cc265b4..000000000
--- a/tinyusb/device/dcd_lpc175x_6x.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/**************************************************************************/
-/*!
-    @file     dcd_lpc175x_6x.h
-    @author   hathach (tinyusb.org)
-
-    @section LICENSE
-
-    Software License Agreement (BSD License)
-
-    Copyright (c) 2013, hathach (tinyusb.org)
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holders nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    This file is part of the tinyusb stack.
-*/
-/**************************************************************************/
-
-/** \ingroup group_dcd
- *  \defgroup group_dcd_lpc175x_6x LPC175x_6x
- *  @{ */
-
-#ifndef _TUSB_DCD_LPC175X_6X_H_
-#define _TUSB_DCD_LPC175X_6X_H_
-
-#include <common/tusb_common.h>
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-
-typedef struct ATTR_ALIGNED(4)
-{
-	//------------- Word 0 -------------//
-	uint32_t next;
-
-	//------------- Word 1 -------------//
-	uint16_t mode            : 2; // either 00 normal or 01 ATLE(auto length extraction)
-	uint16_t is_next_valid   : 1;
-	uint16_t int_on_complete : 1; ///< make use of reserved bit
-	uint16_t is_isochronous  : 1; // is an iso endpoint
-	uint16_t max_packet_size : 11;
-	volatile uint16_t buffer_length;
-
-	//------------- Word 2 -------------//
-	volatile uint32_t buffer_addr;
-
-	//------------- Word 3 -------------//
-	volatile uint16_t is_retired                   : 1; // initialized to zero
-	volatile uint16_t status                       : 4;
-	volatile uint16_t iso_last_packet_valid        : 1;
-	volatile uint16_t atle_is_lsb_extracted        : 1;	// used in ATLE mode
-	volatile uint16_t atle_is_msb_extracted        : 1;	// used in ATLE mode
-	volatile uint16_t atle_message_length_position : 6; // used in ATLE mode
-	uint16_t                                       : 2;
-	volatile uint16_t present_count; // The number of bytes transferred by the DMA engine. The DMA engine updates this field after completing each packet transfer.
-
-	//------------- Word 4 -------------//
-//	uint32_t iso_packet_size_addr;		// iso only, can be omitted for non-iso
-}dcd_dma_descriptor_t;
-
-STATIC_ASSERT( sizeof(dcd_dma_descriptor_t) == 16, "size is not correct"); // TODO not support ISO for now
-
-
-//--------------------------------------------------------------------+
-// Register Interface
-//--------------------------------------------------------------------+
-
-//------------- USB Interrupt USBIntSt -------------//
-//enum {
-//  DCD_USB_REQ_LOW_PRIO_MASK   = BIT_(0),
-//  DCD_USB_REQ_HIGH_PRIO_MASK  = BIT_(1),
-//  DCD_USB_REQ_DMA_MASK        = BIT_(2),
-//  DCD_USB_REQ_NEED_CLOCK_MASK = BIT_(8),
-//  DCD_USB_REQ_ENABLE_MASK     = BIT_(31)
-//};
-
-//------------- Device Interrupt USBDevInt -------------//
-enum {
-  DEV_INT_FRAME_MASK              = BIT_(0),
-  DEV_INT_ENDPOINT_FAST_MASK      = BIT_(1),
-  DEV_INT_ENDPOINT_SLOW_MASK      = BIT_(2),
-  DEV_INT_DEVICE_STATUS_MASK      = BIT_(3),
-  DEV_INT_COMMAND_CODE_EMPTY_MASK = BIT_(4),
-  DEV_INT_COMMAND_DATA_FULL_MASK  = BIT_(5),
-  DEV_INT_RX_ENDPOINT_PACKET_MASK = BIT_(6),
-  DEV_INT_TX_ENDPOINT_PACKET_MASK = BIT_(7),
-  DEV_INT_ENDPOINT_REALIZED_MASK  = BIT_(8),
-  DEV_INT_ERROR_MASK              = BIT_(9)
-};
-
-//------------- DMA Interrupt USBDMAInt-------------//
-enum {
-  DMA_INT_END_OF_XFER_MASK    = BIT_(0),
-  DMA_INT_NEW_DD_REQUEST_MASK = BIT_(1),
-  DMA_INT_ERROR_MASK          = BIT_(2)
-};
-
-//------------- USBCtrl -------------//
-enum {
-  USBCTRL_READ_ENABLE_MASK  = BIT_(0),
-  USBCTRL_WRITE_ENABLE_MASK = BIT_(1),
-};
-
-//------------- USBRxPLen -------------//
-enum {
-  USBRXPLEN_PACKET_LENGTH_MASK = (BIT_(10)-1),
-  USBRXPLEN_DATA_VALID_MASK    = BIT_(10),
-  USBRXPLEN_PACKET_READY_MASK  = BIT_(11),
-};
-
-//------------- SIE Command Code -------------//
-typedef enum
-{
-  SIE_CMDPHASE_WRITE   = 1,
-  SIE_CMDPHASE_READ    = 2,
-  SIE_CMDPHASE_COMMAND = 5
-} sie_cmdphase_t;
-
-enum {
-  // device commands
-  SIE_CMDCODE_SET_ADDRESS                     = 0xd0,
-  SIE_CMDCODE_CONFIGURE_DEVICE                = 0xd8,
-  SIE_CMDCODE_SET_MODE                        = 0xf3,
-  SIE_CMDCODE_READ_FRAME_NUMBER               = 0xf5,
-  SIE_CMDCODE_READ_TEST_REGISTER              = 0xfd,
-  SIE_CMDCODE_DEVICE_STATUS                   = 0xfe,
-  SIE_CMDCODE_GET_ERROR                       = 0xff,
-  SIE_CMDCODE_READ_ERROR_STATUS               = 0xfb,
-
-  // endpoint commands
-  SIE_CMDCODE_ENDPOINT_SELECT                 = 0x00, // + endpoint index
-  SIE_CMDCODE_ENDPOINT_SELECT_CLEAR_INTERRUPT = 0x40, // + endpoint index, should use USBEpIntClr instead
-  SIE_CMDCODE_ENDPOINT_SET_STATUS             = 0x40, // + endpoint index
-  SIE_CMDCODE_BUFFER_CLEAR                    = 0xf2,
-  SIE_CMDCODE_BUFFER_VALIDATE                 = 0xfa
-};
-
-//------------- SIE Device Status (get/set from SIE_CMDCODE_DEVICE_STATUS) -------------//
-enum {
-  SIE_DEV_STATUS_CONNECT_STATUS_MASK = BIT_(0),
-  SIE_DEV_STATUS_CONNECT_CHANGE_MASK = BIT_(1),
-  SIE_DEV_STATUS_SUSPEND_MASK        = BIT_(2),
-  SIE_DEV_STATUS_SUSPEND_CHANGE_MASK = BIT_(3),
-  SIE_DEV_STATUS_RESET_MASK          = BIT_(4)
-};
-
-//------------- SIE Select Endpoint Command -------------//
-enum {
-  SIE_SELECT_ENDPOINT_FULL_EMPTY_MASK         = BIT_(0), // 0: empty, 1 full. IN endpoint checks empty, OUT endpoint check full
-  SIE_SELECT_ENDPOINT_STALL_MASK              = BIT_(1),
-  SIE_SELECT_ENDPOINT_SETUP_RECEIVED_MASK     = BIT_(2), // clear by SIE_CMDCODE_ENDPOINT_SELECT_CLEAR_INTERRUPT
-  SIE_SELECT_ENDPOINT_PACKET_OVERWRITTEN_MASK = BIT_(3), // previous packet is overwritten by a SETUP packet
-  SIE_SELECT_ENDPOINT_NAK_MASK                = BIT_(4), // last packet response is NAK (auto clear by an ACK)
-  SIE_SELECT_ENDPOINT_BUFFER1_FULL_MASK       = BIT_(5),
-  SIE_SELECT_ENDPOINT_BUFFER2_FULL_MASK       = BIT_(6)
-};
-
-typedef enum
-{
-  SIE_SET_ENDPOINT_STALLED_MASK           = BIT_(0),
-  SIE_SET_ENDPOINT_DISABLED_MASK          = BIT_(5),
-  SIE_SET_ENDPOINT_RATE_FEEDBACK_MASK     = BIT_(6),
-  SIE_SET_ENDPOINT_CONDITION_STALLED_MASK = BIT_(7),
-}sie_endpoint_set_status_mask_t;
-
-//------------- DMA Descriptor Status -------------//
-enum {
-  DD_STATUS_NOT_SERVICED = 0,
-  DD_STATUS_BEING_SERVICED,
-  DD_STATUS_NORMAL,
-  DD_STATUS_DATA_UNDERUN, // short packet
-  DD_STATUS_DATA_OVERRUN,
-  DD_STATUS_SYSTEM_ERROR
-};
-
-//--------------------------------------------------------------------+
-// SIE Command
-//--------------------------------------------------------------------+
-static inline void sie_cmd_code (sie_cmdphase_t phase, uint8_t code_data) ATTR_ALWAYS_INLINE;
-static inline void sie_cmd_code (sie_cmdphase_t phase, uint8_t code_data)
-{
-  LPC_USB->USBDevIntClr = (DEV_INT_COMMAND_CODE_EMPTY_MASK | DEV_INT_COMMAND_DATA_FULL_MASK);
-  LPC_USB->USBCmdCode   = (phase << 8) | (code_data << 16);
-
-  uint32_t const wait_flag = (phase == SIE_CMDPHASE_READ) ? DEV_INT_COMMAND_DATA_FULL_MASK : DEV_INT_COMMAND_CODE_EMPTY_MASK;
-#ifndef _TEST_
-  while ((LPC_USB->USBDevIntSt & wait_flag) == 0); // TODO blocking forever potential
-#endif
-  LPC_USB->USBDevIntClr = wait_flag;
-}
-
-static inline void sie_write (uint8_t cmd_code, uint8_t data_len, uint8_t data) ATTR_ALWAYS_INLINE;
-static inline void sie_write (uint8_t cmd_code, uint8_t data_len, uint8_t data)
-{
-  sie_cmd_code(SIE_CMDPHASE_COMMAND, cmd_code);
-
-  if (data_len)
-  {
-    sie_cmd_code(SIE_CMDPHASE_WRITE, data);
-  }
-}
-
-static inline uint32_t sie_read (uint8_t cmd_code, uint8_t data_len) ATTR_ALWAYS_INLINE;
-static inline uint32_t sie_read (uint8_t cmd_code, uint8_t data_len)
-{
-  // TODO multiple read
-  sie_cmd_code(SIE_CMDPHASE_COMMAND , cmd_code);
-  sie_cmd_code(SIE_CMDPHASE_READ    , cmd_code);
-  return LPC_USB->USBCmdData;
-}
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_DCD_LPC175X_6X_H_ */
-
-/** @} */
diff --git a/tinyusb/device/dcd_lpc_11uxx_13uxx.c b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
index c77cbd041..92d2ded3e 100644
--- a/tinyusb/device/dcd_lpc_11uxx_13uxx.c
+++ b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
@@ -195,6 +195,8 @@ bool tusb_dcd_init(uint8_t port)
   LPC_USB->DEVCMDSTAT  |= CMDSTAT_DEVICE_ENABLE_MASK | CMDSTAT_DEVICE_CONNECT_MASK |

                           CMDSTAT_RESET_CHANGE_MASK | CMDSTAT_CONNECT_CHANGE_MASK | CMDSTAT_SUSPEND_CHANGE_MASK;

 

+  NVIC_EnableIRQ(USB_IRQn);

+

   return true;

 }