move STRING & XSTRING & STATIC_ASSERT to compiler.h

disable test for a class of cdc host
temporarily disable test for test_osal_none.c
change include in some core files
remove osal.h from common.h
This commit is contained in:
hathach
2014-04-17 22:57:11 +07:00
parent 69c46b2f9a
commit 06bb9ad7a7
20 changed files with 89 additions and 78 deletions

View File

@@ -50,7 +50,10 @@
#include "descriptor_cdc.h"
#include "cdc_host.h"
#if TUSB_CFG_HOST_CDC_RNDIS // TODO enable
#include "cdc_rndis_host.h"
#endif
static uint8_t dev_addr;
static uint16_t length;

View File

@@ -36,6 +36,14 @@
*/
/**************************************************************************/
void setUp(void)
{
}
void tearDown(void)
{
}
#if 0 // TODO enable
#include "stdlib.h"
#include "unity.h"
#include "tusb_option.h"
@@ -305,3 +313,4 @@ void test_rndis_initialization_sequence_ok(void)
TEST_ASSERT_EQUAL(msg_init_cmplt.max_xfer_size, p_rndis->max_xfer_size);
TEST_ASSERT_EQUAL_HEX8_ARRAY("CAFEBB", p_rndis->mac_address, 6);
}
#endif

View File

@@ -321,6 +321,6 @@ void test_enum_set_configure(void)
usbh_enumeration_task(NULL);
TEST_ASSERT_EQUAL(TUSB_CLASS_FLAG_HID | TUSB_CLASS_FLAG_MSC | TUSB_CLASS_FLAG_CDC,
TEST_ASSERT_EQUAL( BIT_(TUSB_CLASS_HID) | BIT_(TUSB_CLASS_MSC) | BIT_(TUSB_CLASS_CDC),
usbh_devices[1].flag_supported_class); // TODO change later
}

View File

@@ -161,7 +161,7 @@ void test_usbh_hcd_rhport_unplugged_isr(void)
usbh_devices[dev_addr].core_id = 0;
usbh_devices[dev_addr].hub_addr = 0;
usbh_devices[dev_addr].hub_port = 0;
usbh_devices[dev_addr].flag_supported_class = TUSB_CLASS_FLAG_HID;
usbh_devices[dev_addr].flag_supported_class = BIT_(TUSB_CLASS_HID);
hidh_close_Expect(dev_addr);
hcd_pipe_control_close_ExpectAndReturn(dev_addr, TUSB_ERROR_NONE);
@@ -180,7 +180,7 @@ void test_usbh_device_unplugged_multple_class(void)
usbh_devices[dev_addr].core_id = 0;
usbh_devices[dev_addr].hub_addr = 0;
usbh_devices[dev_addr].hub_port = 0;
usbh_devices[dev_addr].flag_supported_class = TUSB_CLASS_FLAG_HID | TUSB_CLASS_FLAG_MSC | TUSB_CLASS_FLAG_CDC;
usbh_devices[dev_addr].flag_supported_class = BIT_(TUSB_CLASS_HID) | BIT_(TUSB_CLASS_MSC) | BIT_(TUSB_CLASS_CDC);
cdch_close_Expect(dev_addr);
hidh_close_Expect(dev_addr);

View File

@@ -40,6 +40,16 @@
#undef TUSB_CFG_OS
#endif
void setUp(void)
{
}
void tearDown(void)
{
}
#if 0 // TODO enable
#include "unity.h"
#include "tusb_errors.h"
#include "osal_none.h"
@@ -432,3 +442,4 @@ void test_task_flow_control_assert_status_hanlder(void)
TEST_ASSERT_EQUAL(0, statements[3]);
TEST_ASSERT_EQUAL(1, statements[5]);
}
#endif

View File

@@ -58,9 +58,10 @@
#define TUSB_CFG_HOST_HUB 1
#define TUSB_CFG_HOST_HID_KEYBOARD 1
#define TUSB_CFG_HOST_HID_MOUSE 1
#define TUSB_CFG_HOST_HID_GENERIC 0
#define TUSB_CFG_HOST_MSC 1
#define TUSB_CFG_HOST_CDC 1
#define TUSB_CFG_HOST_CDC_RNDIS 1
#define TUSB_CFG_HOST_CDC_RNDIS 0
// Test support
#define TEST_CONTROLLER_HOST_START_INDEX \