summaryrefslogtreecommitdiff
path: root/AT91SAM7S256
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-02-21 10:20:26 +0800
committerTat-Chee Wan (USM)2011-02-21 10:20:26 +0800
commit7419707ba2e511f9c7f02d1c2cac4a9263719d5e (patch)
treef279f95d35c16e9633e29706abd4fb26b2435355 /AT91SAM7S256
parentddaee1d4dadc5a2bdb0816d9e92862586d2c4b58 (diff)
parentfade97cd406f8b6b437457a9bf288e73fb95c965 (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebug
Diffstat (limited to 'AT91SAM7S256')
-rw-r--r--AT91SAM7S256/armdebug/Debugger/debug_comm.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_comm.S b/AT91SAM7S256/armdebug/Debugger/debug_comm.S
index bfa3d25..aa1e36c 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_comm.S
+++ b/AT91SAM7S256/armdebug/Debugger/debug_comm.S
@@ -505,7 +505,7 @@ _copy_msg_from_usbbuf:
strne r2, [r6, #RXAPPENDPTR_OFFSET] /* Otherwise, update Append Pointer to receive next segment */
_exit_copy_msg_from_usbbuf:
- bl _dbg__usbbuf_reset /* Next USB telegram transaction */
+ bl _dbg__usb_readbuf_reset /* Next USB telegram transaction */
mov r0, r4 /* Return cummulative message length in R0 */
ldmfd sp!, {r1,r4,r5,r6,pc} /* Return segment number in R1 */
@@ -560,7 +560,7 @@ dbg__getDebugMsg:
beq _hasMsg2Copy /* Segment Number matches Expected Segment Number, update buffers */
_invalid_segment:
- bl _dbg__usbbuf_reset /* Invalid, Next USB telegram transaction */
+ bl _dbg__usb_readbuf_reset /* Invalid, Next USB telegram transaction */
mov r0, #0 /* Reset Segment Number */
str r0, [r4] /* Update current Segment Number with 0 to prepare for new message */
b exit_dbg__getMsgError /* Exit with error */