diff --git a/source/hif_hal/nxp/lpc11u35/DAP_config.h b/source/hif_hal/nxp/lpc11u35/DAP_config.h index c07361271..1a8b0bd72 100644 --- a/source/hif_hal/nxp/lpc11u35/DAP_config.h +++ b/source/hif_hal/nxp/lpc11u35/DAP_config.h @@ -34,11 +34,6 @@ Provides definitions about: // Board configuration options -// Configure nReset as open drain -#if defined(BOARD_UBLOX_C027) -#define CONF_OPENDRAIN -#endif - // Configure JTAG option #if defined(BOARD_BAMBINO_210) || defined(BOARD_BAMBINO_210E) // LPC43xx multicore targets require JTAG to debug slave cores @@ -204,15 +199,10 @@ Configures the DAP Hardware I/O pins for Serial Wire Debug (SWD) mode: static __inline void PORT_SWD_SETUP (void) { LPC_GPIO->SET[0] = PIN_SWCLK; LPC_GPIO->SET[0] = PIN_SWDIO; -#if defined(CONF_OPENDRAIN) // open drain logic LPC_GPIO->DIR[0] &= ~PIN_nRESET; LPC_GPIO->CLR[0] = PIN_nRESET; LPC_GPIO->DIR[0] |= (PIN_SWCLK | PIN_SWDIO); -#else - LPC_GPIO->SET[0] = PIN_nRESET; - LPC_GPIO->DIR[0] |= (PIN_SWCLK | PIN_SWDIO | PIN_nRESET); -#endif } /** Disable JTAG/SWD I/O Pins. @@ -222,15 +212,10 @@ Disables the DAP Hardware I/O pins which configures: static __inline void PORT_OFF (void) { LPC_GPIO->CLR[0] = PIN_SWCLK; LPC_GPIO->CLR[0] = PIN_SWDIO; -#if defined(CONF_OPENDRAIN) // open drain logic LPC_GPIO->DIR[0] &= ~PIN_nRESET; // reset not an output LPC_GPIO->CLR[0] = PIN_nRESET; LPC_GPIO->DIR[0] |= (PIN_SWCLK | PIN_SWDIO); -#else - LPC_GPIO->SET[0] = PIN_nRESET; - LPC_GPIO->DIR[0] |= (PIN_SWCLK | PIN_SWDIO | PIN_nRESET); -#endif } @@ -390,16 +375,9 @@ static __forceinline uint32_t PIN_nRESET_IN (void) { - 1: release device hardware reset. */ static __forceinline void PIN_nRESET_OUT (uint32_t bit) { -#if defined(CONF_OPENDRAIN) // open drain logic if (bit) LPC_GPIO->DIR[0] &= ~PIN_nRESET; // input (pulled high external) else LPC_GPIO->DIR[0] |= PIN_nRESET; // output (low) -#else - if (bit) - LPC_GPIO->SET[0] = (PIN_nRESET); - else - LPC_GPIO->CLR[0] = (PIN_nRESET); -#endif } ///@} @@ -459,11 +437,7 @@ static __inline void DAP_SETUP (void) { // Configure I/O pins PIN_SWCLK_TCK_IOCON = FUNC_0 | PULL_UP_ENABLED; // SWCLK/TCK PIN_SWDIO_TMS_IOCON = FUNC_0 | PULL_UP_ENABLED; // SWDIO/TMS -#if !defined(CONF_OPENDRAIN) - PIN_nRESET_IOCON = FUNC_0 | PULL_UP_ENABLED; // nRESET -#else - PIN_nRESET_IOCON = FUNC_0 | OPENDRAIN; // nRESET -#endif + PIN_nRESET_IOCON = FUNC_0 | OPENDRAIN | PULL_UP_ENABLED; // nRESET #if (DAP_JTAG != 0) PIN_TDI_IOCON = FUNC_0 | PULL_UP_ENABLED; // TDI PIN_TDO_IOCON = FUNC_0 | PULL_UP_ENABLED; // TDO