mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-23 04:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

test clean up

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test/host/msc/test_msc_host.c
View File

@ -43,6 +43,12 @@
#include "binary.h"
#include "type_helper.h"
//#include "descriptor_test.h"
//#include "msc_host.h"
//#include "usbh.h"
//#include "hcd.h"
//#include "ehci.h"
void setUp(void)
{
}

4
tests/test/host/usbh/test_usbh.c
View File

@ -121,7 +121,7 @@ void class_init_expect(void)
void test_usbh_init_ok(void)
{
osal_queue_handle_t dummy = 0x1122;
osal_queue_handle_t q_hdl_dummy = 0x1122;
usbh_device_info_t device_info_zero[TUSB_CFG_HOST_DEVICE_MAX+1];
memclr_(device_info_zero, sizeof(usbh_device_info_t)*(TUSB_CFG_HOST_DEVICE_MAX+1));
@ -136,7 +136,7 @@ void test_usbh_init_ok(void)
}
osal_task_create_IgnoreAndReturn(TUSB_ERROR_NONE);
osal_queue_create_IgnoreAndReturn(dummy);
osal_queue_create_IgnoreAndReturn(q_hdl_dummy);
class_init_expect();

35
tests/test/support/descriptor_test.c
View File

@ -61,7 +61,7 @@ tusb_descriptor_device_t const desc_device =
.bNumConfigurations = 0x02
} ;
//
TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
const uint8_t keyboard_report_descriptor[] = {
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
@ -227,6 +227,39 @@ const app_configuration_desc_t desc_configuration =
.bInterval = 0x0A
},
//------------- Mass Storage -------------//
.msc_interface =
{
.bLength = sizeof(tusb_descriptor_interface_t),
.bDescriptorType = TUSB_DESC_INTERFACE,
.bInterfaceNumber = 3,
.bAlternateSetting = 0x00,
.bNumEndpoints = 2,
.bInterfaceClass = TUSB_CLASS_MSC,
.bInterfaceSubClass = MSC_SUBCLASS_SCSI,
.bInterfaceProtocol = MSC_PROTOCOL_BOT,
.iInterface = 0x00
},
.msc_endpoint_in =
{
.bLength = sizeof(tusb_descriptor_endpoint_t),
.bDescriptorType = TUSB_DESC_ENDPOINT,
.bEndpointAddress = 0x83,
.bmAttributes = { .xfer = TUSB_XFER_BULK },
.wMaxPacketSize = 512,
.bInterval = 1
},
.msc_endpoint_out =
{
.bLength = sizeof(tusb_descriptor_endpoint_t),
.bDescriptorType = TUSB_DESC_ENDPOINT,
.bEndpointAddress = 0x03,
.bmAttributes = { .xfer = TUSB_XFER_BULK },
.wMaxPacketSize = 512,
.bInterval = 1
},
.ConfigDescTermination = 0,
};

6
tests/test/support/descriptor_test.h
View File

@ -58,6 +58,7 @@
#include "common/common.h"
#include "class/hid.h"
#include "class/msc.h"
typedef struct
{
@ -92,6 +93,11 @@ typedef struct
tusb_hid_descriptor_hid_t mouse_hid;
tusb_descriptor_endpoint_t mouse_endpoint;
//------------- Mass Storage -------------//
tusb_descriptor_interface_t msc_interface;
tusb_descriptor_endpoint_t msc_endpoint_in;
tusb_descriptor_endpoint_t msc_endpoint_out;
unsigned char ConfigDescTermination;
} app_configuration_desc_t;

6
tests/test/support/ehci_controller.c
View File

@ -40,12 +40,10 @@
// INCLUDE
//--------------------------------------------------------------------+
#include "unity.h"
#include "tusb_option.h"
#include "errors.h"
#include "binary.h"
#include "common/common.h"
#include "hal.h"
#include "ehci.h"
#include "usbh_hcd.h"
#include "ehci.h"
//--------------------------------------------------------------------+

53
tests/test/support/test_template.c
View File

@ -1,53 +0,0 @@
/**************************************************************************/
/*!
@file test_template.c
@author hathach (tinyusb.org)
@section LICENSE
Software License Agreement (BSD License)
Copyright (c) 2013, hathach (tinyusb.org)
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holders nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This file is part of the tinyusb stack.
*/
/**************************************************************************/
#include "unity.h"
void setUp(void)
{
}
void tearDown(void)
{
}
void test_()
{
// TEST_IGNORE();
}

4
tinyusb/class/hid.h
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

20
tinyusb/class/msc.h
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)
//--------------------------------------------------------------------+

3
tinyusb/host/ehci/ehci.c
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 )

2
tinyusb/host/usbh.c
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);
}
}
}
}

2
tinyusb/osal/osal_none.h
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")

9
todo.md
View File

@ -1,5 +1,8 @@
# TODO #
- [ ] display SHA commit on demo
- [ ] guideline for create a new issue
- [ ] make some doxygen documentation
- display SHA commit on demo
- guideline for create a new issue
- make some doxygen documentation
- reporter task to move callback out of isr
- test freeRTOS
- refractor for integration test