summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTC Wan2011-04-21 14:39:50 +0800
committerTC Wan2011-04-21 14:39:50 +0800
commitd70d274a441ce0ce68c8e0f4a4d214e624c8fd78 (patch)
tree195f796fadac78bdf1db017a8e057f8224ee6e47
parentaf5489586e159b37b58d6835f590a96d438e432a (diff)
reenable nxos test compilation, added comment regarding buffer usage
-rw-r--r--Debugger/debug_comm.S4
-rw-r--r--SConstruct8
2 files changed, 7 insertions, 5 deletions
diff --git a/Debugger/debug_comm.S b/Debugger/debug_comm.S
index 5783dbd..06e7424 100644
--- a/Debugger/debug_comm.S
+++ b/Debugger/debug_comm.S
@@ -602,12 +602,14 @@ _dbg__comm_readbuf_reset:
* On Exit:
* R0-R3: Destroyed
*/
-
dbg__copyNxtDebugMsg:
ldr r3, =debug_nxtMsgLength
str r1, [r3, #NXTCOMMCHANNEL_OFFSET]
str r2, [r3]
ldr r1, =debug_InCommBuf
+/* FIXME: We can probably save some cycles and buffer space by using the
+ * NXT comms buffer specified in R0 directly without copying to internal buffers
+ */
_dbg_memcpy r1, r0, r2, r3 /* r3: scratch register */
bx lr
#endif
diff --git a/SConstruct b/SConstruct
index 898bb91..fa88d7a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -164,15 +164,15 @@ mycflags.append('-g')
mycflags.append('-ggdb')
# Big Endian Output (disabled by default)
#mycflags.append('-D__BIG_ENDIAN__')
-# Test build for NXT Firmware first
-#mycflags.append('-D__NXOS__')
+# Test build for NxOS (Comment out for NXT Firmware)
+mycflags.append('-D__NXOS__')
myasflags.append('-g')
myasflags.append('-ggdb')
# Big Endian Output (disabled by default)
#mycflags.append('-D__BIG_ENDIAN__')
-# Test build for NXT Firmware first
-#myasflags.append('-D__NXOS__')
+# Test build for NxOS (Comment out for NXT Firmware)
+myasflags.append('-D__NXOS__')
env.Replace(CCFLAGS = mycflags, ASFLAGS = myasflags )