contrib: enable cortex-m0 and cortex-m4 libdcc support

[openocd.git] / contrib / libdcc / dcc_stdio.c

diff --git a/contrib/libdcc/dcc_stdio.c b/contrib/libdcc/dcc_stdio.c
index 1a7eef40f6be818a0163b10b6179d8d0b812abf5..356ddbdaf2667f3ee2b03c3d0a420db44b3991c9 100644 (file)
--- a/contrib/libdcc/dcc_stdio.c
+++ b/contrib/libdcc/dcc_stdio.c
@@ -24,9 +24,14 @@
 
 #include "dcc_stdio.h"
 
-#if defined(__ARM_ARCH_7M__)
+#define TARGET_REQ_TRACEMSG                                    0x00
+#define TARGET_REQ_DEBUGMSG_ASCII                      0x01
+#define TARGET_REQ_DEBUGMSG_HEXMSG(size)       (0x01 | ((size & 0xff) << 8))
+#define TARGET_REQ_DEBUGCHAR                           0x02
+
+#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_6SM__)
 
-/* we use the cortex_m3 DCRDR reg to simulate a arm7_9 dcc channel
+/* we use the System Control Block DCRDR reg to simulate a arm7_9 dcc channel
  * DCRDR[7:0] is used by target for status
  * DCRDR[15:8] is used by target for write buffer
  * DCRDR[23:16] is used for by host for status
@@ -34,11 +39,6 @@
 
 #define NVIC_DBG_DATA_R                (*((volatile unsigned short *)0xE000EDF8))
 
-#define TARGET_REQ_TRACEMSG                                    0x00
-#define TARGET_REQ_DEBUGMSG_ASCII                      0x01
-#define TARGET_REQ_DEBUGMSG_HEXMSG(size)       (0x01 | ((size & 0xff) << 8))
-#define TARGET_REQ_DEBUGCHAR                           0x02
-
 #define        BUSY    1
 
 void dbg_write(unsigned long dcc_data)
@@ -56,7 +56,7 @@ void dbg_write(unsigned long dcc_data)
        }
 }
 
-#elif defined(__ARM_ARCH_4T__) || defined(__ARM_ARCH_5TE__)
+#elif defined(__ARM_ARCH_4T__) || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5T__)
 
 void dbg_write(unsigned long dcc_data)
 {
@@ -99,7 +99,7 @@ void dbg_write_u16(const unsigned short *val, long len)
 
        while (len > 0)
        {
-               dcc_data = val[0] 
+               dcc_data = val[0]
                        | ((len > 1) ? val[1] << 16: 0x0000);
 
                dbg_write(dcc_data);
@@ -145,7 +145,7 @@ void dbg_write_str(const char *msg)
                        | ((len > 2) ? msg[2] << 16 : 0x00)
                        | ((len > 3) ? msg[3] << 24 : 0x00);
                dbg_write(dcc_data);
-               
+
                msg += 4;
                len -= 4;
        }