From 2c09d15ac9ad8e2a653713f23d5e0b6921bf15c3 Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Mon, 2 Apr 2012 09:34:09 +0800 Subject: Fixed Doxygen comment syntax --- Debugger/debug_internals.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Debugger/debug_internals.h b/Debugger/debug_internals.h index e187b82..bdab463 100644 --- a/Debugger/debug_internals.h +++ b/Debugger/debug_internals.h @@ -390,4 +390,6 @@ ENUM_VAL(DISP_ABORT_SPURIOUS) /**< Spurious IRQ. */ ENUM_VAL(DISP_ABORT_ILLEGAL) /**< Illegal Instruction. */ ENUM_END(abort_type_t) +/*@}*/ + #endif /* __DEBUG_INTERNALS_H__ */ -- cgit v1.2.3 From 5053ae8cd3eab5f0c1a929c1836078f0aadeb6f1 Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Fri, 10 Aug 2012 22:50:47 +0800 Subject: modified exception handler to remove extraneous error message when pyfantom is used Don't explicitly access usb module since it may not be loaded on Mac OS X. --- Host/nxt-gdb-server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Host/nxt-gdb-server.py b/Host/nxt-gdb-server.py index 197c27a..03a95d3 100755 --- a/Host/nxt-gdb-server.py +++ b/Host/nxt-gdb-server.py @@ -148,7 +148,7 @@ class NXTGDBServer: assert segno == prev_segno + 1, "segno = %s, prev_segno = %s" % (segno, prev_segno) prev_segno = segno msg += s - except usb.USBError as e: + except IOError as e: # Some pyusb are buggy, ignore some "errors". if e.args != ('No error', ): raise e @@ -198,7 +198,7 @@ class NXTGDBServer: for seg in segments: try: self.brick.sock.send (seg) - except usb.USBError as e: + except IOError as e: # Some pyusb are buggy, ignore some "errors". if e.args != ('No error', ): raise e -- cgit v1.2.3 From b04bb1bd7f227b9eaf320609e92cc95ed69aa448 Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Fri, 10 Aug 2012 22:58:20 +0800 Subject: automated python version invocation for cross-platform support --- Host/pyenv-nxt-gdb-server | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Host/pyenv-nxt-gdb-server b/Host/pyenv-nxt-gdb-server index 875e92e..45797c6 100755 --- a/Host/pyenv-nxt-gdb-server +++ b/Host/pyenv-nxt-gdb-server @@ -1,3 +1,28 @@ #!/bin/sh +# If using Apple's python, use the following to enable 32-bit python +# arch -i386 does not work reliably except with specific python versions +# python2.6 and python2.7 is known to work with 'arch -i386' +# +# Apple recommends the use of the following Environment Variable to control +# 32-bit vs. 64-bit python selection +# export VERSIONER_PYTHON_PREFER_32_BIT="yes" + +DARWIN=`uname` +PYTHON=python +PYTHONVER=`$PYTHON --version` + +if [ $DARWIN == "Darwin" ]; then + echo "$PYTHONVER Running on Mac OSX Platform!" + EXP="export VERSIONER_PYTHON_PREFER_32_BIT=yes" + ARCH="arch -i386" +else + echo "$PYTHONVER Running on Default Platform!" + EXP= + ARCH= +fi +# Debugging Info +# echo "dirname:" `dirname $0` +# echo "basename:" `basename $0` export PYTHONPATH=~/svnrepo/nxt-python:~/gitrepo/pyfantom -arch -i386 /usr/bin/python2.6 ~/gitrepo/armdebug/Host/nxt-gdb-server.py $* +#echo $EXP; $ARCH $PYTHON ~/gitrepo/armdebug/Host/nxt-gdb-server.py $* +$EXP; $ARCH $PYTHON ~/gitrepo/armdebug/Host/nxt-gdb-server.py $* -- cgit v1.2.3