From 01996457c8974de5fcb02dab32210ddb99f0134a Mon Sep 17 00:00:00 2001 From: Jacob Potter Date: Sat, 24 Oct 2020 17:11:32 -0600 Subject: [PATCH] CR feedback: compare CFG_TUSB_RHPORT1_MODE instead of using new macro --- src/portable/st/synopsys/dcd_synopsys.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/portable/st/synopsys/dcd_synopsys.c b/src/portable/st/synopsys/dcd_synopsys.c index 11678857c..6edb119c1 100644 --- a/src/portable/st/synopsys/dcd_synopsys.c +++ b/src/portable/st/synopsys/dcd_synopsys.c @@ -416,9 +416,7 @@ void dcd_init (uint8_t rhport) if ( rhport == 1 ) { // On selected MCUs HS port1 can be used with external PHY via ULPI interface -#if defined(TUD_OPT_SYNOPSYS_FS_PHY) - usb_otg->GUSBCFG |= USB_OTG_GUSBCFG_PHYSEL; -#else +#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HIGH_SPEED // deactivate internal PHY usb_otg->GCCFG &= ~USB_OTG_GCCFG_PWRDWN; @@ -427,6 +425,8 @@ void dcd_init (uint8_t rhport) // Select default internal VBUS Indicator and Drive for ULPI usb_otg->GUSBCFG &= ~(USB_OTG_GUSBCFG_ULPIEVBUSD | USB_OTG_GUSBCFG_ULPIEVBUSI); +#else + usb_otg->GUSBCFG |= USB_OTG_GUSBCFG_PHYSEL; #endif #if defined(USB_HS_PHYC) @@ -470,11 +470,11 @@ void dcd_init (uint8_t rhport) set_speed(rhport, TUD_OPT_HIGH_SPEED ? TUSB_SPEED_HIGH : TUSB_SPEED_FULL); - // Enable internal USB transceiver. Unconditional if using FS PHY on HS core. -#if defined(TUD_OPT_SYNOPSYS_FS_PHY) - usb_otg->GCCFG |= USB_OTG_GCCFG_PWRDWN; -#else + // Enable internal USB transceiver, unless using HS core (port 1) with external PHY. +#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HIGH_SPEED if ( rhport == 0 ) usb_otg->GCCFG |= USB_OTG_GCCFG_PWRDWN; +#else + usb_otg->GCCFG |= USB_OTG_GCCFG_PWRDWN; #endif