aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/Source/c_comm.c
diff options
context:
space:
mode:
authorNicolas Schodet2012-02-11 17:39:48 +0100
committerNicolas Schodet2012-02-11 17:40:50 +0100
commiteb584f8d27a856e8f4d2ddebdd1173ff04217946 (patch)
tree83bbf94ff00b0120c3e37aeb3f725561b03f1c5d /AT91SAM7S256/Source/c_comm.c
parent35d4c19a154b0b4366876783eacb13bec27d288c (diff)
parent99a4c90dee42104638933096728bebc45e28bf1a (diff)
Merge branch 'master'
Conflicts: AT91SAM7S256/SAM7S256/Include/Cstartup.S AT91SAM7S256/SAM7S256/Include/sam7s256.c AT91SAM7S256/SAM7S256/gcc/Makefile AT91SAM7S256/SAM7S256/gcc/nxt.ld AT91SAM7S256/Source/c_comm.c AT91SAM7S256/Source/c_comm.h
Diffstat (limited to 'AT91SAM7S256/Source/c_comm.c')
-rw-r--r--AT91SAM7S256/Source/c_comm.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/AT91SAM7S256/Source/c_comm.c b/AT91SAM7S256/Source/c_comm.c
index b4d3be0..42fbe2f 100644
--- a/AT91SAM7S256/Source/c_comm.c
+++ b/AT91SAM7S256/Source/c_comm.c
@@ -26,7 +26,7 @@
#include "d_bt.h"
#include <string.h>
#include <ctype.h>
-#ifdef __ARMDEBUG__
+#ifdef ARMDEBUG
#include "debug_stub.h"
#endif
@@ -454,16 +454,17 @@ UWORD cCommInterprete(UBYTE *pInBuf, UBYTE *pOutBuf, UBYTE *pLength, UBYTE C
}
break;
-#ifdef __ARMDEBUG__
+#ifdef ARMDEBUG
case DEBUG_CMD:
{
- ReturnStatus = cCommHandleDebug(&(pInBuf[0]), CmdBit, MsgLength); /* Pass everything (incl. message command byte) to function */
- /* Check that Debug Command does not expect reply */
- ReturnStatus = (0 == ((pInBuf[0]) & NO_REPLY_BIT));
- *pLength = 0;
+ ReturnStatus = cCommHandleDebug(&(pInBuf[0]), CmdBit, MsgLength); /* Pass everything (incl. message command byte) to function */
+ /* Check that Debug Command does not expect reply */
+ ReturnStatus = (0 == ((pInBuf[0]) & NO_REPLY_BIT));
+ *pLength = 0;
}
break;
#endif
+
default:
{