summaryrefslogtreecommitdiffstats
path: root/c/src/libchip
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-07-25 16:18:27 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-07-25 16:18:27 +0000
commitb070d69a0f9d006250824601ce8eb7720793e968 (patch)
treed6b7fc0e8f7ceef54098bd2d9540b1310c7801a8 /c/src/libchip
parentAdded information on Chris Johns' suggestion to use pointers internally (diff)
downloadrtems-b070d69a0f9d006250824601ce8eb7720793e968.tar.bz2
Removed mc68681_flush and corrected spacing.
Diffstat (limited to 'c/src/libchip')
-rw-r--r--c/src/libchip/serial/mc68681.c36
-rw-r--r--c/src/libchip/serial/mc68681_p.h2
2 files changed, 5 insertions, 33 deletions
diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c
index 6bdb93a88e..2aaf5fef1b 100644
--- a/c/src/libchip/serial/mc68681.c
+++ b/c/src/libchip/serial/mc68681.c
@@ -410,34 +410,6 @@ MC68681_STATIC rtems_isr mc68681_isr(
}
/*
- * mc68681_flush
- *
- * This routine waits before all output is completed before closing
- * the requested port.
- *
- * NOTE: This is the "interrupt mode" close entry point.
- */
-
-/* XXX remove me */
-MC68681_STATIC int mc68681_flush(int major, int minor, void *arg)
-{
-#if 0
- while(!Ring_buffer_Is_empty(&Console_Port_Data[minor].TxBuffer)) {
- /*
- * Yield while we wait
- */
- if(_System_state_Is_up(_System_state_Get())) {
- rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
- }
- }
-
- mc68681_close(major, minor, arg);
-
-#endif
- return(RTEMS_SUCCESSFUL);
-}
-
-/*
* mc68681_initialize_interrupts
*
* This routine initializes the console's receive and transmit
@@ -475,16 +447,17 @@ MC68681_STATIC int mc68681_write_support_int(
setReg = Console_Port_Tbl[minor].setRegister;
/*
- * We are using interrupt driven output and termios only sends us one character
- * at a time.
+ * We are using interrupt driven output and termios only sends us
+ * one character at a time.
*/
if ( !len )
return 0;
/*
- * Wake up the device
+ * Put the character out and enable interrupts if necessary.
*/
+
rtems_interrupt_disable(Irql);
if ( Console_Port_Data[minor].bActive == FALSE ) {
Console_Port_Data[minor].bActive = TRUE;
@@ -492,6 +465,7 @@ MC68681_STATIC int mc68681_write_support_int(
}
(*setReg)(pMC68681_port, MC68681_TX_BUFFER, *buf);
rtems_interrupt_enable(Irql);
+
return 1;
}
diff --git a/c/src/libchip/serial/mc68681_p.h b/c/src/libchip/serial/mc68681_p.h
index b0e6ccd5e9..471b0ae42e 100644
--- a/c/src/libchip/serial/mc68681_p.h
+++ b/c/src/libchip/serial/mc68681_p.h
@@ -280,8 +280,6 @@ MC68681_STATIC void mc68681_write_polled(
MC68681_STATIC void mc68681_initialize_interrupts(int minor);
-MC68681_STATIC int mc68681_flush(int major, int minor, void *arg);
-
MC68681_STATIC int mc68681_write_support_int(
int minor,
const char *buf,