test clean up

This commit is contained in:
hathach
2013-05-09 12:49:52 +07:00
parent 363b22a55d
commit 63add70139
12 changed files with 82 additions and 68 deletions

View File

@@ -46,12 +46,12 @@
#ifndef _TUSB_HID_H_
#define _TUSB_HID_H_
#include "common/common.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "common/common.h"
enum {
HID_SUBCLASS_NONE = 0,
HID_SUBCLASS_BOOT = 1

View File

@@ -52,6 +52,26 @@
extern "C" {
#endif
//--------------------------------------------------------------------+
// USB Class Constant
//--------------------------------------------------------------------+
enum {
MSC_SUBCLASS_RBC = 1 ,
MSC_SUBCLASS_SFF_MMC ,
MSC_SUBCLASS_QIC ,
MSC_SUBCLASS_UFI ,
MSC_SUBCLASS_SFF ,
MSC_SUBCLASS_SCSI
};
// CBI only approved to use with full-speed floopy disk & should not used with highspeed or device other than floopy
enum {
MSC_PROTOCOL_CBI = 0,
MSC_PROTOCOL_CBI_NO_INTERRUPT = 1,
MSC_PROTOCOL_BOT = 0x50
};
//--------------------------------------------------------------------+
// SCSI Primary Command (SPC-4)
//--------------------------------------------------------------------+

View File

@@ -533,11 +533,12 @@ void async_list_process_isr(ehci_qhd_t * const async_head)
void period_list_process_isr(uint8_t hostid, uint8_t interval_ms)
{
uint8_t max_loop = 0;
uint32_t const period_1ms_addr = (uint32_t) get_period_head(hostid, 1);
ehci_link_t next_item = * get_period_head(hostid, interval_ms);
// TODO abstract max loop guard for period
while( !next_item.terminate &&
!(interval_ms > 1 && align32(next_item.address) == (uint32_t) get_period_head(hostid, 1)) &&
!(interval_ms > 1 && period_1ms_addr == align32(next_item.address)) &&
max_loop < (EHCI_MAX_QHD + EHCI_MAX_ITD + EHCI_MAX_SITD))
{
switch ( next_item.type )

View File

@@ -243,7 +243,7 @@ void usbh_device_unplugged_isr(uint8_t hostid)
usbh_class_drivers[class_code].close)
{
usbh_class_drivers[class_code].close(dev_addr);
}
}
}
}

View File

@@ -147,7 +147,7 @@ static inline volatile uint32_t osal_tick_get(void)
#define SUBTASK_ASSERT(condition) \
ASSERT_DEFINE_WITH_HANDLER(_SUBTASK_ASSERT_ERROR_HANDLER, , , \
(condition), TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false")
// TODO remove assert with handler by catching error in enum main task
#define SUBTASK_ASSERT_WITH_HANDLER(condition, func_call) \
ASSERT_DEFINE_WITH_HANDLER(_SUBTASK_ASSERT_ERROR_HANDLER, func_call, ,\
condition, TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false")