Bring back <wirish/wirish_debug.h>.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>

5 files changed, 105 insertions, 7 deletions

diff --git a/wirish/include/wirish/wirish.h b/wirish/include/wirish/wirish.h
index 6810e4f..360b502 100644
--- a/wirish/include/wirish/wirish.h
+++ b/wirish/include/wirish/wirish.h
@@ -39,7 +39,7 @@
 #include <wirish/bit_constants.h>
 #include <wirish/pwm.h>
 #include <wirish/ext_interrupts.h>
-/* FIXME put this back when you can #include <wirish/wirish_debug.h> */
+#include <wirish/wirish_debug.h>
 #include <wirish/wirish_math.h>
 #include <wirish/wirish_time.h>
 /* FIXME put this back when you can #include <wirish/HardwareSPI.h> */
diff --git a/wirish/include/wirish/wirish_debug.h b/wirish/include/wirish/wirish_debug.h
index cb1be3d..4edfd27 100644
--- a/wirish/include/wirish/wirish_debug.h
+++ b/wirish/include/wirish/wirish_debug.h
@@ -42,9 +42,7 @@
  *
  * @see enableDebugPorts()
  */
-static inline void disableDebugPorts(void) {
-    afio_cfg_debug_ports(AFIO_DEBUG_NONE);
-}
+void disableDebugPorts(void);
 
 /**
  * @brief Enable the JTAG and Serial Wire (SW) debug ports.
@@ -54,8 +52,6 @@ static inline void disableDebugPorts(void) {
  *
  * @see disableDebugPorts()
  */
-static inline void enableDebugPorts(void) {
-    afio_cfg_debug_ports(AFIO_DEBUG_FULL_SWJ);
-}
+void enableDebugPorts(void);
 
 #endif
diff --git a/wirish/rules.mk b/wirish/rules.mk
index acf4c46..5138c82 100644
--- a/wirish/rules.mk
+++ b/wirish/rules.mk
@@ -38,6 +38,7 @@ cppSRCS_$(d) +=	wirish_shift.cpp
 cppSRCS_$(d) +=	wirish_time.cpp
 cppSRCS_$(d) += $(MCU_SERIES)/boards_setup.cpp
 cppSRCS_$(d) += $(MCU_SERIES)/wirish_digital.cpp
+cppSRCS_$(d) += $(MCU_SERIES)/wirish_debug.cpp
 cppSRCS_$(d) += $(WIRISH_BOARD_PATH)/board.cpp
 # TODO: revise these appropriately for F2 and put them back in:
 # HardwareSPI.cpp
diff --git a/wirish/stm32f1/wirish_debug.cpp b/wirish/stm32f1/wirish_debug.cpp
new file mode 100644
index 0000000..28de96d
--- /dev/null
+++ b/wirish/stm32f1/wirish_debug.cpp
@@ -0,0 +1,41 @@
+/******************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2011, 2012 LeafLabs, LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *****************************************************************************/
+
+/**
+ * @file wirish/stm32f1/wirish_debug.cpp
+ * @brief High level debug port configuration
+ */
+
+#include <wirish/wirish_debug.h>
+#include <libmaple/gpio.h>
+
+void disableDebugPorts(void) {
+    afio_cfg_debug_ports(AFIO_DEBUG_NONE);
+}
+
+void enableDebugPorts(void) {
+    afio_cfg_debug_ports(AFIO_DEBUG_FULL_SWJ);
+}
diff --git a/wirish/stm32f2/wirish_debug.cpp b/wirish/stm32f2/wirish_debug.cpp
new file mode 100644
index 0000000..af6c78b
--- /dev/null
+++ b/wirish/stm32f2/wirish_debug.cpp
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2012 LeafLabs, LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *****************************************************************************/
+
+/**
+ * @file wirish/stm32f2/wirish_debug.cpp
+ * @brief High level debug port configuration
+ */
+
+#include <wirish/wirish_debug.h>
+#include <libmaple/gpio.h>
+
+// TODO is it worth optimizing these into raw MODER and AFR[LH] writes?
+
+void disableDebugPorts(void) {
+    // PA13-PA15 and PB3-PB4 are in system alternate function mode on
+    // reset, to support JTAG. Just put them in input mode to release
+    // them.
+    gpio_set_mode(GPIOA, 13, GPIO_MODE_INPUT);
+    gpio_set_mode(GPIOA, 14, GPIO_MODE_INPUT);
+    gpio_set_mode(GPIOA, 15, GPIO_MODE_INPUT);
+    gpio_set_mode(GPIOB, 3, GPIO_MODE_INPUT);
+    gpio_set_mode(GPIOB, 4, GPIO_MODE_INPUT);
+}
+
+void enableDebugPorts(void) {
+    // Put PA13-PA15 and PB3-PB4 back in system AF mode.
+    gpio_set_mode(GPIOA, 13, GPIO_MODE_AF);
+    gpio_set_mode(GPIOA, 14, GPIO_MODE_AF);
+    gpio_set_mode(GPIOA, 15, GPIO_MODE_AF);
+    gpio_set_mode(GPIOB, 3, GPIO_MODE_AF);
+    gpio_set_mode(GPIOB, 4, GPIO_MODE_AF);
+    gpio_set_af(GPIOA, 13, GPIO_AF_SYS);
+    gpio_set_af(GPIOA, 14, GPIO_AF_SYS);
+    gpio_set_af(GPIOA, 15, GPIO_AF_SYS);
+    gpio_set_af(GPIOB, 3, GPIO_AF_SYS);
+    gpio_set_af(GPIOB, 4, GPIO_AF_SYS);
+}