diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-04-25 21:23:00 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-04-25 22:03:25 -0400 |
| commit | 95af192c99459c56bb30763afd93582a524efc3a (patch) | |
| tree | e664f8366a82181a8e1a5e42f514651f90b72888 /wirish/boards/maple_mini.cpp | |
| parent | bf72983543f446026556e13f62d63aad2092f1ec (diff) | |
| download | librambutan-95af192c99459c56bb30763afd93582a524efc3a.tar.gz librambutan-95af192c99459c56bb30763afd93582a524efc3a.zip | |
Better debug port support.
- gpio.h: afio_mapr_swj_config() renamed afio_cfg_debug_ports()
- [new] wirish_debug.h: disableDebugPorts(), enableDebugPorts()
- Maple, Maple Native, and Maple RET6 PIN_MAPs are now larger by 5,
have mappings for the extra JTAG/SW pins.
Documentation was updated appropriately.
Diffstat (limited to 'wirish/boards/maple_mini.cpp')
| -rw-r--r-- | wirish/boards/maple_mini.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wirish/boards/maple_mini.cpp b/wirish/boards/maple_mini.cpp index cd2827d..02d62c7 100644 --- a/wirish/boards/maple_mini.cpp +++ b/wirish/boards/maple_mini.cpp @@ -32,13 +32,14 @@ #include "maple_mini.h" #include "gpio.h" +#include "wirish_debug.h" #ifdef BOARD_maple_mini /* Since we want the Serial Wire/JTAG pins as GPIOs, disable both SW * and JTAG debug support */ void boardInit(void) { - afio_mapr_swj_config(AFIO_MAPR_SWJ_NO_JTAG_NO_SW); + disableDebugPorts(); } extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = { @@ -89,7 +90,7 @@ extern const uint8 boardPWMPins[BOARD_NR_PWM_PINS] __FLASH__ = { }; extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = { - 3, 4, 5, 6, 7, 8, 9, 10, 11, 33 // NB 33 is LED + 3, 4, 5, 6, 7, 8, 9, 10, 11, 33 // NB: 33 is BOARD_LED_PIN }; #define USB_DP 23 |