kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

replace TUSB_CFG_HOST by MODE_HOST_SUPPORTED 

move stuffs around
This commit is contained in:
hathach 2013-03-04 17:07:14 +07:00
parent 94c004724c
commit e1033b9b3c
10 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demos/host/tusb_config.h
View File

@ -58,13 +58,12 @@
//--------------------------------------------------------------------+
// CONTROLLER CONFIGURATION
//--------------------------------------------------------------------+
#define TUSB_CFG_CONTROLLER0_MODE TUSB_MODE_HOST
#define TUSB_CFG_CONTROLLER1_MODE TUSB_MODE_HOST
#define TUSB_CFG_CONTROLLER0_MODE (TUSB_MODE_HOST)
#define TUSB_CFG_CONTROLLER1_MODE (TUSB_MODE_HOST)
//--------------------------------------------------------------------+
// HOST CONFIGURATION
//--------------------------------------------------------------------+
#define TUSB_CFG_HOST
//------------- CONTROLLER -------------//
#define TUSB_CFG_HOST_CONTROLLER_START_INDEX 0

2
tests/test/support/tusb_config.h
View File

@ -64,8 +64,6 @@
//--------------------------------------------------------------------+
// HOST CONFIGURATION
//--------------------------------------------------------------------+
#define TUSB_CFG_HOST
//------------- CORE -------------//
#define TUSB_CFG_HOST_CONTROLLER_START_INDEX 0

2
tinyusb/class/hid_host.c
View File

@ -37,7 +37,7 @@
#include "tusb_option.h"
#if defined TUSB_CFG_HOST && defined HOST_CLASS_HID
#if (MODE_HOST_SUPPORTED && defined HOST_CLASS_HID)
#define _TINY_USB_SOURCE_FILE_

2
tinyusb/host/ehci/ehci.c
View File

@ -37,7 +37,7 @@
#include "common/common.h"
#if defined TUSB_CFG_HOST && (MCU == MCU_LPC43XX || MCU == MCU_LPC18XX)
#if MODE_HOST_SUPPORTED && (MCU == MCU_LPC43XX || MCU == MCU_LPC18XX)
//--------------------------------------------------------------------+
// INCLUDE
//--------------------------------------------------------------------+

2
tinyusb/host/hcd.c
View File

@ -37,7 +37,7 @@
#include "hcd.h"
#ifdef TUSB_CFG_HOST
#if MODE_HOST_SUPPORTED
#endif

2
tinyusb/host/usbh.c
View File

@ -37,7 +37,7 @@
#include "common/common.h"
#ifdef TUSB_CFG_HOST
#if MODE_HOST_SUPPORTED
#define _TINY_USB_SOURCE_FILE_

11
tinyusb/mcu_capacity.h
View File

@ -78,17 +78,6 @@
#define CAP_MODE_HOST
#endif
#define CONTROLLER_HOST_NUMBER (\
(TUSB_CFG_CONTROLLER0_MODE & TUSB_MODE_HOST) ? 1 : 0\
+(TUSB_CFG_CONTROLLER1_MODE & TUSB_MODE_HOST) ? 1 : 0)
#define CONTROLLER_DEVICE_NUMBER (\
(TUSB_CFG_CONTROLLER0_MODE & TUSB_MODE_DEVICE) ? 1 : 0\
+(TUSB_CFG_CONTROLLER1_MODE & TUSB_MODE_DEVICE) ? 1 : 0)
#define MODE_HOST (CONTROLLER_HOST_NUMBER > 0)
#define MODE_DEVICE (CONTROLLER_DEVICE_NUMBER > 0)
//--------------------------------------------------------------------+
// Validation
//--------------------------------------------------------------------+

2
tinyusb/tusb.c
View File

@ -43,7 +43,7 @@ tusb_error_t tusb_init(void)
{
ASSERT_STATUS( hal_init() ) ; // hardware init
#ifdef TUSB_CFG_HOST
#if MODE_HOST_SUPPORTED
ASSERT_STATUS( usbh_init() ); // host stack init
#endif

8
tinyusb/tusb.h
View File

@ -52,7 +52,7 @@
#include "hal/hal.h"
#include "osal/osal.h"
#ifdef TUSB_CFG_HOST
#if MODE_HOST_SUPPORTED
#include "host/usbh.h"
#ifdef HOST_CLASS_HID
@ -60,7 +60,7 @@
#endif
#endif
#ifdef TUSB_CFG_DEVICE
#if MODE_DEVICE_SUPPORTED
#include "device/dcd.h"
#if DEVICE_CLASS_HID
@ -72,9 +72,7 @@
#endif
#endif
#if !(defined TUSB_CFG_HOST) && !(defined TUSB_CFG_DEVICE)
#error please enable either TUSB_CFG_HOST or TUSB_CFG_DEVICE
#endif
tusb_error_t tusb_init(void);

31
tinyusb/tusb_option.h
View File

@ -63,12 +63,31 @@
#include "tusb_config.h"
#include "mcu_capacity.h"
//--------------------------------------------------------------------+
// CONTROLLER
//--------------------------------------------------------------------+
#define TUSB_MODE_HOST 0x02
#define TUSB_MODE_DEVICE 0x01
#define TUSB_MODE_NONE 0x00
#define CONTROLLER_HOST_NUMBER (\
((TUSB_CFG_CONTROLLER0_MODE & TUSB_MODE_HOST) ? 1 : 0) + \
((TUSB_CFG_CONTROLLER1_MODE & TUSB_MODE_HOST) ? 1 : 0))
#define CONTROLLER_DEVICE_NUMBER (\
((TUSB_CFG_CONTROLLER0_MODE & TUSB_MODE_DEVICE) ? 1 : 0) + \
((TUSB_CFG_CONTROLLER1_MODE & TUSB_MODE_DEVICE) ? 1 : 0))
#define MODE_HOST_SUPPORTED (CONTROLLER_HOST_NUMBER > 0)
#define MODE_DEVICE_SUPPORTED (CONTROLLER_DEVICE_NUMBER > 0)
#if !MODE_HOST_SUPPORTED && !MODE_DEVICE_SUPPORTED
#error please configure at least 1 TUSB_CFG_CONTROLLERn_MODE to TUSB_MODE_HOST and/or TUSB_MODE_DEVICE
#endif
//--------------------------------------------------------------------+
// COMMON OPTIONS
//--------------------------------------------------------------------+
#define TUSB_MODE_HOST BIN8(10)
#define TUSB_MODE_DEVICE BIN8(01)
#define TUSB_MODE_NONE BIN8(00)
/// 0: no debug information 3: most debug information provided
#ifndef TUSB_CFG_DEBUG
@ -97,9 +116,7 @@
//--------------------------------------------------------------------+
// HOST OPTIONS
//--------------------------------------------------------------------+
#ifdef TUSB_CFG_HOST
//------------- Controller -------------//
#if MODE_HOST_SUPPORTED
#ifndef TUSB_CFG_HOST_CONTROLLER_START_INDEX
#error TUSB_CFG_HOST_CONTROLLER_START_INDEX is not defined
#endif
@ -162,6 +179,8 @@
#define CDC_NOTIFICATION_EP_MAXPACKETSIZE 8
#define CDC_DATA_EP_MAXPACKET_SIZE 16
#ifdef __cplusplus
}
#endif