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

add TUSB_CFG_HOST_CONTROLLER_START_INDEX

Browse Source 
update usbh_init and test code for TUSB_CFG_HOST_CONTROLLER_START_INDEX
clean up some
This commit is contained in:
hathach
2013-02-08 12:12:10 +07:00
parent ef0e105da6
commit 489b98cb93
7 changed files with 104 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tinyusb/hal/hal.h
+3 -4
View File
@@ -51,10 +51,6 @@
#ifndef _TUSB_HAL_H_
#define _TUSB_HAL_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "tusb_option.h"
#include "common/compiler/compiler.h"
@@ -72,6 +68,9 @@
#include "hal_lpc43xx.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
/** \brief USB hardware init
*
tinyusb/host/usbh.c
+32 -27
View File
@@ -51,15 +51,25 @@
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
//--------------------------------------------------------------------+
#define ENUM_QUEUE_DEPTH 5
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
static inline uint8_t get_new_address(void) ATTR_ALWAYS_INLINE;
STATIC_ usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX+1]; // including zero-address
//------------- Enumeration Task Data -------------//
OSAL_TASK_DEF(enum_task, usbh_enumeration_task, 128, OSAL_PRIO_HIGH);
OSAL_QUEUE_DEF(enum_queue, ENUM_QUEUE_DEPTH, uin32_t);
osal_queue_handle_t enum_queue_hdl;
STATIC_ uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE] TUSB_CFG_ATTR_USBRAM;
//------------- Reporter Task Data -------------//
//------------- Helper Function Prototypes -------------//
static inline uint8_t get_new_address(void) ATTR_ALWAYS_INLINE;
//--------------------------------------------------------------------+
// PUBLIC API (Parameter Verification is required)
//--------------------------------------------------------------------+
@@ -70,22 +80,36 @@ tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device
}
//--------------------------------------------------------------------+
// ENUMERATION TASK & ITS DATA
// CLASS-USBD API (don't require to verify parameters)
//--------------------------------------------------------------------+
OSAL_TASK_DEF(enum_task, usbh_enumeration_task, 128, OSAL_PRIO_HIGH);
tusb_error_t usbh_init(void)
{
uint32_t i;
#define ENUM_QUEUE_DEPTH 5
OSAL_QUEUE_DEF(enum_queue, ENUM_QUEUE_DEPTH, uin32_t);
osal_queue_handle_t enum_queue_hdl;
STATIC_ uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE] TUSB_CFG_ATTR_USBRAM;
memclr_(usbh_device_info_pool, sizeof(usbh_device_info_t)*(TUSB_CFG_HOST_DEVICE_MAX+1));
for(i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
{
ASSERT_STATUS( hcd_init(TUSB_CFG_HOST_CONTROLLER_START_INDEX+i) );
}
ASSERT_STATUS( osal_task_create(&enum_task) );
enum_queue_hdl = osal_queue_create(&enum_queue);
ASSERT_PTR(enum_queue_hdl, TUSB_ERROR_OSAL_QUEUE_FAILED);
return TUSB_ERROR_NONE;
}
//--------------------------------------------------------------------+
// ENUMERATION TASK
//--------------------------------------------------------------------+
void usbh_enumeration_task(void)
{
tusb_error_t error;
usbh_enumerate_t enum_entry;
tusb_std_request_t request_packet;
// for OSAL_NONE local variable wont retain value after blocking service sem_wait/queue_recv
static uint8_t new_addr;
static uint8_t configure_selected = 1;
@@ -201,26 +225,7 @@ void usbh_enumeration_task(void)
//--------------------------------------------------------------------+
//--------------------------------------------------------------------+
// CLASS-USBD API (don't require to verify parameters)
//--------------------------------------------------------------------+
tusb_error_t usbh_init(void)
{
uint32_t i;
memclr_(usbh_device_info_pool, sizeof(usbh_device_info_t)*(TUSB_CFG_HOST_DEVICE_MAX+1));
for(i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
{
ASSERT_STATUS( hcd_init(i) );
}
ASSERT_STATUS( osal_task_create(&enum_task) );
enum_queue_hdl = osal_queue_create(&enum_queue);
ASSERT_PTR(enum_queue_hdl, TUSB_ERROR_OSAL_QUEUE_FAILED);
return TUSB_ERROR_NONE;
}
#endif
//--------------------------------------------------------------------+
tinyusb/osal/osal_freeRTOS.h
+4 -4
View File
@@ -51,10 +51,6 @@
#ifndef _TUSB_OSAL_FREERTOS_H_
#define _TUSB_OSAL_FREERTOS_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "osal_common.h"
//------------- FreeRTOS Headers -------------//
@@ -62,6 +58,10 @@
#include "semphr.h"
#include "queue.h"
#ifdef __cplusplus
extern "C" {
#endif
//--------------------------------------------------------------------+
// TICK API
//--------------------------------------------------------------------+
tinyusb/tusb_option.h
+4
View File
@@ -98,6 +98,10 @@
#warning TUSB_CFG_HOST_CONTROLLER_NUM is not defined, default value is 1
#endif
#ifndef TUSB_CFG_HOST_CONTROLLER_START_INDEX
#error TUSB_CFG_HOST_CONTROLLER_START_INDEX is not defined
#endif
#ifndef TUSB_CFG_HOST_DEVICE_MAX
#define TUSB_CFG_HOST_DEVICE_MAX 1
#warning TUSB_CFG_HOST_DEVICE_MAX is not defined, default value is 1