diff options
Diffstat (limited to 'c/src/lib/libbsp/i386/pc386')
34 files changed, 24 insertions, 171 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c index cf06a85916..09ed6e0da1 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c +++ b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c @@ -58,6 +58,9 @@ * * MODIFICATION/HISTORY: * $Log$ + * Revision 1.3 2004/04/21 10:42:43 ralf + * Remove stray white spaces. + * * Revision 1.2 1999/12/13 21:21:31 joel * Warning removal patch from Philip A. Prindeville <philipp@zembu.com>. * @@ -151,7 +154,6 @@ struct isa_device u_int id_irq; /* interrupt request */ }; - struct ep_board { int epb_addr; /* address of this board */ @@ -162,7 +164,6 @@ struct ep_board u_short res_cfg; /* resource configuration */ }; - /* * Ethernet software status per interface. */ @@ -192,7 +193,6 @@ struct ep_softc short rx_overrunl; }; - /* static unsigned long loopc; */ static volatile unsigned long overrun; static volatile unsigned long resend; @@ -216,7 +216,6 @@ static char *ep_conn_type[] = {"UTP", "AUI", "???", "BNC"}; #define ep_fset(f) (sc->stat|=(f)) #define ep_frst(f) (sc->stat&=~(f)) - /* forward declarations for functions */ static int ep_attach( struct ep_softc *sc ); static int ep_isa_probe( struct isa_device *is ); @@ -231,7 +230,6 @@ static void ep_intr( struct ep_softc *sc ); /* external functions */ extern void Wait_X_ms( unsigned int timeToWait ); /* timer.c ??? */ - /********************************************************************************** * * DESCRIPTION: Writes a buffer of data to the I/O port. The data is sent to the @@ -285,7 +283,6 @@ static __inline void outsb( unsigned short io_addr, unsigned char *out_data, int } } - /********************************************************************************** * * DESCRIPTION: Read a buffer of data from an I/O port. The data is read as 16 bits @@ -338,7 +335,6 @@ static __inline void insb( unsigned short io_addr, unsigned char *in_data, int l } } - /********************************************************************************** * * DESCRIPTION: Writes a word to the I/O port. @@ -354,7 +350,6 @@ static __inline void outw( unsigned short io_addr, unsigned short out_data ) outport_word( io_addr, out_data ); } - /********************************************************************************** * * DESCRIPTION: Routine to read a word as defined in FreeBSD. @@ -395,7 +390,6 @@ static __inline unsigned char inb( unsigned short io_addr ) return in_data; } - /********************************************************************************** * * DESCRIPTION: @@ -423,7 +417,6 @@ static int get_eeprom_data( int id_port, int offset ) return( data ); } - /********************************************************************************** * * DESCRIPTION: Waits until the EEPROM of the card is ready to be accessed. @@ -464,7 +457,6 @@ u_short get_e( struct ep_softc *sc, int offset ) return( inw( BASE + EP_W0_EEPROM_DATA ) ); } - /********************************************************************************** * * DESCRIPTION: @@ -485,7 +477,6 @@ static rtems_isr ap_interrupt_handler( rtems_vector_number v ) rtems_event_send( sc->rxDaemonTid, INTERRUPT_EVENT ); } - /********************************************************************************** * * DESCRIPTION: @@ -510,7 +501,6 @@ static int _3c509_IsOn(const rtems_irq_connect_data* irq) return BSP_irq_enabled_at_i8259s (irq->name); } - /********************************************************************************** * * DESCRIPTION: @@ -568,7 +558,6 @@ static void _3c509_rxDaemon (void *arg) printf ("3C509: RX Daemon is finishing.\n"); } - /********************************************************************************** * * DESCRIPTION: Driver transmit daemon @@ -601,7 +590,6 @@ static void _3c509_txDaemon (void *arg) printf ("3C509: TX Daemon is finishing.\n"); } - /********************************************************************************** * * DESCRIPTION: Activates the trabsmitter task... @@ -680,7 +668,6 @@ static void _3c509_stop (struct ep_softc *sc) outw(BASE + EP_COMMAND, SET_RX_FILTER); } - /********************************************************************************** * * DESCRIPTION: Show interface statistics @@ -857,7 +844,6 @@ int rtems_3c509_driver_attach (struct rtems_bsdnet_ifconfig *config ) return 1; } - /********************************************************************************** * * DESCRIPTION: @@ -971,8 +957,6 @@ static struct ep_board *ep_look_for_board_at( struct isa_device *is ) } } - - /********************************************************************************** * * DESCRIPTION: @@ -1039,8 +1023,6 @@ static int ep_isa_probe( struct isa_device *is ) return (EP_IOSIZE); /* 16 bytes of I/O space used. */ } - - /********************************************************************************** * * DESCRIPTION: @@ -1127,7 +1109,6 @@ static int ep_attach( struct ep_softc *sc ) return 0; } - /********************************************************************************** * * DESCRIPTION: @@ -1255,7 +1236,6 @@ static void epinit( struct ep_softc *sc ) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; /* just in case */ - sc->rx_no_first = sc->rx_no_mbuf = sc->rx_bpf_disc = sc->rx_overrunf = sc->rx_overrunl = sc->tx_underrun = 0; @@ -1278,7 +1258,6 @@ static void epinit( struct ep_softc *sc ) GO_WINDOW(1); } - static const char padmap[] = {0, 3, 2, 1}; /********************************************************************************** @@ -1386,8 +1365,6 @@ readcheck: goto startagain; } - - /********************************************************************************** * * DESCRIPTION: Routine to read frames from the card. @@ -1530,8 +1507,6 @@ out: outw(BASE + EP_COMMAND, SET_RX_EARLY_THRESH | RX_INIT_EARLY_THRESH); } - - /********************************************************************************** * * DESCRIPTION: diff --git a/c/src/lib/libbsp/i386/pc386/3c509/elink.c b/c/src/lib/libbsp/i386/pc386/3c509/elink.c index 064d747143..0664df1c35 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/elink.c +++ b/c/src/lib/libbsp/i386/pc386/3c509/elink.c @@ -37,7 +37,6 @@ #include "elink.h" - extern void outb( unsigned short io_addr, unsigned char out_data ); /* diff --git a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c index a1b1899dc9..a4ed222b91 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c +++ b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c @@ -30,7 +30,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #include <stdlib.h> #include <bsp.h> @@ -109,7 +108,6 @@ void clockOff(const rtems_irq_connect_data* unused) outport_byte(TIMER_CNTR0, 0); } /* Clock_exit */ - /*-------------------------------------------------------------------------+ | Function: Install_clock | Description: Initialize and install clock interrupt handler. @@ -177,8 +175,6 @@ static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER, clockOff, clockIsOn}; - - /*-------------------------------------------------------------------------+ | Clock device driver INITIALIZE entry point. +--------------------------------------------------------------------------+ @@ -202,7 +198,6 @@ Clock_initialize(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* Clock_initialize */ - /*-------------------------------------------------------------------------+ | Console device driver CONTROL entry point +--------------------------------------------------------------------------*/ @@ -245,7 +240,6 @@ void Clock_exit() | to be correctly integrated with the rest of the code!!! +--------------------------------------------------------------------------*/ - #if 0 && defined(pentium) /* This can be used to get extremely accurate timing on a pentium. */ diff --git a/c/src/lib/libbsp/i386/pc386/clock/rtc.c b/c/src/lib/libbsp/i386/pc386/clock/rtc.c index 26c4c2056d..a6330fa929 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/rtc.c +++ b/c/src/lib/libbsp/i386/pc386/clock/rtc.c @@ -31,7 +31,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #include <string.h> #include <bsp.h> @@ -70,7 +69,6 @@ #define RTC_CENTURY 0x32 /* current century - increment in Dec99 */ - /*-------------------------------------------------------------------------+ | Auxiliary Functions +--------------------------------------------------------------------------*/ @@ -107,7 +105,6 @@ ytos(uint16_t y) return ((y - 1970) * SECS_PER_REG_YEAR + (y - 1970 + 1) / 4 * SECS_PER_DAY); } /* ytos */ - /*-------------------------------------------------------------------------+ | Function: mtos | Description: Convert months to seconds since January. @@ -144,7 +141,6 @@ rtcin(uint8_t what) return r; } /* rtcin */ - /*-------------------------------------------------------------------------+ | Functions +--------------------------------------------------------------------------*/ @@ -175,7 +171,6 @@ init_rtc(void) printf("RTC BIOS diagnostic error %b\n", s, RTCDG_BITS); */ } /* init_rtc */ - /*-------------------------------------------------------------------------+ | Function: rtc_read | Description: Read present time from RTC and return it. diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c index a0b468e52b..a4010f568e 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console.c +++ b/c/src/lib/libbsp/i386/pc386/console/console.c @@ -125,7 +125,6 @@ ibmpc_console_write(int minor, const char *buf, int len) return 0; } - int kbd_poll_read( int minor ) { if( rtems_kbpoll() ) @@ -174,7 +173,6 @@ void __assert (const char *file, int line, const char *msg) } - /*-------------------------------------------------------------------------+ | Console device driver INITIALIZE entry point. +--------------------------------------------------------------------------+ @@ -187,7 +185,6 @@ console_initialize(rtems_device_major_number major, { rtems_status_code status; - /* Initialize the KBD interface */ kbd_init(); @@ -241,7 +238,6 @@ console_initialize(rtems_device_major_number major, /* 9600-8-N-1 */ BSP_uart_init(BSPConsolePort, 9600, CHR_8_BITS, 0, 0, 0); - /* Set interrupt handler */ if(BSPConsolePort == BSP_UART_COM1) { @@ -303,7 +299,6 @@ console_initialize(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* console_initialize */ - static int console_open_count = 0; static int console_last_close(int major, int minor, void *arg) @@ -391,7 +386,6 @@ console_close(rtems_device_major_number major, return rtems_termios_close (arg); } /* console_close */ - /*-------------------------------------------------------------------------+ | Console device driver READ entry point. +--------------------------------------------------------------------------+ @@ -405,7 +399,6 @@ console_read(rtems_device_major_number major, return rtems_termios_read( arg ); } /* console_read */ - /*-------------------------------------------------------------------------+ | Console device driver WRITE entry point. +--------------------------------------------------------------------------+ @@ -431,7 +424,6 @@ console_write(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* console_write */ - extern int vt_ioctl( unsigned int cmd, unsigned long arg); /* diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c b/c/src/lib/libbsp/i386/pc386/console/fb_vga.c index 8c678b8081..57e45097f5 100644 --- a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c +++ b/c/src/lib/libbsp/i386/pc386/console/fb_vga.c @@ -11,6 +11,9 @@ // MODIFICATION/HISTORY: // // $Log$ +// Revision 1.2 2004/04/21 10:42:44 ralf +// Remove stray white spaces. +// // Revision 1.1 2000/08/30 08:15:30 joel // 2000-08-26 Rosimildo da Silva <rdasilva@connecttel.com> // @@ -66,7 +69,6 @@ extern void ega_hwinit( void ); extern void ega_hwterm( void ); - /* screen information for the VGA driver */ static struct fb_screeninfo fb_info = { @@ -79,7 +81,6 @@ static struct fb_screeninfo fb_info = FB_VISUAL_PSEUDOCOLOR /* color scheme used */ }; - static __u16 red16[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0x5555, 0x5555, 0x5555, 0x5555, 0xffff, 0xffff, 0xffff, 0xffff @@ -116,7 +117,6 @@ fbvga_initialize( rtems_device_major_number major, return RTEMS_SUCCESSFUL; } - /* * fbvga device driver OPEN entry point */ @@ -142,7 +142,6 @@ fbvga_close(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } - /* * fbvga device driver READ entry point. * Read characters from the PS/2 mouse. @@ -158,7 +157,6 @@ fbvga_read( rtems_device_major_number major, return RTEMS_SUCCESSFUL; } - /* * fbvga device driver WRITE entry point. * Write characters to the PS/2 mouse. @@ -174,14 +172,12 @@ fbvga_write( rtems_device_major_number major, return RTEMS_SUCCESSFUL; } - static int get_screen_info( struct fb_screeninfo *info ) { *info = fb_info; return 0; } - static int get_palette( struct fb_cmap *cmap ) { __u32 i; @@ -198,7 +194,6 @@ static int get_palette( struct fb_cmap *cmap ) return 0; } - static int set_palette( struct fb_cmap *cmap ) { __u32 i; @@ -215,7 +210,6 @@ static int set_palette( struct fb_cmap *cmap ) return 0; } - /* * IOCTL entry point -- This method is called to carry * all services of this interface. diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_vga.h b/c/src/lib/libbsp/i386/pc386/console/fb_vga.h index 643c892949..9030f13b4b 100644 --- a/c/src/lib/libbsp/i386/pc386/console/fb_vga.h +++ b/c/src/lib/libbsp/i386/pc386/console/fb_vga.h @@ -16,6 +16,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. * @@ -84,7 +87,6 @@ rtems_device_driver fbvga_close( void * ); - rtems_device_driver fbvga_read( rtems_device_major_number, rtems_device_minor_number, diff --git a/c/src/lib/libbsp/i386/pc386/console/i386kbd.h b/c/src/lib/libbsp/i386/pc386/console/i386kbd.h index c3fe9463a6..b6fa0bea8b 100644 --- a/c/src/lib/libbsp/i386/pc386/console/i386kbd.h +++ b/c/src/lib/libbsp/i386/pc386/console/i386kbd.h @@ -58,8 +58,6 @@ extern unsigned char pckbd_sysrq_xlate[128]; #define aux_free_irq(dev_id) /* free_irq(AUX_IRQ, dev_id) */ - - /* * include/linux/pc_keyb.h * @@ -78,8 +76,6 @@ extern unsigned char pckbd_sysrq_xlate[128]; #undef KBD_IS_FOCUS_9000 /* We have the brain-damaged FOCUS-9000 keyboard */ #undef INITIALIZE_MOUSE /* Define if your PS/2 mouse needs initialization. */ - - #define KBD_INIT_TIMEOUT 1000 /* Timeout in ms for initializing the keyboard */ #define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */ #define KBD_TIMEOUT 1000 /* Timeout in ms for keyboard command acknowledge */ diff --git a/c/src/lib/libbsp/i386/pc386/console/inch.c b/c/src/lib/libbsp/i386/pc386/console/inch.c index 264b0ae0a4..e7d7e1c5ec 100644 --- a/c/src/lib/libbsp/i386/pc386/console/inch.c +++ b/c/src/lib/libbsp/i386/pc386/console/inch.c @@ -66,7 +66,6 @@ static char shift_map[] = '1','2','3','0',177 }; /* Keyboard scancode -> character map with SHIFT key modifier. */ - static unsigned short kbd_buffer[KBD_BUF_SIZE]; static uint16_t kbd_first = 0; static uint16_t kbd_last = 0; @@ -85,7 +84,6 @@ void rtemsReboot(void) outport_byte(0x64, 0xFE); /* use keyboard controler to do the job... */ } /* rtemsReboot */ - /*-------------------------------------------------------------------------+ | Function: _IBMPC_scankey | Description: This function can be called during a poll for input, or by @@ -238,7 +236,6 @@ _IBMPC_chrdy(char *c) return FALSE; } /* _IBMPC_chrdy */ - /*-------------------------------------------------------------------------+ | Function: _IBMPC_inch | Description: Poll keyboard until a character is ready and return it. @@ -256,7 +253,6 @@ _IBMPC_inch(void) return c; } /* _IBMPC_inch */ - /* * Routine that can be used before interrupt management is initialized. */ diff --git a/c/src/lib/libbsp/i386/pc386/console/kd.h b/c/src/lib/libbsp/i386/pc386/console/kd.h index 963c8cc935..1e4bc4ffeb 100644 --- a/c/src/lib/libbsp/i386/pc386/console/kd.h +++ b/c/src/lib/libbsp/i386/pc386/console/kd.h @@ -10,6 +10,9 @@ // // MODIFICATION/HISTORY: // $Log$ +// Revision 1.2 2004/04/21 10:42:44 ralf +// Remove stray white spaces. +// // Revision 1.1 2000/08/30 08:15:30 joel // 2000-08-26 Rosimildo da Silva <rdasilva@connecttel.com> // @@ -110,7 +113,6 @@ struct kbsentry { unsigned char kb_string[512]; }; - struct kbdiacr { unsigned char diacr, base, result; }; diff --git a/c/src/lib/libbsp/i386/pc386/console/keyboard.c b/c/src/lib/libbsp/i386/pc386/console/keyboard.c index 0be2ef4e15..8327334ebb 100644 --- a/c/src/lib/libbsp/i386/pc386/console/keyboard.c +++ b/c/src/lib/libbsp/i386/pc386/console/keyboard.c @@ -56,8 +56,6 @@ extern void add_to_queue( unsigned short ); extern void rtemsReboot( void ); - - int set_bit(int nr, unsigned long * addr) { int mask, retval,level; @@ -96,7 +94,6 @@ int test_bit(int nr, unsigned long * addr) #define test_and_set_bit(x,y) set_bit(x,y) #define test_and_clear_bit(x,y) clear_bit(x,y) - /* * global state includes the following, and various static variables * in this module: prev_scancode, shift_state, diacr, npadch, dead_key_next. @@ -123,7 +120,6 @@ static char rep = 0; /* flag telling character repeat */ /* default console for RTEMS */ static int fg_console = 0; - struct kbd_struct kbd_table[MAX_NR_CONSOLES]; static struct kbd_struct * kbd = kbd_table; @@ -150,7 +146,6 @@ static k_hand key_handler[16] = { typedef void (*void_fnp)(void); typedef void (void_fn)(void); - static void show_mem(void) { } @@ -211,7 +206,6 @@ void to_utf8(ushort c) { but we need only 16 bits here */ } - /* * Translation of escaped scancodes to keycodes. * This is now user-settable (for machines were it makes sense). @@ -277,7 +271,6 @@ void handle_scancode(unsigned char scancode, int down) } else rep = test_and_set_bit(keycode, key_down); - #ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */ if (keycode == SYSRQ_KEY) { sysrq_pressed = !up_flag; @@ -289,7 +282,6 @@ void handle_scancode(unsigned char scancode, int down) } #endif - if (kbd->kbdmode == VC_MEDIUMRAW) { /* soon keycodes will require more than one byte */ put_queue(keycode + up_flag); @@ -320,7 +312,6 @@ void handle_scancode(unsigned char scancode, int down) int shift_final = shift_state ^ kbd->lockstate ^ kbd->slockstate; ushort *key_map = key_maps[shift_final]; - if (key_map != NULL) { keysym = key_map[keycode]; type = KTYP(keysym); @@ -383,7 +374,6 @@ static void put_queue(int ch) } } - static void puts_queue(char *cp) { while (*cp) { @@ -578,7 +568,6 @@ static void do_dead2(unsigned char value, char up_flag) diacr = (diacr ? handle_diacr(value) : value); } - /* * We have a combining character DIACR here, followed by the character CH. * If the combination occurs in the table, return the corresponding value. @@ -846,7 +835,6 @@ void register_leds(int console, unsigned int led, static inline unsigned char getleds(void){ - struct kbd_struct *kbd = kbd_table + fg_console; unsigned char leds; @@ -899,13 +887,11 @@ static void kbd_bh(void) } } - void set_leds(void) { kbd_bh(); } - int kbd_init(void) { diff --git a/c/src/lib/libbsp/i386/pc386/console/keyboard.h b/c/src/lib/libbsp/i386/pc386/console/keyboard.h index 2946235039..77476baf06 100644 --- a/c/src/lib/libbsp/i386/pc386/console/keyboard.h +++ b/c/src/lib/libbsp/i386/pc386/console/keyboard.h @@ -10,6 +10,9 @@ // // MODIFICATION/HISTORY: // $Log$ +// Revision 1.3 2004/04/21 10:42:44 ralf +// Remove stray white spaces. +// // Revision 1.2 2000/08/30 17:06:23 joel // 2000-08-30 Joel Sherrill <joel@OARcorp.com> // @@ -82,7 +85,6 @@ extern unsigned char keyboard_type; #define MAX_NR_FUNC 256 /* max nr of strings assigned to keys */ #define MAX_NR_CONSOLES 1 - extern char *func_table[MAX_NR_FUNC]; #define KT_LATIN 0 /* we depend on this being zero */ @@ -360,7 +362,6 @@ extern char *func_table[MAX_NR_FUNC]; #define K_F245 K(KT_FN,254) #define K_UNDO K(KT_FN,255) - #define K_HOLE K(KT_SPEC,0) #define K_ENTER K(KT_SPEC,1) #define K_SH_REGS K(KT_SPEC,2) @@ -623,5 +624,4 @@ void compute_shiftstate(void); extern unsigned int keymap_count; - #endif diff --git a/c/src/lib/libbsp/i386/pc386/console/mouse_parser.c b/c/src/lib/libbsp/i386/pc386/console/mouse_parser.c index 308ace335f..bd68efd568 100644 --- a/c/src/lib/libbsp/i386/pc386/console/mouse_parser.c +++ b/c/src/lib/libbsp/i386/pc386/console/mouse_parser.c @@ -30,7 +30,6 @@ #include "mouse_parser.h" #include "serial_mouse.h" - /* NOTE NOTE NOTE NOTE: Select here the mouse type !!!!! */ @@ -225,7 +224,6 @@ static int ParsePC(int byte) return 0; } - /* * Input routine for Microsoft mouse. * Returns nonzero when a new mouse state has been completed. @@ -394,7 +392,6 @@ void register_kbd_msg_queue( char *q_name, int port ) kbd_set_driver_handler( kbd_parser ); } - void unregister_kbd_msg_queue( int port ) { kbd_set_driver_handler( NULL ); diff --git a/c/src/lib/libbsp/i386/pc386/console/mouse_parser.h b/c/src/lib/libbsp/i386/pc386/console/mouse_parser.h index 40d491f2c4..5746e365f4 100644 --- a/c/src/lib/libbsp/i386/pc386/console/mouse_parser.h +++ b/c/src/lib/libbsp/i386/pc386/console/mouse_parser.h @@ -31,5 +31,4 @@ void unregister_kbd_msg_queue( int port ); } #endif - #endif /* __mouse_parser_h__ */ diff --git a/c/src/lib/libbsp/i386/pc386/console/outch.c b/c/src/lib/libbsp/i386/pc386/console/outch.c index ae6cb6d288..ecf08ae2ca 100644 --- a/c/src/lib/libbsp/i386/pc386/console/outch.c +++ b/c/src/lib/libbsp/i386/pc386/console/outch.c @@ -17,7 +17,6 @@ * $Id$ */ - #include <bsp.h> #include <stdlib.h> @@ -76,7 +75,6 @@ doCRNL(int cr, int nl) wr_cursor(row * maxCol + column, ioCrtBaseAddr); } - int (*videoHook)(char, int *)=0; static void @@ -101,7 +99,6 @@ gotorc(int r, int c) /* erase current location without moving the cursor */ #define BLANK ((char)0x7f) - static void videoPutChar(char car) { @@ -273,7 +270,6 @@ static int escaped = 0; videoPutChar(c); } /* _IBMPC_outch */ - /*-------------------------------------------------------------------------+ | Function: _IBMPC_initVideo | Description: Video system initialization. Hook for any early setup. @@ -309,14 +305,12 @@ _IBMPC_initVideo(void) #endif } /* _IBMPC_initVideo */ - /* for old DOS compatibility n-curses type of applications */ void gotoxy( int x, int y ) { gotorc(y,x); } - int whereX( void ) { return row; diff --git a/c/src/lib/libbsp/i386/pc386/console/pc_keyb.c b/c/src/lib/libbsp/i386/pc386/console/pc_keyb.c index 074d84e38a..90dc6ed86c 100644 --- a/c/src/lib/libbsp/i386/pc386/console/pc_keyb.c +++ b/c/src/lib/libbsp/i386/pc386/console/pc_keyb.c @@ -165,7 +165,6 @@ static unsigned char e0_keys[128] = { 0, 0, 0, 0, 0, 0, 0, 0 /* 0x78-0x7f */ }; - static void mdelay( unsigned long t ) { Wait_X_ms( t ); @@ -218,7 +217,6 @@ int pckbd_translate(unsigned char scancode, unsigned char *keycode, { static int prev_scancode = 0; - /* special prefix scancodes.. */ if (scancode == 0xe0 || scancode == 0xe1) { prev_scancode = scancode; @@ -318,8 +316,6 @@ char pckbd_unexpected_up(unsigned char keycode) return 0200; } - - static void kb_wait(void) { unsigned long timeout = KBC_TIMEOUT; @@ -341,7 +337,6 @@ static void kb_wait(void) #endif } - /* * This reads the keyboard status port, and does the * appropriate action. @@ -389,7 +384,6 @@ static unsigned char handle_kbd_event(void) return status; } - void keyboard_interrupt( void ) { handle_kbd_event(); @@ -595,7 +589,6 @@ static char * initialize_kbd(void) kbd_wait_for_input(); } - kbd_write_output_w(KBD_CMD_ENABLE); if (kbd_wait_for_input() != KBD_REPLY_ACK) return "Enable keyboard: no ACK"; @@ -611,7 +604,6 @@ static char * initialize_kbd(void) return NULL; } - void pckbd_init_hw(void) { /* kbd_request_region(); */ diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h b/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h index bfa9c2a32a..2f55272d64 100644 --- a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h +++ b/c/src/lib/libbsp/i386/pc386/console/ps2_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. * @@ -83,7 +86,6 @@ rtems_device_driver paux_close( void * ); - rtems_device_driver paux_read( rtems_device_major_number, rtems_device_minor_number, diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c index 5149822229..2cd69e4f42 100644 --- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c +++ b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c @@ -74,7 +74,6 @@ static void mdelay( unsigned long t ) Wait_X_ms( t ); } - static void* termios_ttyp_paux = NULL; static void @@ -94,11 +93,9 @@ static int isr_is_on(const rtems_irq_connect_data *irq) return BSP_irq_enabled_at_i8259s( irq->name ); } - static rtems_irq_connect_data ps2_isr_data = { AUX_IRQ, ps2_mouse_interrupt, isr_on, isr_off, isr_is_on }; - /* * Wait for keyboard controller input buffer to drain. * @@ -161,7 +158,6 @@ static int do_acknowledge(unsigned char scancode) return 1; } - static inline void handle_mouse_event(unsigned char scancode) { if (mouse_reply_expected) { @@ -228,7 +224,6 @@ static unsigned char handle_kbd_event(void) return status; } - static void ps2_mouse_interrupt() { handle_kbd_event(); @@ -404,7 +399,6 @@ static unsigned char get_from_queue(void) return result; } - static int queue_empty(void) { return queue->head == queue->tail; @@ -439,7 +433,6 @@ static int open_aux() } queue->head = queue->tail = 0; /* Flush input queue */ - status = BSP_install_rtems_irq_handler( &ps2_isr_data ); if( !status ) { @@ -578,7 +571,6 @@ paux_initialize( rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* tty_initialize */ - static int paux_last_close(int major, int minor, void *arg) { release_aux(); @@ -595,7 +587,6 @@ static int write_aux_echo( int minor, const char * buffer, int count ) return 0; } - /* * Some initialization if necessary */ @@ -607,7 +598,6 @@ paux_first_open( rtems_device_minor_number major, return RTEMS_SUCCESSFUL; } - /* * paux device driver OPEN entry point */ @@ -645,7 +635,6 @@ paux_close(rtems_device_major_number major, return (rtems_termios_close (arg)); } - /* * paux device driver READ entry point. * Read characters from the PS/2 mouse. @@ -658,7 +647,6 @@ paux_read(rtems_device_major_number major, return rtems_termios_read (arg); } /* tty_read */ - /* * paux device driver WRITE entry point. * Write characters to the PS/2 mouse. @@ -675,7 +663,6 @@ paux_write(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* tty_write */ - /* * Handle ioctl request. */ diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.h b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.h index 4a3d083f1c..adb39c114f 100644 --- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.h +++ b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.h @@ -19,8 +19,6 @@ #undef KBD_IS_FOCUS_9000 /* We have the brain-damaged FOCUS-9000 keyboard */ #undef INITIALIZE_MOUSE /* Define if your PS/2 mouse needs initialization. */ - - #define KBD_INIT_TIMEOUT 1000 /* Timeout in ms for initializing the keyboard */ #define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */ #define KBD_TIMEOUT 1000 /* Timeout in ms for keyboard command acknowledge */ diff --git a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c index b34d13b41c..5eb9c5500a 100644 --- a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c +++ b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.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 2000/12/05 16:37:38 joel * 2000-12-01 Joel Sherrill <joel@OARcorp.com> * @@ -59,7 +62,6 @@ 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; @@ -162,7 +164,6 @@ serial_mouse_initialize(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* tty_initialize */ - static int serial_mouse_last_close(int major, int minor, void *arg) { BSP_remove_rtems_irq_handler( &serial_mouse_isr_data ); @@ -220,7 +221,6 @@ serial_mouse_close(rtems_device_major_number major, } /* tty_close */ - /* * TTY device driver READ entry point. * Read characters from the tty device. @@ -233,7 +233,6 @@ serial_mouse_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. @@ -286,8 +285,6 @@ serial_mouse_control(rtems_device_major_number major, return serial_mouse_control_internal( BSP_UART_PORT, arg ); } - - static int conSetAttr(int port, int minor, const struct termios *t) { diff --git a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.h b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.h index 2a7385d453..b5642f19d6 100644 --- a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.h +++ b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.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. * @@ -58,7 +61,6 @@ extern "C" { #endif - /* ttyS1 entry points */ rtems_device_driver serial_mouse_initialize( rtems_device_major_number, @@ -78,7 +80,6 @@ rtems_device_driver serial_mouse_control( void * ); - /* serial_mouse entry points */ rtems_device_driver serial_mouse_close( rtems_device_major_number, @@ -86,7 +87,6 @@ rtems_device_driver serial_mouse_close( void * ); - rtems_device_driver serial_mouse_read( rtems_device_major_number, rtems_device_minor_number, @@ -99,7 +99,6 @@ rtems_device_driver serial_mouse_write( void * ); - /* Select the mouse type: "ms","pc","ps2" */ #define MOUSE_TYPE "ms" @@ -107,7 +106,6 @@ rtems_device_driver serial_mouse_write( #define SERIAL_MOUSE_COM1 1 /* #define SERIAL_MOUSE_COM2 1 */ - #define SERIAL_MOUSE_DRIVER_TABLE_ENTRY \ { serial_mouse_initialize, serial_mouse_open, serial_mouse_close, \ serial_mouse_read, serial_mouse_write, serial_mouse_control } diff --git a/c/src/lib/libbsp/i386/pc386/console/vgainit.c b/c/src/lib/libbsp/i386/pc386/console/vgainit.c index 124689f327..2dc89906dc 100644 --- a/c/src/lib/libbsp/i386/pc386/console/vgainit.c +++ b/c/src/lib/libbsp/i386/pc386/console/vgainit.c @@ -22,7 +22,6 @@ #define MODE_MAX 3 typedef int MODE; /* drawing mode*/ - /* Define one and only one of the following to be nonzero*/ #define VGA_ET4000 0 /* TSENG LABS ET4000 chip 800x600*/ #define VGA_STANDARD 1 /* standard VGA 640x480*/ @@ -150,7 +149,6 @@ out_word(unsigned int p,unsigned int d) outp(p + 1, (d >> 8) & 0xff); } - /* Values for the data rotate register to implement drawing modes. */ static unsigned char mode_table[MODE_MAX + 1] = { 0x00, 0x18, 0x10, 0x08 @@ -168,7 +166,6 @@ setmode(MODE mode) outp(GRVAL, mode_table[mode]); } - #if VGA_ET4000 /* VGA 800x600 16-color graphics (BIOS mode 0x29). @@ -268,7 +265,6 @@ static REGIO graphics_on[] = { DONE, 0, 0, 0, 0 }; - /* VGA 80x25 text (BIOS mode 3). */ static REGIO graph_off[] = { @@ -368,7 +364,6 @@ static REGIO graph_off[] = { #endif - #if VGA_STANDARD /* VGA 640x480 16-color graphics (BIOS mode 0x12). @@ -468,7 +463,6 @@ static REGIO graphics_on[] = { { DONE, 0, 0, 0, 0 } }; - /* VGA 80x25 text (BIOS mode 3). */ static REGIO graph_off[] = { @@ -568,7 +562,6 @@ static REGIO graph_off[] = { #endif - #if EGA_STANDARD /* EGA 640x350 16-color graphics (BIOS mode 0x10). @@ -668,7 +661,6 @@ static REGIO graphics_on[] = { DONE, 0, 0, 0, 0 }; - /* EGA 80x25 text (BIOS mode 3). */ static REGIO graph_off[] = { diff --git a/c/src/lib/libbsp/i386/pc386/console/vt.c b/c/src/lib/libbsp/i386/pc386/console/vt.c index 631a7d532f..fdca7c8619 100644 --- a/c/src/lib/libbsp/i386/pc386/console/vt.c +++ b/c/src/lib/libbsp/i386/pc386/console/vt.c @@ -109,7 +109,6 @@ _kd_mksound(unsigned int hz, unsigned int ticks) void (*kd_mksound)(unsigned int hz, unsigned int ticks) = _kd_mksound; - #define i (tmp.kb_index) #define s (tmp.kb_table) #define v (tmp.kb_value) @@ -144,7 +143,6 @@ do_kdsk_ioctl(int cmd, struct kbentry *user_kbe, int perm, struct kbd_struct *kb #undef s #undef v - #define HZ 100 static inline int diff --git a/c/src/lib/libbsp/i386/pc386/ide/idecfg.c b/c/src/lib/libbsp/i386/pc386/ide/idecfg.c index b84855a7b8..4d1ef8a473 100644 --- a/c/src/lib/libbsp/i386/pc386/ide/idecfg.c +++ b/c/src/lib/libbsp/i386/pc386/ide/idecfg.c @@ -23,7 +23,6 @@ #include <libchip/ide_ctrl_cfg.h> #include <libchip/ide_ctrl_io.h> - /* * The following table configures the functions used for IDE drivers * in this BSP. diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h index ef5d43ea84..c76c5e454e 100644 --- a/c/src/lib/libbsp/i386/pc386/include/bsp.h +++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h @@ -38,7 +38,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #ifndef __BSP_H_ #define __BSP_H_ @@ -211,7 +210,6 @@ void rtemsReboot(void); /* from 'exit.c' */ void Wait_X_ms(unsigned int timeToWait); /* from 'timer.c' */ - /* Definitions for BSPConsolePort */ #define BSP_CONSOLE_PORT_CONSOLE (-1) #define BSP_CONSOLE_PORT_COM1 (BSP_UART_COM1) diff --git a/c/src/lib/libbsp/i386/pc386/include/crt.h b/c/src/lib/libbsp/i386/pc386/include/crt.h index c750777cfb..e1537b899a 100644 --- a/c/src/lib/libbsp/i386/pc386/include/crt.h +++ b/c/src/lib/libbsp/i386/pc386/include/crt.h @@ -25,7 +25,6 @@ /* In color */ #define V_COLOR 0xb8000 - /* * Video Option Byte location. It must be maintained * by the BIOS. @@ -72,7 +71,6 @@ #define OFF 0 #define ON 1 - /* * CRT Controller register offset definitions */ diff --git a/c/src/lib/libbsp/i386/pc386/start/start.S b/c/src/lib/libbsp/i386/pc386/start/start.S index bef9448bc8..c09903e807 100644 --- a/c/src/lib/libbsp/i386/pc386/start/start.S +++ b/c/src/lib/libbsp/i386/pc386/start/start.S @@ -64,7 +64,6 @@ BEGIN_CODE EXTERN (debugPollingGetChar) EXTERN (checkCPUtypeSetCr0) - /* * In case this crashes on your machine and this is not due * to video mode set by the loader, you may try to define diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c index 56a4e3ad60..1162de1b88 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c @@ -30,7 +30,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #include <bsp.h> #include <rtems/libio.h> #include <rtems/libcsupport.h> @@ -84,7 +83,6 @@ void bsp_pretasking_hook(void) uint32_t topAddr, val; int i; - if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1)) /* not aligned => align it */ rtemsFreeMemStart = (rtemsFreeMemStart+CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); @@ -119,7 +117,6 @@ void bsp_pretasking_hook(void) bsp_libc_init((void *)rtemsFreeMemStart, _heap_size, 0); rtemsFreeMemStart += _heap_size; /* HEAP_SIZE in KBytes */ - #ifdef RTEMS_DEBUG rtems_debug_enable(RTEMS_DEBUG_ALL_MASK); @@ -127,7 +124,6 @@ void bsp_pretasking_hook(void) #endif /* RTEMS_DEBUG */ } /* bsp_pretasking_hook */ - /*-------------------------------------------------------------------------+ | Function: bsp_start | Description: Called before main is invoked. diff --git a/c/src/lib/libbsp/i386/pc386/startup/exit.c b/c/src/lib/libbsp/i386/pc386/startup/exit.c index 4364f0544f..052eeff68f 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/exit.c +++ b/c/src/lib/libbsp/i386/pc386/startup/exit.c @@ -30,7 +30,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #include <stdio.h> #include <bsp.h> #include <rtems/libio.h> diff --git a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S index f9279c292b..d3cc96ecaf 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S +++ b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S @@ -204,7 +204,6 @@ SYM (_Global_descriptor_table): .word 0xffff, 0 .byte 0, 0x92, 0xcf, 0 - /*---------------------------------------------------------------------------+ | Descriptor of GDT +--------------------------------------------------------------------------*/ @@ -212,7 +211,6 @@ SYM (gdtdesc): .word (3*8 - 1) .long SYM (_Global_descriptor_table) - /*---------------------------------------------------------------------------+ | IDT itself +---------------------------------------------------------------------------*/ diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c index 3024ac70c7..210dd7f6f2 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/timer.c +++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c @@ -38,7 +38,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #include <stdlib.h> #include <bsp.h> @@ -90,7 +89,6 @@ rdtsc(void) return result; } /* rdtsc */ - /*-------------------------------------------------------------------------+ | Function: Timer_exit | Description: Timer cleanup routine at RTEMS exit. NOTE: This routine is @@ -104,7 +102,6 @@ Timer_exit(void) { } /* Timer_exit */ - /*-------------------------------------------------------------------------+ | Function: Timer_initialize | Description: Timer initialization routine. @@ -126,7 +123,6 @@ Timer_initialize(void) Ttimer_val = rdtsc(); /* read starting time */ } /* Timer_initialize */ - /*-------------------------------------------------------------------------+ | Function: Read_timer | Description: Read hardware timer value. @@ -156,7 +152,6 @@ Read_timer(void) +--------------------------------------------------------------------------*/ #define US_PER_ISR 250 /* Number of micro-seconds per timer interruption */ - /*-------------------------------------------------------------------------+ | Function: Timer_exit | Description: Timer cleanup routine at RTEMS exit. NOTE: This routine is @@ -178,7 +173,6 @@ timerOff(const rtems_raw_irq_connect_data* used) outport_byte(TIMER_CNTR0, 0); } /* Timer_exit */ - static void timerOn(const rtems_raw_irq_connect_data* used) { @@ -248,7 +242,6 @@ Timer_initialize(void) Ttimer_val = 0; } /* Timer_initialize */ - /*-------------------------------------------------------------------------+ | Function: Read_timer | Description: Read hardware timer value. @@ -278,7 +271,6 @@ Read_timer(void) #endif /* pentium */ - /*-------------------------------------------------------------------------+ | Function: Empty_function | Description: Empty function used in time tests. @@ -291,7 +283,6 @@ rtems_status_code Empty_function(void) return RTEMS_SUCCESSFUL; } /* Empty function */ - /*-------------------------------------------------------------------------+ | Function: Set_find_average_overhead | Description: Set internal Timer_driver_Find_average_overhead flag value. @@ -319,7 +310,6 @@ void loadTimerValue( unsigned short loadedValue ) outport_byte(TIMER_CNTR0, (loadedValue >> 8) & 0xff); } - /*-------------------------------------------------------------------------+ | Description: Reads the current value of the timer, and converts the | number of ticks to micro-seconds. diff --git a/c/src/lib/libbsp/i386/pc386/timer/timerisr.S b/c/src/lib/libbsp/i386/pc386/timer/timerisr.S index b7afdfefee..a4b922567b 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/timerisr.S +++ b/c/src/lib/libbsp/i386/pc386/timer/timerisr.S @@ -30,7 +30,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #include <rtems/asm.h> BEGIN_CODE diff --git a/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c b/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c index fed169eac8..087d1e8ded 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c +++ b/c/src/lib/libbsp/i386/pc386/tools/bin2boot.c @@ -32,7 +32,6 @@ static void usage(void) return; } - int main(int argc, char* argv[]) { int c, verbose; @@ -130,7 +129,6 @@ int main(int argc, char* argv[]) return 1; } - /* Copy first image out and remember its length */ cnt = 0; for(;;) @@ -177,7 +175,6 @@ int main(int argc, char* argv[]) size1 = cnt; } - /* Let us check agains overlapping */ if(!(addr1 >= (headerAddr + sizeof(buf)) || (headerAddr >= addr1+size1))) { @@ -199,7 +196,6 @@ int main(int argc, char* argv[]) return 1; } - if(optind == (argc - 1)) { imageCnt = 1; @@ -364,7 +360,6 @@ writeHeader: buf[0x23] = 4; - /* Load address */ buf[0x24] = addr2 & 0xff; buf[0x25] = (addr2 >> 8) & 0xff; diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c index 1e336f6f4f..820a2bf9c8 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c +++ b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c @@ -287,7 +287,6 @@ wd_rxDaemon (void *arg) for (;;){ - rtems_bsdnet_event_receive (INTERRUPT_EVENT, RTEMS_WAIT|RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, @@ -490,7 +489,6 @@ wd_stop (struct wd_softc *sc) } - /* * Show interface statistics */ @@ -606,7 +604,6 @@ rtems_wd_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) else mtu = ETHERMTU; - if (config->irno) sc->irqInfo.name = config->irno; else |