clean up

3 files changed, 107 insertions, 2 deletions

diff --git a/tests/lpc175x_6x/test/test_dcd_lpc175x_6x.c b/tests/lpc175x_6x/test/test_dcd_lpc175x_6x.c
index d1f8b0e9e..abbd408d5 100644
--- a/tests/lpc175x_6x/test/test_dcd_lpc175x_6x.c
+++ b/tests/lpc175x_6x/test/test_dcd_lpc175x_6x.c
@@ -41,8 +41,10 @@
 #include "errors.h"
 #include "type_helper.h"
 
+#include "mock_usbd_dcd.h"
 #include "dcd_lpc175x_6x.h"
 
+usbd_device_info_t usbd_devices[CONTROLLER_DEVICE_NUMBER];
 extern dcd_dma_descriptor_t* dcd_udca[32];
 
 void setUp(void)
diff --git a/tests/lpc175x_6x/test/test_usbd.c b/tests/lpc175x_6x/test/test_usbd.c
new file mode 100644
index 000000000..d2e73ee28
--- /dev/null
+++ b/tests/lpc175x_6x/test/test_usbd.c
@@ -0,0 +1,101 @@
+/**************************************************************************/
+/*!
+    @file     test_usbd.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 <stdlib.h>
+#include "unity.h"
+#include "errors.h"
+#include "type_helper.h"
+
+#include "tusb_descriptors.h"
+
+#include "mock_hid_device.h"
+#include "mock_dcd.h"
+
+#include "usbd.h"
+
+void setUp(void)
+{
+
+}
+
+void tearDown(void)
+{
+}
+
+void test_dcd_init_failed(void)
+{
+  dcd_init_ExpectAndReturn(TUSB_ERROR_FAILED);
+
+  //------------- Code Under Test -------------//
+  TEST_ASSERT_EQUAL(TUSB_ERROR_FAILED, usbd_init() );
+}
+
+tusb_error_t stub_hidd_init(tusb_descriptor_interface_t const* p_interface_desc, uint16_t* p_length, int num_call)
+{
+  switch(num_call)
+  {
+    case 0:
+      TEST_ASSERT_EQUAL_HEX(&app_tusb_desc_configuration.keyboard_interface, p_interface_desc);
+    break;
+
+    default:
+      TEST_FAIL();
+      return TUSB_ERROR_FAILED;
+  }
+
+  return TUSB_ERROR_NONE;
+}
+
+void class_init_epxect(void)
+{
+#if DEVICE_CLASS_HID
+  hidd_init_StubWithCallback(stub_hidd_init);
+#endif
+}
+
+void test_usbd_init(void)
+{
+  dcd_init_ExpectAndReturn(TUSB_ERROR_NONE);
+
+  class_init_epxect();
+  dcd_controller_connect_Expect(0);
+
+
+  //------------- Code Under Test -------------//
+  TEST_ASSERT_STATUS( usbd_init() );
+}
diff --git a/tests/support/tusb_config.h b/tests/support/tusb_config.h
index 6edd59800..83dcf78e2 100644
--- a/tests/support/tusb_config.h
+++ b/tests/support/tusb_config.h
@@ -86,14 +86,16 @@
 //--------------------------------------------------------------------+
 // DEVICE CONFIGURATION
 //--------------------------------------------------------------------+
+#define TUSB_CFG_DEVICE_USE_ROM_DRIVER  1
+
+//------------- descriptors -------------//
 #define TUSB_CFG_DEVICE_STRING_MANUFACTURER   "tinyusb.org"
 #define TUSB_CFG_DEVICE_STRING_PRODUCT        "Device Example"
 #define TUSB_CFG_DEVICE_STRING_SERIAL         "1234"
 #define TUSB_CFG_DEVICE_VENDORID              0x1FC9 // NXP
 //#define TUSB_CFG_DEVICE_PRODUCTID           0x4567
 
-
-#define TUSB_CFG_DEVICE_USE_ROM_DRIVER  1
+#define TUSB_CFG_DEVICE_CONTROL_PACKET_SIZE   64
 
 //------------- CLASS -------------//
 #define TUSB_CFG_DEVICE_HID_KEYBOARD  1