From e2c4387f2819cb5c59927e87ab05542d876bc51c Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Mon, 23 May 2011 07:57:48 +0800 Subject: updated comments in header --- nxt-python-fantom/nxt/pyusbglue.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nxt-python-fantom/nxt/pyusbglue.py b/nxt-python-fantom/nxt/pyusbglue.py index c0f8792..b140dfe 100644 --- a/nxt-python-fantom/nxt/pyusbglue.py +++ b/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 # -- cgit v1.2.3 From 64eb662d02cffe823b947878a61f1df1f1f827dc Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Mon, 23 May 2011 14:24:15 +0800 Subject: don't reset nxtcommchannel in _dbg__comm_readbuf_reset since it is called after each received message --- Debugger/debug_comm.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Debugger/debug_comm.S b/Debugger/debug_comm.S index 06e7424..b743f72 100644 --- a/Debugger/debug_comm.S +++ b/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 -- cgit v1.2.3 From 9dc92fba210be52016fc2b932317a8d7dd178487 Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Mon, 23 May 2011 14:54:31 +0800 Subject: Don't send another ack after responding to ctrl-c from debugger --- Debugger/debug_stub.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Debugger/debug_stub.S b/Debugger/debug_stub.S index 0d723bb..a58fa8f 100644 --- a/Debugger/debug_stub.S +++ b/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: -- cgit v1.2.3