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

rename TUSB_OPT_DEVICE_ENABLED to CFG_TUD_ENABLED 

TUSB_OPT_DEVICE_ENABLED still usable for backward compatible
This commit is contained in:
hathach 2022-02-23 21:46:40 +07:00
parent 4a5a53b3b8
commit d10326cb4e
59 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/bsp/board.h
View File

@ -120,7 +120,7 @@ static inline void board_delay(uint32_t ms)
uint32_t start_ms = board_millis();
while (board_millis() - start_ms < ms)
{
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
// take chance to run usb background
tud_task();
#endif

6
hw/bsp/brtmm90x/family.c
View File

@ -30,7 +30,7 @@
#include <registers/ft900_registers.h>
#include <ft900.h>
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
int8_t board_ft90x_vbus(void); // Board specific implementation of VBUS detection for USB device.
extern void ft90x_usbd_pm_ISR(uint16_t pmcfg); // Interrupt handler for USB device power management
#endif
@ -152,14 +152,14 @@ void board_pm_ISR(void)
MASK_SYS_PMCFG_HOST_RESUME_DEV)
)
{
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
ft90x_usbd_pm_ISR(pmcfg);
#endif
}
#endif
}
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
int8_t board_ft90x_vbus(void)
{
return gpio_read(USBD_VBUS_DTC_PIN);

2
hw/bsp/d5035_01/d5035_01.c
View File

@ -270,7 +270,7 @@ void board_init(void)
#endif
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
#if CFG_TUSB_DEBUG >= 2
uart_send_str(BOARD_NAME " USB device enabled\n");
#endif

2
hw/bsp/da14695_dk_usb/da14695_dk_usb.c
View File

@ -73,7 +73,7 @@ void board_init(void)
// 1ms tick timer
SysTick_Config(SystemCoreClock / 1000);
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
// This board is USB powered there is no need to monitor
// VBUS line. Notify driver that VBUS is present.
tusb_vbus_changed(true);

4
hw/bsp/da1469x_dk_pro/da1469x-dk-pro.c
View File

@ -36,7 +36,7 @@ void USB_IRQHandler(void)
tud_int_handler(0);
}
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
// DA146xx driver function that must be called whenever VBUS changes
extern void tusb_vbus_changed(bool present);
@ -85,7 +85,7 @@ void board_init(void)
// 1ms tick timer
SysTick_Config(SystemCoreClock / 1000);
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
// Setup interrupt for both connect and disconnect
CRG_TOP->VBUS_IRQ_MASK_REG = CRG_TOP_VBUS_IRQ_MASK_REG_VBUS_IRQ_EN_FALL_Msk |
CRG_TOP_VBUS_IRQ_MASK_REG_VBUS_IRQ_EN_RISE_Msk;

2
hw/bsp/frdm_kl25z/frdm_kl25z.c
View File

@ -42,7 +42,7 @@ void USB0_IRQHandler(void)
#if TUSB_OPT_HOST_ENABLED
tuh_int_handler(0);
#endif
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
tud_int_handler(0);
#endif
}

2
hw/bsp/lpcxpresso1769/lpcxpresso1769.c
View File

@ -156,7 +156,7 @@ void board_init(void)
// 0x1B // Host + Device + OTG + AHB
};
uint32_t const clk_en = TUSB_OPT_DEVICE_ENABLED ? USBCLK_DEVCIE : USBCLK_HOST;
uint32_t const clk_en = CFG_TUD_ENABLED ? USBCLK_DEVCIE : USBCLK_HOST;
LPC_USB->OTGClkCtrl = clk_en;
while ( (LPC_USB->OTGClkSt & clk_en) != clk_en );

2
hw/bsp/mbed1768/mbed1768.c
View File

@ -130,7 +130,7 @@ void board_init(void)
// 0x1B // Host + Device + OTG + AHB
};
uint32_t const clk_en = TUSB_OPT_DEVICE_ENABLED ? USBCLK_DEVCIE : USBCLK_HOST;
uint32_t const clk_en = CFG_TUD_ENABLED ? USBCLK_DEVCIE : USBCLK_HOST;
LPC_USB->OTGClkCtrl = clk_en;
while ( (LPC_USB->OTGClkSt & clk_en) != clk_en );

4
hw/bsp/msp432e4/family.c
View File

@ -36,7 +36,7 @@ void USB0_IRQHandler(void)
#if TUSB_OPT_HOST_ENABLED
tuh_int_handler(0);
#endif
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
tud_int_handler(0);
#endif
}
@ -148,7 +148,7 @@ void board_init(void)
USB0->GPCS = USB_GPCS_DEVMOD_OTG;
USB0->EPC = USB_EPC_EPENDE | USB_EPC_EPEN_HIGH;
#endif
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
USB0->GPCS = USB_GPCS_DEVMOD_DEVVBUS;
#endif
}

2
hw/bsp/nrf/family.c
View File

@ -100,7 +100,7 @@ void board_init(void)
nrfx_uarte_init(&_uart_id, &uart_cfg, NULL); //uart_handler);
//------------- USB -------------//
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
// Priorities 0, 1, 4 (nRF52) are reserved for SoftDevice
// 2 is highest for application
NVIC_SetPriority(USBD_IRQn, 2);

2
hw/bsp/rp2040/family.c
View File

@ -138,7 +138,7 @@ void board_init(void)
#endif
// todo probably set up device mode?
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
#endif

2
hw/bsp/rx/boards/rx65n_target/rx65n_target.c
View File

@ -179,7 +179,7 @@ void INT_Excep_USB0_USBI0(void)
#if TUSB_OPT_HOST_ENABLED
tuh_int_handler(0);
#endif
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
tud_int_handler(0);
#endif
}

2
hw/bsp/same54xplainedpro/same54xplainedpro.c
View File

@ -223,7 +223,7 @@ void board_init(void)
#endif
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
#if CFG_TUSB_DEBUG >= 2
uart_send_str(BOARD_NAME " USB device enabled\n");
#endif

2
hw/bsp/tm4c123/family.c
View File

@ -11,7 +11,7 @@ void USB0_Handler(void)
tuh_int_handler(0);
#endif
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
tud_int_handler(0);
#endif
}

4
src/class/audio/audio_device.c
View File

@ -50,7 +50,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_AUDIO)
#if (CFG_TUD_ENABLED && CFG_TUD_AUDIO)
//--------------------------------------------------------------------+
// INCLUDE
@ -2291,4 +2291,4 @@ uint8_t audiod_get_audio_fct_idx(audiod_function_t * audio)
return 0;
}
#endif //TUSB_OPT_DEVICE_ENABLED && CFG_TUD_AUDIO
#endif //CFG_TUD_ENABLED && CFG_TUD_AUDIO

2
src/class/bth/bth_device.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_BTH)
#if (CFG_TUD_ENABLED && CFG_TUD_BTH)
//--------------------------------------------------------------------+
// INCLUDE

2
src/class/cdc/cdc_device.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_CDC)
#if (CFG_TUD_ENABLED && CFG_TUD_CDC)
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/class/dfu/dfu_device.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_DFU)
#if (CFG_TUD_ENABLED && CFG_TUD_DFU)
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/class/dfu/dfu_rt_device.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_DFU_RUNTIME)
#if (CFG_TUD_ENABLED && CFG_TUD_DFU_RUNTIME)
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/class/hid/hid_device.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_HID)
#if (CFG_TUD_ENABLED && CFG_TUD_HID)
//--------------------------------------------------------------------+
// INCLUDE

2
src/class/midi/midi_device.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_MIDI)
#if (CFG_TUD_ENABLED && CFG_TUD_MIDI)
//--------------------------------------------------------------------+
// INCLUDE

2
src/class/msc/msc_device.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_MSC)
#if (CFG_TUD_ENABLED && CFG_TUD_MSC)
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/class/net/ecm_rndis_device.c
View File

@ -27,7 +27,7 @@
#include "tusb_option.h"
#if ( TUSB_OPT_DEVICE_ENABLED && CFG_TUD_ECM_RNDIS )
#if ( CFG_TUD_ENABLED && CFG_TUD_ECM_RNDIS )
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/class/net/ncm_device.c
View File

@ -28,7 +28,7 @@
#include "tusb_option.h"
#if ( TUSB_OPT_DEVICE_ENABLED && CFG_TUD_NCM )
#if ( CFG_TUD_ENABLED && CFG_TUD_NCM )
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/class/usbtmc/usbtmc_device.c
View File

@ -68,7 +68,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_USBTMC)
#if (CFG_TUD_ENABLED && CFG_TUD_USBTMC)
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/class/vendor/vendor_device.c vendored
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_VENDOR)
#if (CFG_TUD_ENABLED && CFG_TUD_VENDOR)
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/class/video/video_device.c
View File

@ -27,7 +27,7 @@
#include "tusb_option.h"
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_VIDEO && CFG_TUD_VIDEO_STREAMING)
#if (CFG_TUD_ENABLED && CFG_TUD_VIDEO && CFG_TUD_VIDEO_STREAMING)
#include "device/usbd.h"
#include "device/usbd_pvt.h"

2
src/device/usbd.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
#include "tusb.h"
#include "device/usbd.h"

2
src/device/usbd_control.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
#include "tusb.h"
#include "device/usbd_pvt.h"

2
src/portable/bridgetek/ft9xx/dcd_ft9xx.c
View File

@ -31,7 +31,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
(CFG_TUSB_MCU == OPT_MCU_FT90X || CFG_TUSB_MCU == OPT_MCU_FT93X)
#include <stdint.h>

2
src/portable/broadcom/synopsys/dcd_synopsys.c
View File

@ -29,7 +29,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
(CFG_TUSB_MCU == OPT_MCU_BCM2711 ) \

2
src/portable/chipidea/ci_hs/dcd_ci_hs.c
View File

@ -27,7 +27,7 @@
#include "tusb_option.h"
#include "device/dcd_attr.h"
#if TUSB_OPT_DEVICE_ENABLED && defined(DCD_ATTR_CONTROLLER_CHIPIDEA_HS)
#if CFG_TUD_ENABLED && defined(DCD_ATTR_CONTROLLER_CHIPIDEA_HS)
//--------------------------------------------------------------------+
// INCLUDE

2
src/portable/dialog/da146xx/dcd_da146xx.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_DA1469X
#if CFG_TUD_ENABLED && CFG_TUSB_MCU == OPT_MCU_DA1469X
#include "mcu/mcu.h"

2
src/portable/espressif/esp32sx/dcd_esp32sx.c
View File

@ -28,7 +28,7 @@
#include "tusb_option.h"
#if (((CFG_TUSB_MCU == OPT_MCU_ESP32S2) || (CFG_TUSB_MCU == OPT_MCU_ESP32S3)) && TUSB_OPT_DEVICE_ENABLED)
#if (((CFG_TUSB_MCU == OPT_MCU_ESP32S2) || (CFG_TUSB_MCU == OPT_MCU_ESP32S3)) && CFG_TUD_ENABLED)
// Espressif
#include "freertos/xtensa_api.h"

2
src/portable/mentor/musb/dcd_musb.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
TU_CHECK_MCU(OPT_MCU_MSP432E4, OPT_MCU_TM4C123, OPT_MCU_TM4C129)
#if __GNUC__ > 8 && defined(__ARM_FEATURE_UNALIGNED)

2
src/portable/microchip/pic32mz/dcd_pic32mz.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_PIC32MZ
#if CFG_TUD_ENABLED && CFG_TUSB_MCU == OPT_MCU_PIC32MZ
#include <common/tusb_common.h>
#include <device/dcd.h>

2
src/portable/microchip/samd/dcd_samd.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
(CFG_TUSB_MCU == OPT_MCU_SAMD11 || CFG_TUSB_MCU == OPT_MCU_SAMD21 || \
CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X || \
CFG_TUSB_MCU == OPT_MCU_SAML22 || CFG_TUSB_MCU == OPT_MCU_SAML21)

2
src/portable/microchip/samx7x/dcd_samx7x.c
View File

@ -27,7 +27,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMX7X
#if CFG_TUD_ENABLED && CFG_TUSB_MCU == OPT_MCU_SAMX7X
#include "device/dcd.h"
#include "sam.h"

2
src/portable/mindmotion/mm32/dcd_mm32f327x_otg.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_MM32F327X )
#if CFG_TUD_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_MM32F327X )
#include "reg_usb_otg_fs.h"
#include "mm32_device.h"

2
src/portable/nordic/nrf5x/dcd_nrf5x.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_NRF5X
#if CFG_TUD_ENABLED && CFG_TUSB_MCU == OPT_MCU_NRF5X
#include "nrf.h"
#include "nrf_clock.h"

2
src/portable/nuvoton/nuc120/dcd_nuc120.c
View File

@ -35,7 +35,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_NUC120)
#if CFG_TUD_ENABLED && (CFG_TUSB_MCU == OPT_MCU_NUC120)
#include "device/dcd.h"
#include "NUC100Series.h"

2
src/portable/nuvoton/nuc121/dcd_nuc121.c
View File

@ -35,7 +35,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && ( (CFG_TUSB_MCU == OPT_MCU_NUC121) || (CFG_TUSB_MCU == OPT_MCU_NUC126) )
#if CFG_TUD_ENABLED && ( (CFG_TUSB_MCU == OPT_MCU_NUC121) || (CFG_TUSB_MCU == OPT_MCU_NUC126) )
#include "device/dcd.h"
#include "NuMicro.h"

2
src/portable/nuvoton/nuc505/dcd_nuc505.c
View File

@ -35,7 +35,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_NUC505)
#if CFG_TUD_ENABLED && (CFG_TUSB_MCU == OPT_MCU_NUC505)
#include "device/dcd.h"
#include "NUC505Series.h"

2
src/portable/nxp/khci/dcd_khci.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && ( \
#if CFG_TUD_ENABLED && ( \
( CFG_TUSB_MCU == OPT_MCU_MKL25ZXX ) || ( CFG_TUSB_MCU == OPT_MCU_K32L2BXX ) \
)

2
src/portable/nxp/lpc17_40/dcd_lpc17_40.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
(CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
#include "device/dcd.h"

2
src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
View File

@ -34,7 +34,7 @@
* - LPC54114
* - LPC55s69
*/
#if TUSB_OPT_DEVICE_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_LPC11UXX || \
#if CFG_TUD_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_LPC11UXX || \
CFG_TUSB_MCU == OPT_MCU_LPC13XX || \
CFG_TUSB_MCU == OPT_MCU_LPC15XX || \
CFG_TUSB_MCU == OPT_MCU_LPC51UXX || \

2
src/portable/nxp/transdimension/dcd_transdimension.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
(CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX)
#warning "transdimenion is renamed to chipidea (portable/chipidea/ci_hs) to match other opensource naming convention such as linux. This file will be removed in the future, please update your makefile accordingly"

2
src/portable/raspberrypi/rp2040/dcd_rp2040.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_RP2040
#if CFG_TUD_ENABLED && CFG_TUSB_MCU == OPT_MCU_RP2040
#include "pico.h"
#include "rp2040_usb.h"

2
src/portable/renesas/usba/dcd_usba.c
View File

@ -31,7 +31,7 @@
// We disable SOF for now until needed later on
#define USE_SOF 0
#if TUSB_OPT_DEVICE_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_RX63X || \
#if CFG_TUD_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_RX63X || \
CFG_TUSB_MCU == OPT_MCU_RX65X || \
CFG_TUSB_MCU == OPT_MCU_RX72N )
#include "device/dcd.h"

2
src/portable/sony/cxd56/dcd_cxd56.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_CXD56
#if CFG_TUD_ENABLED && CFG_TUSB_MCU == OPT_MCU_CXD56
#include <errno.h>
#include <nuttx/usb/usbdev.h>

2
src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
View File

@ -109,7 +109,7 @@
#define STM32F1_FSDEV
#endif
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
( TU_CHECK_MCU(OPT_MCU_STM32F0, OPT_MCU_STM32F3, OPT_MCU_STM32L0, OPT_MCU_STM32L1, OPT_MCU_STM32G4) || \
(TU_CHECK_MCU(OPT_MCU_STM32F1) && defined(STM32F1_FSDEV)) \
)

2
src/portable/st/synopsys/dcd_synopsys.c
View File

@ -45,7 +45,7 @@
#define STM32L4_SYNOPSYS
#endif
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
( (CFG_TUSB_MCU == OPT_MCU_STM32F1 && defined(STM32F1_SYNOPSYS)) || \
CFG_TUSB_MCU == OPT_MCU_STM32F2 || \
CFG_TUSB_MCU == OPT_MCU_STM32F4 || \

2
src/portable/sunxi/dcd_sunxi_musb.c
View File

@ -29,7 +29,7 @@
#include <stdint.h>
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_F1C100S
#if CFG_TUD_ENABLED && CFG_TUSB_MCU == OPT_MCU_F1C100S
#include "osal/osal.h"
#include <f1c100s-irq.h>

2
src/portable/synopsys/dwc2/dcd_dwc2.c
View File

@ -30,7 +30,7 @@
#include "tusb_option.h"
#include "device/dcd_attr.h"
#if TUSB_OPT_DEVICE_ENABLED && \
#if CFG_TUD_ENABLED && \
( defined(DCD_ATTR_DWC2_STM32) || \
TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3, OPT_MCU_GD32VF103) || \
TU_CHECK_MCU(OPT_MCU_EFM32GG, OPT_MCU_BCM2711, OPT_MCU_BCM2835) || \

2
src/portable/ti/msp430x5xx/dcd_msp430x5xx.c
View File

@ -27,7 +27,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_MSP430x5xx )
#if CFG_TUD_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_MSP430x5xx )
#include "msp430.h"
#include "device/dcd.h"

2
src/portable/valentyusb/eptri/dcd_eptri.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_VALENTYUSB_EPTRI)
#if CFG_TUD_ENABLED && (CFG_TUSB_MCU == OPT_MCU_VALENTYUSB_EPTRI)
#ifndef DEBUG
#define DEBUG 0

8
src/tusb.c
View File

@ -26,18 +26,18 @@
#include "tusb_option.h"
#if TUSB_OPT_HOST_ENABLED || TUSB_OPT_DEVICE_ENABLED
#if TUSB_OPT_HOST_ENABLED || CFG_TUD_ENABLED
#include "tusb.h"
// TODO clean up
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
#include "device/usbd_pvt.h"
#endif
bool tusb_init(void)
{
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
TU_ASSERT ( tud_init(TUD_OPT_RHPORT) ); // init device stack
#endif
@ -52,7 +52,7 @@ bool tusb_inited(void)
{
bool ret = false;
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
ret = ret || tud_inited();
#endif

2
src/tusb.h
View File

@ -61,7 +61,7 @@
#endif
//------------- DEVICE -------------//
#if TUSB_OPT_DEVICE_ENABLED
#if CFG_TUD_ENABLED
#include "device/usbd.h"
#if CFG_TUD_HID

5
src/tusb_option.h
View File

@ -215,7 +215,10 @@
#define TUD_OPT_HIGH_SPEED ( (CFG_TUSB_RHPORT1_MODE) & OPT_MODE_HIGH_SPEED )
#endif
#define TUSB_OPT_DEVICE_ENABLED ( TUD_OPT_RHPORT >= 0 )
#define CFG_TUD_ENABLED ( TUD_OPT_RHPORT >= 0 )
// For backward compatible
#define TUSB_OPT_DEVICE_ENABLED CFG_TUD_ENABLED
//--------------------------------------------------------------------+
// COMMON OPTIONS