jesus/tinyusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove obsolete TUSB_CFG_HOST_HID_KEYBOARD_ENDPOINT_SIZE

Browse Source 
temporarily ignore test for hid_host.c due to ceedling linking issue with weak symbol
implement hidh_open_subtask driver to subclass open
rename hidh_keyboard_install to hidh_keyboard_open_subtask
This commit is contained in:
hathach
2013-03-25 16:02:24 +07:00
parent 45db7b4a53
commit c026a9f2e0
9 changed files with 65 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test/host/hid/test_hidh.c
+24 -7
View File
@@ -37,14 +37,16 @@
#include "stdlib.h"
#include "unity.h"
#include "common/common.h"
#include "errors.h"
#include "hid_host.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;
@@ -52,17 +54,32 @@ uint8_t instance_num;
void setUp(void)
{
instance_num = 0;
dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1;
// dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1;
}
void tearDown(void)
{
}
void test_hidh_init()
void test_hidh_init(void)
{
// hidh_keyboard_init_Expect();
// //------------- Code Under TEST -------------//
// hidh_init();
TEST_FAIL();
hidh_keyboard_init_Expect();
//------------- Code Under TEST -------------//
if (!hidh_init)
TEST_IGNORE();
}
void test_hidh_close(void)
{
if (!hidh_close)
TEST_IGNORE();
}
void test_hihd_isr(void)
{
if (!hidh_isr)
TEST_IGNORE();
}
tests/test/host/hid/test_hidh_keyboard.c
+5 -4
View File
@@ -111,12 +111,13 @@ void test_keyboard_no_instances_invalid_para(void)
TEST_ASSERT_EQUAL(0, tusbh_hid_keyboard_no_instances(dev_addr));
}
void test_keyboard_install_ok(void)
void test_keyboard_open_ok(void)
{
uint16_t length=0;
tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
TEST_ASSERT_EQUAL(0, tusbh_hid_keyboard_no_instances(dev_addr));
TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, hidh_keyboard_install(dev_addr, (uint8_t*) &kbd_descriptor));
TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, hidh_keyboard_open_subtask(dev_addr, (uint8_t*) &kbd_descriptor, &length));
tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
TEST_ASSERT_EQUAL(1, tusbh_hid_keyboard_no_instances(dev_addr));
}
@@ -166,7 +167,7 @@ void test_keyboard_get_class_not_supported()
void test_keyboard_get_report_xfer_failed()
{
tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
hcd_pipe_xfer_ExpectAndReturn(p_hidh_kbd_interface->pipe_in, &report, p_hidh_kbd_interface->report_size, true, TUSB_ERROR_INVALID_PARA);
hcd_pipe_xfer_ExpectAndReturn(p_hidh_kbd_interface->pipe_in, (uint8_t*) &report, p_hidh_kbd_interface->report_size, true, TUSB_ERROR_INVALID_PARA);
//------------- Code Under TEST -------------//
TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_hid_keyboard_get(dev_addr, instance_num, &report));
@@ -175,7 +176,7 @@ void test_keyboard_get_report_xfer_failed()
void test_keyboard_get_ok()
{
tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
hcd_pipe_xfer_ExpectAndReturn(p_hidh_kbd_interface->pipe_in, &report, p_hidh_kbd_interface->report_size, true, TUSB_ERROR_NONE);
hcd_pipe_xfer_ExpectAndReturn(p_hidh_kbd_interface->pipe_in, (uint8_t*) &report, p_hidh_kbd_interface->report_size, true, TUSB_ERROR_NONE);
//------------- Code Under TEST -------------//
TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_hid_keyboard_get(dev_addr, instance_num, &report));