diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-23 12:24:06 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-23 12:24:06 +0000 |
| commit | bdf879323e4be17f5da23ab5b2048367b89f21e2 (patch) | |
| tree | 850f9a8d8030498912f5d7628959af4188ff7985 /c/src/lib | |
| parent | 2010-07-22 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-bdf879323e4be17f5da23ab5b2048367b89f21e2.tar.bz2 | |
2010-07-23 Vinu Rajashekhar <vinutheraj@gmail.com>
* start/start.S: Replace the call to _return_to_monitor by
hlt instruction.
* startup/ldsegs.S: Remove the _return_to_monitor function.
Diffstat (limited to 'c/src/lib')
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/start/start.S | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/ldsegs.S | 17 |
3 files changed, 8 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 64ca7977e6..4d6312aef6 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,9 @@ +2010-07-23 Vinu Rajashekhar <vinutheraj@gmail.com> + + * start/start.S: Replace the call to _return_to_monitor by + hlt instruction. + * startup/ldsegs.S: Remove the _return_to_monitor function. + 2010-07-21 Joel Sherrill <joel.sherrill@oarcorp.com> * timer/timer.c: Do not do the indirect call if NULL. diff --git a/c/src/lib/libbsp/i386/pc386/start/start.S b/c/src/lib/libbsp/i386/pc386/start/start.S index d4d1ec0fa2..5d11a1d1a3 100644 --- a/c/src/lib/libbsp/i386/pc386/start/start.S +++ b/c/src/lib/libbsp/i386/pc386/start/start.S @@ -266,12 +266,8 @@ SYM (zero_bss): movl $SYM(_boot_multiboot_cmdline), (esp) call SYM (boot_card) -/*---------------------------------------------------------------------+ -| Clean up - we do not know anything about it, so we will -| jump to BSP specific code to do cleanup -+---------------------------------------------------------------------*/ - - jmp SYM (_return_to_monitor) + cli # stops interrupts from being processed after hlt! + hlt # shutdown #ifdef __SSE__ SYM(_sse_panic): diff --git a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S index 942c9ec465..d18c33e151 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S +++ b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S @@ -158,23 +158,6 @@ next_step: jmp SYM (_establish_stack) # return to the bsp entry code /*-------------------------------------------------------------------------+ -| Function: _return_to_monitor -| Description: Return to board's monitor (we have none so simply restart). -| Global Variables: None. -| Arguments: None. -| Returns: Nothing. -+--------------------------------------------------------------------------*/ - - .p2align 4 - - PUBLIC (_return_to_monitor) -SYM (_return_to_monitor): - - call SYM (Timer_exit) - call SYM (Clock_exit) - jmp SYM (start) - -/*-------------------------------------------------------------------------+ | Function: _default_int_handler | Description: default interrupt handler | Global Variables: None. |