summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-09-21 13:17:43 +0700
committerhathach <[email protected]>2013-09-21 13:17:43 +0700
commitd15ba08fdc5c75aa061dc7dde10eff54f6dc607f (patch)
tree037d09bc2fd3d65c311cb8938d8fedb795debd0c /tests
parent2db5fcdf0a34142a3712174baba1ba7bf63af3f4 (diff)
house keeping
Diffstat (limited to 'tests')
-rw-r--r--tests/lpc18xx_43xx/test/host/hid/test_hid_host.c8
-rw-r--r--tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c2
-rw-r--r--tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c6
-rw-r--r--tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c6
4 files changed, 11 insertions, 11 deletions
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c b/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c
index 7abb16428..d2f9f3063 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c
@@ -53,7 +53,7 @@
uint8_t dev_addr;
pipe_handle_t pipe_hdl;
-extern hidh_interface_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX];
+extern hidh_interface_info_t keyboardh_data[TUSB_CFG_HOST_DEVICE_MAX];
tusb_descriptor_interface_t const *p_kbd_interface_desc = &desc_configuration.keyboard_interface;
tusb_hid_descriptor_hid_t const *p_kbh_hid_desc = &desc_configuration.keyboard_hid;
@@ -85,8 +85,8 @@ void tearDown(void)
void test_hidh_close(void)
{
- keyboard_data[dev_addr-1].pipe_hdl = pipe_hdl;
- keyboard_data[dev_addr-1].report_size = 8;
+ keyboardh_data[dev_addr-1].pipe_hdl = pipe_hdl;
+ keyboardh_data[dev_addr-1].report_size = 8;
hcd_pipe_close_ExpectAndReturn(pipe_hdl, TUSB_ERROR_NONE);
tusbh_hid_keyboard_unmounted_isr_Expect(dev_addr);
@@ -94,5 +94,5 @@ void test_hidh_close(void)
//------------- Code Under TEST -------------//
hidh_close(dev_addr);
- TEST_ASSERT_MEM_ZERO(&keyboard_data[dev_addr-1], sizeof(hidh_interface_info_t));
+ TEST_ASSERT_MEM_ZERO(&keyboardh_data[dev_addr-1], sizeof(hidh_interface_info_t));
}
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c
index 0afe77596..f367fb821 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c
@@ -51,7 +51,7 @@
#include "host_helper.h"
-extern hidh_interface_info_t mouse_data[TUSB_CFG_HOST_DEVICE_MAX];
+extern hidh_interface_info_t mouseh_data[TUSB_CFG_HOST_DEVICE_MAX];
hidh_interface_info_t *p_hidh_mouse;
tusb_mouse_report_t report;
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
index aa786cc92..3cbc5c868 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
@@ -48,7 +48,7 @@
#include "mock_hidh_callback.h"
#include "descriptor_test.h"
-extern hidh_interface_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX];
+extern hidh_interface_info_t keyboardh_data[TUSB_CFG_HOST_DEVICE_MAX];
tusb_keyboard_report_t sample_key[2] =
{
@@ -76,7 +76,7 @@ void setUp(void)
memclr_(&report, sizeof(tusb_keyboard_report_t));
dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1;
- p_hidh_kbd = &keyboard_data[dev_addr-1];
+ p_hidh_kbd = &keyboardh_data[dev_addr-1];
p_hidh_kbd->report_size = sizeof(tusb_keyboard_report_t);
p_hidh_kbd->pipe_hdl = (pipe_handle_t) {
@@ -95,7 +95,7 @@ void test_keyboard_init(void)
{
hidh_init();
- TEST_ASSERT_MEM_ZERO(keyboard_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
+ TEST_ASSERT_MEM_ZERO(keyboardh_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
}
//------------- is supported -------------//
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
index bade96635..010286ccb 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
@@ -49,7 +49,7 @@
#include "mock_hidh_callback.h"
#include "descriptor_test.h"
-extern hidh_interface_info_t mouse_data[TUSB_CFG_HOST_DEVICE_MAX];
+extern hidh_interface_info_t mouseh_data[TUSB_CFG_HOST_DEVICE_MAX];
hidh_interface_info_t *p_hidh_mouse;
tusb_mouse_report_t report;
@@ -65,7 +65,7 @@ void setUp(void)
memclr_(&report, sizeof(tusb_mouse_report_t));
dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1;
- p_hidh_mouse = &mouse_data[dev_addr-1];
+ p_hidh_mouse = &mouseh_data[dev_addr-1];
p_hidh_mouse->report_size = sizeof(tusb_mouse_report_t);
p_hidh_mouse->pipe_hdl = (pipe_handle_t) {
@@ -84,7 +84,7 @@ void test_mouse_init(void)
{
hidh_init();
- TEST_ASSERT_MEM_ZERO(mouse_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
+ TEST_ASSERT_MEM_ZERO(mouseh_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
}
//------------- is supported -------------//