jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Use macro for reset so we can support ARMv6

Browse Source
This commit is contained in:
Jason Kotzin 2018-07-07 08:33:23 -07:00
parent d4d24c256c
commit f67c070b9f
7 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platforms/common/cdcacm.c
View File

@ -416,7 +416,7 @@ static void dfu_detach_complete(usbd_device *dev, struct usb_setup_data *req)
platform_request_boot();
/* Reset core to enter bootloader */
scb_reset_core();
SCB_RESET();
}
static int cdcacm_control_request(usbd_device *dev,

2
src/platforms/f4discovery/platform.h
View File

@ -35,6 +35,8 @@
#define BOARD_IDENT "Black Magic Probe (F4Discovery), (Firmware " FIRMWARE_VERSION ")"
#define DFU_IDENT "Black Magic Firmware Upgrade (F4Discovery)"
#define SCB_RESET() scb_reset_core();
/* Important pin mappings for STM32 implementation:
*
* LED0 = PD12 (Green LED : Running)

2
src/platforms/hydrabus/platform.h
View File

@ -37,6 +37,8 @@
#define BOARD_IDENT_DFU "Black Magic (Upgrade) for HydraBus, (Firmware " FIRMWARE_VERSION ")"
#define DFU_IDENT "Black Magic Firmware Upgrade (HydraBus)"
#define SCB_RESET() scb_reset_core();
/* Important pin mappings for STM32 implementation:
*
* LED0 = PA4 (Green LED : Running)

2
src/platforms/launchpad-icdi/platform.h
View File

@ -28,6 +28,8 @@
#define DFU_IDENT "Black Magic Firmware Upgrade (Launchpad)"
#define DFU_IFACE_STRING "lolwut"
#define SCB_RESET() scb_reset_core();
extern uint8_t running_status;
#define TMS_PORT GPIOA_BASE

2
src/platforms/native/platform.h
View File

@ -40,6 +40,8 @@
#define DFU_IDENT "Black Magic Firmware Upgrade"
#define UPD_IFACE_STRING "@Internal Flash /0x08000000/8*001Kg"
#define SCB_RESET() scb_reset_core();
/* Important pin mappings for STM32 implementation:
*
* LED0 = PB2 (Yellow LED : Running)

2
src/platforms/stlink/platform.h
View File

@ -44,6 +44,8 @@
#define DFU_IDENT "Black Magic Firmware Upgrade (STLINK)"
#define UPD_IFACE_STRING "@Internal Flash /0x08000000/8*001Kg"
#define SCB_RESET() scb_reset_system();
/* Hardware definitions... */
#define TDI_PORT GPIOA
#define TMS_PORT GPIOB

2
src/platforms/swlink/platform.h
View File

@ -35,6 +35,8 @@
#define DFU_IDENT "Black Magic Firmware Upgrade (SWLINK)"
#define UPD_IFACE_STRING "@Internal Flash /0x08000000/8*001Kg"
#define SCB_RESET() scb_reset_system();
/* Hardware definitions... */
#define TMS_PORT GPIOA
#define TCK_PORT GPIOA