aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/armdebug/Debugger/debug_comm.S
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-01-18 15:52:21 +0800
committerTat-Chee Wan (USM)2011-01-18 15:52:21 +0800
commitce2436796136900553a308bf7b043cf3d4f2d170 (patch)
tree6c5ffc896504f23d9af1d484b4ad35d58e704988 /AT91SAM7S256/armdebug/Debugger/debug_comm.S
parent239dac94dc5debc30c194fb878dce8d804757007 (diff)
parentf9ebd55c1fb05abdc57ae119fe1fd876b5005ac2 (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebug
Diffstat (limited to 'AT91SAM7S256/armdebug/Debugger/debug_comm.S')
-rw-r--r--AT91SAM7S256/armdebug/Debugger/debug_comm.S13
1 files changed, 2 insertions, 11 deletions
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_comm.S b/AT91SAM7S256/armdebug/Debugger/debug_comm.S
index 15b9706..e801479 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_comm.S
+++ b/AT91SAM7S256/armdebug/Debugger/debug_comm.S
@@ -57,15 +57,6 @@ hex2char_lut:
/* Macros
*/
-/* _asciiz
- * Terminate string given string buffer pointer in \addrptr
- * reg is used as a scratch register (destroyed)
- *
- */
- .macro _asciiz reg, strptr
- mov \reg, #0 /* NULL character */
- strb \reg, [\strptr] /* Terminate ASCIIZ string */
- .endm
/* _hex2char_lut
* Internal routine to intialize the LUT address pointer
@@ -479,7 +470,7 @@ _copy_msg_from_usbbuf:
ldr r3, =debug_InUSBBuf
add r3, r3, #USB_GDBMSG_START
- _dbg_memcpy r2, r3, r4 /* r2 updated to point to next empty char slot in Rx buffer */
+ _dbg_memcpy r2, r3, r4, r0 /* r2 updated to point to next empty char slot in Rx buffer */
sub r4, r2, r5 /* r4: cummulative length of message */
/* Update debug_msgRxBuf_AppendPtr */
@@ -644,7 +635,7 @@ _copy_msg_to_usbbuf:
strb r0, [r3], #1 /* Message Length */
mov r2, r5 /* Copy to R2 for updating */
- _dbg_memcpy r3, r2, r4 /* This copies over the message fragment, r3, r2 updated */
+ _dbg_memcpy r3, r2, r4, r0 /* This copies over the message fragment, r3, r2 updated */
mov r5, r2 /* Updated Tx Append Pointer, keep in R5 for now */
/* Check USB bus status, transmit message if possible */