aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/armdebug
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-05-23 14:56:17 +0800
committerTat-Chee Wan (USM)2011-05-23 14:56:17 +0800
commitb45fb85344d2299d3948191cbbf0bae18dc5a946 (patch)
tree9c6bf31658b64d0a096bbb6470fd57a83af207c3 /AT91SAM7S256/armdebug
parenta103c13d08dde2deb041b615369c93c2491e52d4 (diff)
parent9dc92fba210be52016fc2b932317a8d7dd178487 (diff)
Merge branch 'master' of ssh://svc.cs.usm.my/~/gitrepo-bare/armdebugGDB_BETA_1
Diffstat (limited to 'AT91SAM7S256/armdebug')
-rw-r--r--AT91SAM7S256/armdebug/Debugger/debug_comm.S6
-rw-r--r--AT91SAM7S256/armdebug/Debugger/debug_stub.S3
-rw-r--r--AT91SAM7S256/armdebug/nxt-python-fantom/nxt/pyusbglue.py4
3 files changed, 9 insertions, 4 deletions
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_comm.S b/AT91SAM7S256/armdebug/Debugger/debug_comm.S
index 06e7424..b743f72 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_comm.S
+++ b/AT91SAM7S256/armdebug/Debugger/debug_comm.S
@@ -574,6 +574,11 @@ dbg__comm_init:
stmia r2!, {r0, r1} /* debug_msgRxBufPtr and debug_msgTxBufPtr */
stmia r2!, {r0, r1} /* debug_msgRxBuf_AppendPtr and debug_msgTxBuf_AppendPtr */
bl _dbg__comm_readbuf_reset
+#ifndef __NXOS__
+ ldr r1, =debug_nxtMsgLength
+ mov r0, #0
+ str r0, [r1, #NXTCOMMCHANNEL_OFFSET] /* Clear NXT Channel on INIT */
+#endif
ldmfd sp!, {pc}
_dbg__comm_readbuf_reset:
@@ -589,7 +594,6 @@ _dbg__comm_readbuf_reset:
ldr r1, =debug_nxtMsgLength
mov r0, #0
str r0, [r1] /* Clear NXT Received Message Length */
- str r0, [r1, #NXTCOMMCHANNEL_OFFSET] /* Clear NXT Channel */
bx lr
.global dbg__copyNxtDebugMsg
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_stub.S b/AT91SAM7S256/armdebug/Debugger/debug_stub.S
index 0d723bb..a58fa8f 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_stub.S
+++ b/AT91SAM7S256/armdebug/Debugger/debug_stub.S
@@ -679,7 +679,10 @@ _proc_command:
teq r0, #MSGBUF_CTRLC
bne _dbg_check_gdb_command
/* Ctrl-C detected, do nothing (wait for next command from GDB) */
+#if 0
+ /* On entering the Debugger via Ctrl-C, _dbg__cmd_Status has already sent a reply, so just keep quiet */
bl __dbg__procAckOnly /* send Ack */
+#endif
b dbg__bkpt_waitCMD_cont
_dbg_check_gdb_command:
diff --git a/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/pyusbglue.py b/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/pyusbglue.py
index c0f8792..b140dfe 100644
--- a/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/pyusbglue.py
+++ b/AT91SAM7S256/armdebug/nxt-python-fantom/nxt/pyusbglue.py
@@ -1,6 +1,4 @@
-# bluetooth.py module -- Glue code from NXT_Python to Lightblue, allowing
-# NXT_Python to run on Mac without modification. Supports subset of
-# PyBluez/bluetooth.py used by NXT_Python.
+# pyusbglue.py module -- Glue code from NXT_Python to libusb for USB access.
#
# Copyright (C) 2011 Tat-Chee Wan
#