aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/swlink
diff options
context:
space:
mode:
authorGareth McMullin2015-02-28 22:09:50 -0800
committerGareth McMullin2015-02-28 22:09:50 -0800
commit5eff0ab5d648408cf4df528d2be3d29b04034083 (patch)
tree695a54fb12639cad87eb9282d544fde39ccfbcf6 /src/platforms/swlink
parent48fb7ec6625000c2d93456de0649dc0b67b7d6c0 (diff)
Factor out common GPIO code in STM32 platforms.
Diffstat (limited to 'src/platforms/swlink')
-rw-r--r--src/platforms/swlink/platform.h33
1 files changed, 3 insertions, 30 deletions
diff --git a/src/platforms/swlink/platform.h b/src/platforms/swlink/platform.h
index 99c8fa3..4b26466 100644
--- a/src/platforms/swlink/platform.h
+++ b/src/platforms/swlink/platform.h
@@ -35,8 +35,8 @@
#include <alloca.h>
#include "gdb_packet.h"
+#include "gpio.h"
-#define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64
#define BOARD_IDENT "Black Magic Probe (SWLINK), (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
#define BOARD_IDENT_DFU "Black Magic (Upgrade), STM8S Discovery, (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")"
@@ -141,14 +141,6 @@ extern volatile uint32_t timeout_counter;
extern jmp_buf fatal_error_jmpbuf;
-
-#define gpio_set_val(port, pin, val) do { \
- if(val) \
- gpio_set((port), (pin)); \
- else \
- gpio_clear((port), (pin)); \
-} while(0)
-
#define led_idle_run GPIO8
#define SET_RUN_STATE(state) {running_status = (state);}
#define SET_IDLE_STATE(state) {gpio_set_val(LED_PORT, led_idle_run, state);}
@@ -180,27 +172,8 @@ void uart_usb_buf_drain(uint8_t ep);
#define sprintf siprintf
#define vasprintf vasiprintf
-#ifdef INLINE_GPIO
-static inline void _gpio_set(uint32_t gpioport, uint16_t gpios)
-{
- GPIO_BSRR(gpioport) = gpios;
-}
-#define gpio_set _gpio_set
-
-static inline void _gpio_clear(uint32_t gpioport, uint16_t gpios)
-{
- GPIO_BRR(gpioport) = gpios;
-}
-#define gpio_clear _gpio_clear
-
-static inline uint16_t _gpio_get(uint32_t gpioport, uint16_t gpios)
-{
- return (uint16_t)GPIO_IDR(gpioport) & gpios;
-}
-#define gpio_get _gpio_get
-#endif
+void disconnect_usb(void);
+void assert_boot_pin(void);
#endif
-void disconnect_usb(void);
-void assert_boot_pin(void);