From b070d69a0f9d006250824601ce8eb7720793e968 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 25 Jul 1998 16:18:27 +0000 Subject: Removed mc68681_flush and corrected spacing. --- c/src/libchip/serial/mc68681.c | 36 +++++------------------------------- c/src/libchip/serial/mc68681_p.h | 2 -- 2 files changed, 5 insertions(+), 33 deletions(-) (limited to 'c/src/libchip') 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 @@ -409,34 +409,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 * @@ -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, -- cgit v1.2.3