summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-08 16:28:13 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-08 16:28:13 +0000
commit9bc590da957ac9d40b040c5f41183951e71a2721 (patch)
tree481b917a71ecb0ec2195857393619693bcca3aa1
parent2008-08-08 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-9bc590da957ac9d40b040c5f41183951e71a2721.tar.bz2
2008-08-08 Joel Sherrill <joel.sherrill@OARcorp.com>
* console/debugputs.c: Correct use of sparc_disable_interrupt and sparc_enable_interrupt.
-rw-r--r--c/src/lib/libbsp/sparc/leon3/ChangeLog5
-rw-r--r--c/src/lib/libbsp/sparc/leon3/console/debugputs.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog
index e1a2c8461b..bfb4c620b7 100644
--- a/c/src/lib/libbsp/sparc/leon3/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog
@@ -1,5 +1,10 @@
2008-08-08 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * console/debugputs.c: Correct use of sparc_disable_interrupt and
+ sparc_enable_interrupt.
+
+2008-08-08 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* startup/linkcmds: All SPARC executables should include
rtems_get_version_string so the monitor used can provide RTEMS
awareness based upon the version.
diff --git a/c/src/lib/libbsp/sparc/leon3/console/debugputs.c b/c/src/lib/libbsp/sparc/leon3/console/debugputs.c
index 066a584386..6aa480d21d 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/debugputs.c
+++ b/c/src/lib/libbsp/sparc/leon3/console/debugputs.c
@@ -89,16 +89,16 @@ void DEBUG_puts(
)
{
char *s;
- /* unsigned32 old_level; */
+ uint32_t level;
/* LEON_Disable_interrupt( LEON_INTERRUPT_UART_1_RX_TX, old_level ); */
- sparc_disable_interrupts();
+ level = sparc_disable_interrupts();
LEON3_Console_Uart[0]->ctrl = LEON_REG_UART_CTRL_TE;
for ( s = string ; *s ; s++ )
console_outbyte_polled( 0, *s );
console_outbyte_polled( 0, '\r' );
console_outbyte_polled( 0, '\n' );
- sparc_enable_interrupts();
+ sparc_enable_interrupts(level);
/* LEON_Restore_interrupt( LEON_INTERRUPT_UART_1_RX_TX, old_level ); */
}