summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-03-25 13:51:44 +0700
committerhathach <[email protected]>2013-03-25 13:51:44 +0700
commit45db7b4a533c8f4693167e120cc8285b29b4794f (patch)
tree467805f77fbabc8acaeca8f4aad00e3939709566
parentddeec330fabaa1b41cbd359e268a84334cfac65e (diff)
able to build test hidh
hack include in hid_host_keyboard.h
-rw-r--r--tests/test/host/hid/test_hidh.c21
-rw-r--r--tinyusb/class/hid_host_keyboard.c7
-rw-r--r--tinyusb/class/hid_host_keyboard.h2
3 files changed, 27 insertions, 3 deletions
diff --git a/tests/test/host/hid/test_hidh.c b/tests/test/host/hid/test_hidh.c
index 838805c63..294fcecfb 100644
--- a/tests/test/host/hid/test_hidh.c
+++ b/tests/test/host/hid/test_hidh.c
@@ -35,17 +35,34 @@
* This file is part of the tiny usb stack.
*/
+#include "stdlib.h"
#include "unity.h"
+#include "errors.h"
+
+#include "mock_osal.h"
+#include "mock_hcd.h"
+#include "mock_usbh.h"
+#include "mock_hid_host_keyboard.h"
+
+#include "hid_host.h"
+
+uint8_t dev_addr;
+uint8_t instance_num;
void setUp(void)
{
+ instance_num = 0;
+ dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1;
}
void tearDown(void)
{
}
-void test_hidh()
+void test_hidh_init()
{
- TEST_IGNORE();
+// hidh_keyboard_init_Expect();
+// //------------- Code Under TEST -------------//
+// hidh_init();
+ TEST_FAIL();
}
diff --git a/tinyusb/class/hid_host_keyboard.c b/tinyusb/class/hid_host_keyboard.c
index 2bb9503c0..3ac18b3f4 100644
--- a/tinyusb/class/hid_host_keyboard.c
+++ b/tinyusb/class/hid_host_keyboard.c
@@ -60,7 +60,9 @@ STATIC_ hidh_keyboard_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX]; // does no
// IMPLEMENTATION
//--------------------------------------------------------------------+
-//------------- PUBLIC API (Parameter Verification is required) -------------//
+//--------------------------------------------------------------------+
+// PUBLIC API (parameter validation required)
+//--------------------------------------------------------------------+
tusb_error_t tusbh_hid_keyboard_get(uint8_t const dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report)
{
//------------- parameters validation -------------//
@@ -87,6 +89,9 @@ uint8_t tusbh_hid_keyboard_no_instances(uint8_t const dev_addr)
return keyboard_data[dev_addr-1].instance_count;
}
+//--------------------------------------------------------------------+
+// INTERNAL API (no need for parameter validation)
+//--------------------------------------------------------------------+
void hidh_keyboard_init(void)
{
memclr_(&keyboard_data, sizeof(hidh_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
diff --git a/tinyusb/class/hid_host_keyboard.h b/tinyusb/class/hid_host_keyboard.h
index a3c096bf6..8716d8ec5 100644
--- a/tinyusb/class/hid_host_keyboard.h
+++ b/tinyusb/class/hid_host_keyboard.h
@@ -52,6 +52,8 @@
#define _TUSB_HID_HOST_KEYBOARD_H_
#include "common/common.h"
+#include "usbh.h" // TODO refractor
+#include "hid.h"
#ifdef __cplusplus
extern "C" {