aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-06-22 10:54:18 +0800
committerTat-Chee Wan (USM)2011-06-22 10:54:18 +0800
commit37f536b128cec0e4d25cb827bb90ae20368795c6 (patch)
treece9bb417227451523ce34d7fcc3e69c28deef50b
parentabedf371a610485c3de77af2a05e2699627ff358 (diff)
power down brick when kill command received
Instead of rebooting, power down the brick when kill command received, to be consistent with NXT firmware behavior
-rw-r--r--Debugger/debug_runlooptasks.S4
-rw-r--r--Debugger/debug_runlooptasks.h35
2 files changed, 22 insertions, 17 deletions
diff --git a/Debugger/debug_runlooptasks.S b/Debugger/debug_runlooptasks.S
index 75c477c..91e0fa9 100644
--- a/Debugger/debug_runlooptasks.S
+++ b/Debugger/debug_runlooptasks.S
@@ -113,7 +113,11 @@ dbg__runloopTasks:
*
****************************************************************************/
dbg__reboot:
+#ifdef REBOOT_POWERDOWN
+ b nx_core_halt /* Shutdown Brick, won't return */
+#else
b nx_core_reset /* Reboot Brick, won't return */
+#endif
#else
/****************************************************************************
diff --git a/Debugger/debug_runlooptasks.h b/Debugger/debug_runlooptasks.h
index 360e0d1..6eb0461 100644
--- a/Debugger/debug_runlooptasks.h
+++ b/Debugger/debug_runlooptasks.h
@@ -34,26 +34,27 @@
.extern nx_usb_read
.extern nx_usb_data_read
.extern nx_core_reset
+ .extern nx_core_halt
#else /* NXT Firmware */
- .extern cCommInit
- .extern cCommCtrl
- .extern cCommExit
- .extern dUsbWrite
- .extern dUsbRead
- .extern dUsbIsConfigured
- .extern dBtSendMsg
- .equ nxt_UBYTE_TRUE, 1
- .equ nxt_UBYTE_FALSE, 0
- .equ USB_CMD_READY, 0x01 /* From c_comm.iom */
- .equ BT_CMD_READY, 0x02 /* From c_comm.iom */
-
- .extern dIOCtrlSetPower
- .extern dIOCtrlSetPwm
- .extern dIOCtrlTransfer
- .equ BOOT, 0xA55A /* from c_ioctrl.iom */
- .equ POWERDOWN, 0x5A00 /* from c_ioctrl.iom */
+ .extern cCommInit
+ .extern cCommCtrl
+ .extern cCommExit
+ .extern dUsbWrite
+ .extern dUsbRead
+ .extern dUsbIsConfigured
+ .extern dBtSendMsg
+ .equ nxt_UBYTE_TRUE, 1
+ .equ nxt_UBYTE_FALSE, 0
+ .equ USB_CMD_READY, 0x01 /* From c_comm.iom */
+ .equ BT_CMD_READY, 0x02 /* From c_comm.iom */
+
+ .extern dIOCtrlSetPower
+ .extern dIOCtrlSetPwm
+ .extern dIOCtrlTransfer
+ .equ BOOT, 0xA55A /* from c_ioctrl.iom */
+ .equ POWERDOWN, 0x5A00 /* from c_ioctrl.iom */
#endif