diff options
Diffstat (limited to 'c/src/lib/libbsp/i386/shared/comm')
-rw-r--r-- | c/src/lib/libbsp/i386/shared/comm/gdb_glue.c | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/comm/i386-stub.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/comm/tty_drv.c | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/comm/tty_drv.h | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/comm/uart.c | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/comm/uart.h | 1 |
7 files changed, 6 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c b/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c index 78ec77ae06..0df2373372 100644 --- a/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c +++ b/c/src/lib/libbsp/i386/shared/comm/gdb_glue.c @@ -45,7 +45,6 @@ void init_remote_gdb( void ) /* Init GDB stub itself */ set_debug_traps(); - printf( "Remote GDB: waiting remote connection....\n" ); /* diff --git a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c b/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c index e36f5e2ea4..d5b7ace66c 100644 --- a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c +++ b/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c @@ -14,7 +14,6 @@ #include <uart.h> #include <assert.h> - int putDebugChar(int ch); /* write a single character */ int getDebugChar(void); /* read and return a single char */ @@ -55,7 +54,6 @@ int BSP_uart_isOn(const rtems_raw_irq_connect_data* used) return BSP_irq_enabled_at_i8259s(used->idtIndex - BSP_IRQ_VECTOR_BASE); } - /* * In order to have a possibility to break into * running program, one has to call this function @@ -115,7 +113,6 @@ void i386_stub_glue_init_breakin(void) return; } - int putDebugChar(int ch) { diff --git a/c/src/lib/libbsp/i386/shared/comm/i386-stub.c b/c/src/lib/libbsp/i386/shared/comm/i386-stub.c index b55d5302fb..172c992e38 100644 --- a/c/src/lib/libbsp/i386/shared/comm/i386-stub.c +++ b/c/src/lib/libbsp/i386/shared/comm/i386-stub.c @@ -464,7 +464,6 @@ hex (char ch) return (-1); } - /* scan for the sequence $<data>#<checksum> */ void getpacket (char *buffer) @@ -530,7 +529,6 @@ getpacket (char *buffer) /* send the packet in buffer. */ - void putpacket (char *buffer) { diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c b/c/src/lib/libbsp/i386/shared/comm/tty_drv.c index cb219d5f87..53092d59bc 100644 --- a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c +++ b/c/src/lib/libbsp/i386/shared/comm/tty_drv.c @@ -18,6 +18,9 @@ * MODIFICATION/HISTORY: * * $Log$ + * Revision 1.6 2004/04/21 10:42:44 ralf + * Remove stray white spaces. + * * Revision 1.5 2001/08/16 20:52:05 joel * 2001-08-16 Mike Siers <mikes@poliac.com> * @@ -84,12 +87,10 @@ static void isr_on(const rtems_irq_connect_data *); static void isr_off(const rtems_irq_connect_data *); static int isr_is_on(const rtems_irq_connect_data *); - extern BSP_polling_getchar_function_type BSP_poll_char; extern int BSPConsolePort; extern void rtems_set_waiting_id_comx( int port, rtems_id id, rtems_event_set event ); - /* * Interrupt structure for tty1 */ @@ -183,7 +184,6 @@ tty1_initialize(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* tty_initialize */ - static int tty1_last_close(int major, int minor, void *arg) { BSP_remove_rtems_irq_handler( &tty1_isr_data ); @@ -255,7 +255,6 @@ tty_close(rtems_device_major_number major, } /* tty_close */ - /* * TTY device driver READ entry point. * Read characters from the tty device. @@ -268,7 +267,6 @@ tty_read(rtems_device_major_number major, return rtems_termios_read (arg); } /* tty_read */ - /* * TTY device driver WRITE entry point. * Write characters to the tty device. @@ -299,8 +297,6 @@ static rtems_device_driver tty_control( int port, void *arg ) return RTEMS_SUCCESSFUL; } - - /* * Handle ioctl request for ttyS1. */ @@ -313,7 +309,6 @@ tty1_control(rtems_device_major_number major, return tty_control( BSP_UART_COM1, arg ); } - static int conSetAttr(int port, int minor, const struct termios *t) { @@ -424,8 +419,6 @@ tty1_conSetAttr( int minor, const struct termios *t) return conSetAttr( BSP_UART_COM1, minor, t ); } - - /* * TTY2 device driver INITIALIZE entry point. */ @@ -473,7 +466,6 @@ tty2_initialize(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* tty_initialize */ - static int tty2_last_close(int major, int minor, void *arg) { BSP_remove_rtems_irq_handler( &tty2_isr_data ); diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h b/c/src/lib/libbsp/i386/shared/comm/tty_drv.h index d84dd4d3a1..82319b3aa5 100644 --- a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h +++ b/c/src/lib/libbsp/i386/shared/comm/tty_drv.h @@ -15,6 +15,9 @@ * MODIFICATION/HISTORY: * * $Log$ + * Revision 1.3 2004/04/21 10:42:44 ralf + * Remove stray white spaces. + * * Revision 1.2 2004/04/15 13:26:12 ralf * Remove stray white spaces. * @@ -38,7 +41,6 @@ extern "C" { #endif - /* ttyS1 entry points */ rtems_device_driver tty1_initialize( rtems_device_major_number, @@ -58,7 +60,6 @@ rtems_device_driver tty1_control( void * ); - /* tty1 & tty2 shared entry points */ rtems_device_driver tty_close( rtems_device_major_number, @@ -66,7 +67,6 @@ rtems_device_driver tty_close( void * ); - rtems_device_driver tty_read( rtems_device_major_number, rtems_device_minor_number, @@ -79,8 +79,6 @@ rtems_device_driver tty_write( void * ); - - /* tty2 entry points */ rtems_device_driver tty2_initialize( rtems_device_major_number, @@ -100,19 +98,14 @@ rtems_device_driver tty2_control( void * ); - - #define TTY1_DRIVER_TABLE_ENTRY \ { tty1_initialize, tty1_open, tty_close, \ tty_read, tty_write, tty1_control } - #define TTY2_DRIVER_TABLE_ENTRY \ { tty2_initialize, tty2_open, tty_close, \ tty_read, tty_write, tty2_control } - - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/c/src/lib/libbsp/i386/shared/comm/uart.c index bc5e805c4e..78b4f70cb5 100644 --- a/c/src/lib/libbsp/i386/shared/comm/uart.c +++ b/c/src/lib/libbsp/i386/shared/comm/uart.c @@ -146,7 +146,6 @@ BSP_uart_init /* 8-bit, no parity , 1 stop */ uwrite(uart, LCR, databits | parity | stopbits); - /* Set DTR, RTS and OUT2 high */ uwrite(uart, MCR, DTR | RTS | OUT_2); @@ -354,7 +353,6 @@ BSP_uart_polled_status(int uart) return BSP_UART_STATUS_ERROR; } - /* * Polled mode write function */ @@ -442,7 +440,6 @@ BSP_poll_char_via_serial() return BSP_uart_polled_read(BSPConsolePort); } - /* ================ Termios support =================*/ static volatile int termios_stopped_com1 = 0; @@ -478,7 +475,6 @@ void uart_set_driver_handler( int port, void ( *handler )( void *, char *, int } } - /* * Set channel parameters */ @@ -619,7 +615,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len) return 0; } - /* If there TX buffer is busy - something is royally screwed up */ assert((uread(BSP_UART_COM2, LSR) & THRE) != 0); @@ -644,7 +639,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len) return 0; } - void BSP_uart_termios_isr_com1(void) { @@ -836,7 +830,6 @@ BSP_uart_termios_isr_com2() } } - /* ================= GDB support ===================*/ static int sav[4] __attribute__ ((unused)); @@ -918,7 +911,6 @@ asm (" outb %al, $0x20"); asm (" movl sav, %eax"); /* Restore eax */ asm (" iret"); /* Done */ - /* * Interrupt service routine for COM2 - all, * it does it check whether ^C is received diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.h b/c/src/lib/libbsp/i386/shared/comm/uart.h index 05370c56dd..f45eb48cdd 100644 --- a/c/src/lib/libbsp/i386/shared/comm/uart.h +++ b/c/src/lib/libbsp/i386/shared/comm/uart.h @@ -174,5 +174,4 @@ extern int BSPBaseBaud; } #endif - #endif /* _BSPUART_H */ |