add more test code for keyboard hid application API

refractor, restructure, rename several thing regarding host, keyboard etc ...

4 files changed, 155 insertions, 36 deletions

diff --git a/tests/test/host/test_hid_host_keyboard.c b/tests/test/host/test_hid_host_keyboard.c
index 679916900..f0d82aa77 100644
--- a/tests/test/host/test_hid_host_keyboard.c
+++ b/tests/test/host/test_hid_host_keyboard.c
@@ -41,7 +41,7 @@
 #include "mock_osal.h"
 #include "mock_usbd_host.h"
 
-usbh_device_info_t usbh_device_pool [2];
+extern class_hid_keyboard_info_t keyboard_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
 
 tusb_keyboard_report_t sample_key[2] =
 {
@@ -56,72 +56,122 @@ tusb_keyboard_report_t sample_key[2] =
 };
 
 tusb_handle_device_t device_hdl;
+tusb_descriptor_interface_t kbd_descriptor;
 tusb_keyboard_report_t report;
+uint8_t instance_num;
 
 void setUp(void)
 {
   device_hdl = 0; // deviceID = 0 ; Configure = 1
+  instance_num = 0;
   memset(&report, 0, sizeof(tusb_keyboard_report_t));
 
-  usbh_device_pool[0].configuration.classes.hid_keyboard.pipe_in = 1;
-  usbh_device_pool[0].configuration.classes.hid_keyboard.qid = 1;
+  keyboard_info_pool[0].instance[0].pipe_in = 1;
+  keyboard_info_pool[0].instance[0].report_size = sizeof(tusb_keyboard_report_t);
+
+  kbd_descriptor = ((tusb_descriptor_interface_t)
+      {
+        .bLength            = sizeof(tusb_descriptor_interface_t),
+        .bDescriptorType    = TUSB_DESC_INTERFACE,
+        .bInterfaceNumber   = 1,
+        .bAlternateSetting  = 0,
+        .bNumEndpoints      = 1,
+        .bInterfaceClass    = TUSB_CLASS_HID,
+        .bInterfaceSubClass = TUSB_HID_SUBCLASS_BOOT,
+        .bInterfaceProtocol = TUSB_HID_PROTOCOL_KEYBOARD,
+        .iInterface         = 0
+      });
+
 }
 
 void tearDown(void)
 {
 }
 
-tusb_error_t queue_get_stub(osal_queue_id_t qid, uint32_t *data, osal_timeout_t msec, int num_call)
+//--------------------------------------------------------------------+
+// keyboard_install, keyboard_no_instances
+//--------------------------------------------------------------------+
+void test_keyboard_install_invalid_para(void)
 {
-  memcpy(data, (uint32_t*)(&sample_key[num_call/2]) + (num_call%2), 4);
-  return TUSB_ERROR_NONE;
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, class_hid_keyboard_install(TUSB_CFG_HOST_DEVICE_MAX, (uint8_t*) &kbd_descriptor));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, class_hid_keyboard_install(device_hdl, NULL));
 }
 
-usbh_device_info_t* get_device_class_not_support_stub(tusb_handle_device_t device_hdl, int num_call)
+void test_keyboard_no_instances_invalid_para(void)
 {
-  usbh_device_pool[0].configuration.classes.hid_keyboard.pipe_in = 0;
-  usbh_device_pool[0].configuration.classes.hid_keyboard.qid = 0;
+  TEST_ASSERT_EQUAL(0, tusbh_hid_keyboard_no_instances(TUSB_CFG_HOST_DEVICE_MAX));
+}
 
-  return &(usbh_device_pool[0]);
+void test_keyboard_install_ok(void)
+{
+  TEST_ASSERT_EQUAL(0, tusbh_hid_keyboard_no_instances(device_hdl));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, class_hid_keyboard_install(device_hdl, (uint8_t*) &kbd_descriptor));
+  TEST_ASSERT_EQUAL(1, tusbh_hid_keyboard_no_instances(device_hdl));
 }
 
-usbh_device_info_t* get_device_stub(tusb_handle_device_t device_hdl, int num_call)
+//--------------------------------------------------------------------+
+// keyboard_get
+//--------------------------------------------------------------------+
+pipe_status_t pipe_status_get_stub(pipe_handle_t pipe_hdl, int num_call)
 {
-  return &(usbh_device_pool[0]);
+  switch (num_call)
+  {
+    case 0:
+      memcpy(keyboard_info_pool[0].instance[0].buffer, &sample_key[0], sizeof(tusb_keyboard_report_t));
+      return PIPE_STATUS_COMPLETE;
+    break;
+
+    case 1:
+      return PIPE_STATUS_AVAILABLE;
+    break;
+
+    case 2:
+      return PIPE_STATUS_BUSY;
+    break;
+
+    case 3:
+      memcpy(keyboard_info_pool[0].instance[0].buffer, &sample_key[1], sizeof(tusb_keyboard_report_t));
+      return PIPE_STATUS_COMPLETE;
+    break;
+
+    default:
+      return PIPE_STATUS_AVAILABLE;
+  }
 }
 
 void test_keyboard_get_invalid_para()
 {
-  usbh_device_info_get_IgnoreAndReturn(NULL);
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_get(device_hdl, NULL));
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_get(device_hdl, &report));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_hid_keyboard_get(0, 0, NULL));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_hid_keyboard_get(TUSB_CFG_HOST_DEVICE_MAX, 0, &report));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_hid_keyboard_get(0, TUSB_CFG_HOST_HID_KEYBOARD_NO_INSTANCES_PER_DEVICE, &report));
 }
 
 void test_keyboard_get_class_not_supported()
 {
-  usbh_device_info_get_StubWithCallback(get_device_class_not_support_stub);
-
-  TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT, tusbh_keyboard_get(device_hdl, &report));
+  keyboard_info_pool[device_hdl].instance[0].pipe_in = 0;
+  TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
 }
 
-void test_keyboard_get_from_empty_queue()
+void test_keyboard_get_report_not_available()
 {
-  usbh_device_info_get_StubWithCallback(get_device_stub);
-  osal_queue_get_IgnoreAndReturn(TUSB_ERROR_OSAL_TIMEOUT);
-//  osal_queue_get_ExpectAndReturn( usbh_device_pool[0].configuration[0].classes.hid_keyboard.qid, );
+  usbh_pipe_status_get_IgnoreAndReturn(PIPE_STATUS_BUSY);
+  TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
 
-  TEST_ASSERT_EQUAL(TUSB_ERROR_OSAL_TIMEOUT, tusbh_keyboard_get(device_hdl, &report));
+  usbh_pipe_status_get_IgnoreAndReturn(PIPE_STATUS_AVAILABLE);
+  TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
 }
 
 void test_keyboard_get_ok()
 {
-  usbh_device_info_get_StubWithCallback(get_device_stub);
-  osal_queue_get_StubWithCallback(queue_get_stub);
+  usbh_pipe_status_get_StubWithCallback(pipe_status_get_stub);
 
-  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_keyboard_get(device_hdl, &report));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
   TEST_ASSERT_EQUAL_MEMORY(&sample_key[0], &report, sizeof(tusb_keyboard_report_t));
 
-  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_keyboard_get(device_hdl, &report));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
+
+  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_hid_keyboard_get(device_hdl, instance_num, &report));
   TEST_ASSERT_EQUAL_MEMORY(&sample_key[1], &report, sizeof(tusb_keyboard_report_t));
 }
 
diff --git a/tests/test/support/tusb_config.h b/tests/test/support/tusb_config.h
index 04d29d849..c02f12d66 100644
--- a/tests/test/support/tusb_config.h
+++ b/tests/test/support/tusb_config.h
@@ -55,23 +55,36 @@
  extern "C" {
 #endif
 
+//--------------------------------------------------------------------+
+// HOST CONFIGURATION
+//--------------------------------------------------------------------+
 #define TUSB_CFG_HOST
+
+//------------- CORE/CONTROLLER -------------//
 #define TUSB_CFG_HOST_CONTROLLER_NUM 2
 #define TUSB_CFG_HOST_DEVICE_MAX 2
 #define TUSB_CFG_CONFIGURATION_MAX 2
 
-/// Enable Device Support
+//------------- CLASS -------------//
+#define TUSB_CFG_HOST_HID_KEYBOARD  1
+#define TUSB_CFG_HOST_HID_KEYBOARD_ENDPOINT_SIZE  64
+
+//--------------------------------------------------------------------+
+// DEVICE CONFIGURATION
+//--------------------------------------------------------------------+
 //#define TUSB_CFG_DEVICE
 
-/// Enable CDC Support
-//#define TUSB_CFG_DEVICE_CDC
+//------------- CORE/CONTROLLER -------------//
 
-/// Enable HID Keyboard support
+//------------- CLASS -------------//
+//#define TUSB_CFG_DEVICE_CDC
 #define TUSB_CFG_DEVICE_HID_KEYBOARD
-
-/// Enable HID Mouse support
 //#define TUSB_CFG_DEVICE_HID_MOUSE
 
+//--------------------------------------------------------------------+
+// COMMON CONFIGURATION
+//--------------------------------------------------------------------+
+
 #define TUSB_CFG_DEBUG 3
 
 #define TUSB_CFG_OS TUSB_OS_NONE
@@ -83,7 +96,7 @@
     #define TUSB_RAM_SECTION  ".data.$RAM3"
   #endif
 
-  #define TUSB_ATTR_RAM_SECTION   __attribute__ ((section(TUSB_RAM_SECTION)))
+  #define TUSB_CFG_ATTR_USBRAM   __attribute__ ((section(TUSB_RAM_SECTION)))
 #endif
 
 
diff --git a/tests/test/test_osal_none.c b/tests/test/test_osal_none.c
new file mode 100644
index 000000000..295a6d40a
--- /dev/null
+++ b/tests/test/test_osal_none.c
@@ -0,0 +1,56 @@
+/*
+ * test_osal_none.c
+ *
+ *  Created on: Jan 22, 2013
+ *      Author: hathach
+ */
+
+/*
+ * Software License Agreement (BSD License)
+ * Copyright (c) 2012, hathach (tinyusb.net)
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 tiny usb stack.
+ */
+
+#include "unity.h"
+#include "osal_none.h"
+
+void setUp(void)
+{
+
+}
+
+void tearDown(void)
+{
+
+}
+
+void test_queue_put_invalid_para(void)
+{
+//  osal_queue_put();
+}
+
+
diff --git a/tests/test/test_project_settings.c b/tests/test/test_project_settings.c
index 4f1062a1c..79e3d426d 100644
--- a/tests/test/test_project_settings.c
+++ b/tests/test/test_project_settings.c
@@ -45,7 +45,7 @@ void tearDown(void)
 {
 }
 
-void test_()
+void test_project_memory()
 {
-  TEST_IGNORE();
+  TEST_IGNORE_MESSAGE("Try to keep project total memory usage up-to-date");
 }