aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/swlink
diff options
context:
space:
mode:
authorGareth McMullin2015-03-02 10:16:33 -0800
committerGareth McMullin2015-03-02 10:16:33 -0800
commitb07ffffcee53e18051b324eb59a2794044ce6f95 (patch)
treed52ba33369d50f9011f286ad5ee9f0e895841e3e /src/platforms/swlink
parent4d4813de87721528fc9a06174dd1da5c245ae2f3 (diff)
Factor out common cdcacm.c from stm32 and tm4c.
Cleaned up interface to enter bootloader and read serial number.
Diffstat (limited to 'src/platforms/swlink')
-rw-r--r--src/platforms/swlink/Makefile.inc3
-rw-r--r--src/platforms/swlink/platform.c8
-rw-r--r--src/platforms/swlink/platform.h3
3 files changed, 5 insertions, 9 deletions
diff --git a/src/platforms/swlink/Makefile.inc b/src/platforms/swlink/Makefile.inc
index ff349db..b68b1ab 100644
--- a/src/platforms/swlink/Makefile.inc
+++ b/src/platforms/swlink/Makefile.inc
@@ -16,7 +16,8 @@ VPATH += platforms/stm32
SRC += cdcacm.c \
platform.c \
- usbuart.c \
+ usbuart.c \
+ serialno.c \
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex
diff --git a/src/platforms/swlink/platform.c b/src/platforms/swlink/platform.c
index 168ba2a..1b9a76e 100644
--- a/src/platforms/swlink/platform.c
+++ b/src/platforms/swlink/platform.c
@@ -118,7 +118,7 @@ const char *platform_target_voltage(void)
return "unknown";
}
-void disconnect_usb(void)
+void platform_request_boot(void)
{
/* Disconnect USB cable by resetting USB Device and pulling USB_DP low*/
rcc_periph_reset_pulse(RST_USB);
@@ -127,10 +127,8 @@ void disconnect_usb(void)
gpio_clear(GPIOA, GPIO12);
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_OPENDRAIN, GPIO12);
-}
-void assert_boot_pin(void)
-{
+ /* Assert bootloader pin */
uint32_t crl = GPIOA_CRL;
rcc_periph_clock_enable(RCC_GPIOA);
/* Enable Pull on GPIOA1. We don't rely on the external pin
@@ -141,4 +139,4 @@ void assert_boot_pin(void)
crl |= 0x80;
GPIOA_CRL = crl;
}
-void setup_vbus_irq(void){};
+
diff --git a/src/platforms/swlink/platform.h b/src/platforms/swlink/platform.h
index dec5548..6ee4a9c 100644
--- a/src/platforms/swlink/platform.h
+++ b/src/platforms/swlink/platform.h
@@ -146,8 +146,5 @@ extern jmp_buf fatal_error_jmpbuf;
#define sprintf siprintf
#define vasprintf vasiprintf
-void disconnect_usb(void);
-void assert_boot_pin(void);
-
#endif