From f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Apr 2004 16:01:48 +0000 Subject: Remove duplicate white lines. --- c/src/lib/libbsp/i386/shared/comm/gdb_glue.c | 1 - c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c | 3 --- c/src/lib/libbsp/i386/shared/comm/i386-stub.c | 2 -- c/src/lib/libbsp/i386/shared/comm/tty_drv.c | 14 +++----------- c/src/lib/libbsp/i386/shared/comm/tty_drv.h | 13 +++---------- c/src/lib/libbsp/i386/shared/comm/uart.c | 8 -------- c/src/lib/libbsp/i386/shared/comm/uart.h | 1 - c/src/lib/libbsp/i386/shared/irq/idt.c | 2 -- c/src/lib/libbsp/i386/shared/irq/irq.c | 4 ---- c/src/lib/libbsp/i386/shared/irq/irq.h | 6 ------ c/src/lib/libbsp/i386/shared/irq/irq_asm.S | 3 --- c/src/lib/libbsp/i386/shared/irq/irq_asm.h | 1 - c/src/lib/libbsp/i386/shared/irq/irq_init.c | 4 ---- c/src/lib/libbsp/i386/shared/pci/pcibios.c | 15 --------------- 14 files changed, 6 insertions(+), 71 deletions(-) (limited to 'c/src/lib/libbsp/i386/shared') 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 #include - 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 $# */ 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 * @@ -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 */ diff --git a/c/src/lib/libbsp/i386/shared/irq/idt.c b/c/src/lib/libbsp/i386/shared/irq/idt.c index a81c6358c6..909d82eac4 100644 --- a/c/src/lib/libbsp/i386/shared/irq/idt.c +++ b/c/src/lib/libbsp/i386/shared/irq/idt.c @@ -64,7 +64,6 @@ int i386_set_idt_entry (const rtems_raw_irq_connect_data* irq) unsigned limit; unsigned int level; - i386_get_info_from_IDTR (&idt_entry_tbl, &limit); /* Convert limit into number of entries */ @@ -241,7 +240,6 @@ int i386_set_gdt_entry (unsigned short segment_selector, unsigned base, unsigned int limit_adjusted; segment_descriptors* gdt_entry_tbl; - i386_get_info_from_GDTR (&gdt_entry_tbl, &gdt_limit); if (segment_selector > limit) { diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.c b/c/src/lib/libbsp/i386/shared/irq/irq.c index 1fae59f777..c30ee820e8 100644 --- a/c/src/lib/libbsp/i386/shared/irq/irq.c +++ b/c/src/lib/libbsp/i386/shared/irq/irq.c @@ -11,7 +11,6 @@ * $Id$ */ - #include #include #include @@ -138,7 +137,6 @@ int BSP_irq_enabled_at_i8259s (const rtems_irq_symbolic_name irqLine) return (~(i8259s_cache & mask)); } - /*-------------------------------------------------------------------------+ | Function: BSP_irq_ack_at_i8259s | Description: Signal generic End Of Interrupt (EOI) to appropriate PIC. @@ -204,7 +202,6 @@ static void make_copy_of_handlers () } } - /* * This function check that the value given for the irq line * is valid. @@ -263,7 +260,6 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) return 1; } - int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq) { unsigned int level; diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.h b/c/src/lib/libbsp/i386/shared/irq/irq.h index 3a1add8355..84651e7755 100644 --- a/c/src/lib/libbsp/i386/shared/irq/irq.h +++ b/c/src/lib/libbsp/i386/shared/irq/irq.h @@ -60,9 +60,6 @@ typedef enum { BSP_RT_TIMER3 = 10 } rtems_irq_symbolic_name; - - - /* * Type definition for RTEMS managed interrupts */ @@ -140,9 +137,6 @@ typedef struct { rtems_irq_prio* irqPrioTbl; }rtems_irq_global_settings; - - - /*-------------------------------------------------------------------------+ | Function Prototypes. +--------------------------------------------------------------------------*/ diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_asm.S b/c/src/lib/libbsp/i386/shared/irq/irq_asm.S index 9c5e327379..6504079fda 100644 --- a/c/src/lib/libbsp/i386/shared/irq/irq_asm.S +++ b/c/src/lib/libbsp/i386/shared/irq/irq_asm.S @@ -130,7 +130,6 @@ nested: movb ah, al outb $PIC_SLAVE_IMR_IO_PORT - decl SYM (_ISR_Nest_level) /* one less ISR nest level */ /* If interrupts are nested, */ /* then dispatching is disabled */ @@ -149,7 +148,6 @@ nested: /* while in interrupt handler? */ je .exit /* No, exit */ - .bframe: movl $0, SYM (_ISR_Signals_to_thread_executing) /* @@ -203,7 +201,6 @@ nested: popl eax iret - #define DISTINCT_INTERRUPT_ENTRY(_vector) \ .p2align 4 ; \ PUBLIC (rtems_irq_prologue_ ## _vector ) ; \ diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_asm.h b/c/src/lib/libbsp/i386/shared/irq/irq_asm.h index bbf291b519..e46b5e1203 100644 --- a/c/src/lib/libbsp/i386/shared/irq/irq_asm.h +++ b/c/src/lib/libbsp/i386/shared/irq/irq_asm.h @@ -26,5 +26,4 @@ #define PIC_EOSI 0x60 /* End of Specific Interrupt (EOSI) */ #define PIC_EOI 0x20 /* Generic End of Interrupt (EOI) */ - #endif diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_init.c b/c/src/lib/libbsp/i386/shared/irq/irq_init.c index 7a54329082..61969cf182 100644 --- a/c/src/lib/libbsp/i386/shared/irq/irq_init.c +++ b/c/src/lib/libbsp/i386/shared/irq/irq_init.c @@ -49,7 +49,6 @@ static void nop_func(){} */ static int not_connected() {return 0;} - static rtems_raw_irq_connect_data idtHdl[IDT_SIZE]; /* @@ -100,8 +99,6 @@ static rtems_irq_prio irqPrioTable[BSP_IRQ_LINES_NUMBER]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - - static interrupt_gate_descriptor idtEntry; static rtems_irq_global_settings initial_config; @@ -129,7 +126,6 @@ void rtems_irq_mngt_init() while(1); } - _CPU_ISR_Disable(level); /* diff --git a/c/src/lib/libbsp/i386/shared/pci/pcibios.c b/c/src/lib/libbsp/i386/shared/pci/pcibios.c index 1cece0fb86..052be69e23 100644 --- a/c/src/lib/libbsp/i386/shared/pci/pcibios.c +++ b/c/src/lib/libbsp/i386/shared/pci/pcibios.c @@ -18,7 +18,6 @@ * is flat and that stack is big enough */ - static int pcibInitialized = 0; static unsigned int pcibEntry; @@ -211,14 +210,10 @@ pcib_find_by_class(int classCode, int idx, int *sig) return PCIB_ERR_SUCCESS; } - - - #define PCI_MULTI_FUNCTION 0x80 #define PCI_MAX_DEVICES 16 #define PCI_MAX_FUNCTIONS 8 - int BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid, int instance, int *pbus, int *pdev, int *pfun ) @@ -273,9 +268,6 @@ BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid, return -1; } - - - /* * Generate Special Cycle */ @@ -306,7 +298,6 @@ pcib_special_cycle(int busNo, int data) return pcib_convert_err((pcibExchg[0] >> 8) & 0xff); } - /* * Read byte from config space */ @@ -344,7 +335,6 @@ pcib_conf_read8(int sig, int off, unsigned char *data) return PCIB_ERR_SUCCESS; } - /* * Read word from config space */ @@ -382,7 +372,6 @@ pcib_conf_read16(int sig, int off, unsigned short *data) return PCIB_ERR_SUCCESS; } - /* * Read dword from config space */ @@ -420,7 +409,6 @@ pcib_conf_read32(int sig, int off, unsigned int *data) return PCIB_ERR_SUCCESS; } - /* * Write byte into config space */ @@ -483,8 +471,6 @@ pcib_conf_write16(int sig, int off, unsigned int data) return pcib_convert_err((pcibExchg[0] >> 8) & 0xff); } - - /* * Write dword into config space */ @@ -516,7 +502,6 @@ pcib_conf_write32(int sig, int off, unsigned int data) return pcib_convert_err((pcibExchg[0] >> 8) & 0xff); } - static int pcib_convert_err(int err) { -- cgit v1.2.3