aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/stm32
diff options
context:
space:
mode:
authorUwe Bonnes2013-01-16 19:37:37 +0100
committerUwe Bonnes2013-01-21 11:02:44 +0100
commit8b1ec3151fd49bf31cb0a3fd719de5c061f8dce8 (patch)
treec25d07ce898d315ebf6ea56b57ad248ff8981403 /src/platforms/stm32
parent7e91f68efa13e7a2b510d2631a916209d4317f9b (diff)
usbuart, jtagtap, swdptap: Factor out GPIO setup
Diffstat (limited to 'src/platforms/stm32')
-rw-r--r--src/platforms/stm32/jtagtap.c4
-rw-r--r--src/platforms/stm32/swdptap.c10
-rw-r--r--src/platforms/stm32/usbuart.c4
3 files changed, 7 insertions, 11 deletions
diff --git a/src/platforms/stm32/jtagtap.c b/src/platforms/stm32/jtagtap.c
index a98c1d2..d6e298b 100644
--- a/src/platforms/stm32/jtagtap.c
+++ b/src/platforms/stm32/jtagtap.c
@@ -25,11 +25,11 @@
#include "general.h"
#include "jtagtap.h"
+#include "platform.h"
int jtagtap_init(void)
{
- gpio_set_mode(TMS_PORT, GPIO_MODE_OUTPUT_50_MHZ,
- GPIO_CNF_OUTPUT_PUSHPULL, TMS_PIN);
+ TMS_SET_MODE();
/* Go to JTAG mode for SWJ-DP */
for(int i = 0; i <= 50; i++) jtagtap_next(1, 0); /* Reset SW-DP */
diff --git a/src/platforms/stm32/swdptap.c b/src/platforms/stm32/swdptap.c
index dceb23e..72fb0f9 100644
--- a/src/platforms/stm32/swdptap.c
+++ b/src/platforms/stm32/swdptap.c
@@ -38,14 +38,12 @@ static void swdptap_turnaround(uint8_t dir)
if(dir == olddir) return;
olddir = dir;
- if(dir)
- gpio_set_mode(SWDIO_PORT, GPIO_MODE_INPUT,
- GPIO_CNF_INPUT_FLOAT, SWDIO_PIN);
+ if(dir)
+ SWDIO_MODE_FLOAT();
gpio_set(SWCLK_PORT, SWCLK_PIN);
gpio_clear(SWCLK_PORT, SWCLK_PIN);
- if(!dir)
- gpio_set_mode(SWDIO_PORT, GPIO_MODE_OUTPUT_50_MHZ,
- GPIO_CNF_OUTPUT_PUSHPULL, SWDIO_PIN);
+ if(!dir)
+ SWDIO_MODE_DRIVE();
}
static uint8_t swdptap_bit_in(void)
diff --git a/src/platforms/stm32/usbuart.c b/src/platforms/stm32/usbuart.c
index 68dac60..fac7b96 100644
--- a/src/platforms/stm32/usbuart.c
+++ b/src/platforms/stm32/usbuart.c
@@ -39,9 +39,7 @@ void usbuart_init(void)
rcc_peripheral_enable_clock(&USBUSART_APB_ENR, USBUSART_CLK_ENABLE);
- /* UART TX to 'alternate function output push-pull' */
- gpio_set_mode(USBUSART_PORT, GPIO_MODE_OUTPUT_2_MHZ,
- GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, USBUSART_TX_PIN);
+ UART_PIN_SETUP();
/* Setup UART parameters. */
usart_set_baudrate(USBUSART, 38400);