Changeset 441b90e in rtems
- Timestamp:
- 02/01/12 20:32:28 (11 years ago)
- Branches:
- 4.11, 5, master
- Children:
- d1887baf
- Parents:
- 41572c4
- git-author:
- Jennifer Averett <Jennifer.Averett@…> (02/01/12 20:32:28)
- git-committer:
- Joel Sherrill <joel.sherrill@…> (02/01/12 20:32:28)
- Location:
- c/src/lib/libbsp/i386/pc386
- Files:
-
- 1 added
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libbsp/i386/pc386/Makefile.am
r41572c4 r441b90e 80 80 console/kbd_parser.c console/serial_mouse_config.c \ 81 81 ../../i386/shared/comm/uart.c ../../i386/shared/comm/tty_drv.c \ 82 ../../shared/console.c ../../shared/console_select.c \82 ../../shared/console.c console/console_select.c \ 83 83 ../../shared/console_read.c ../../shared/console_write.c \ 84 84 console/console_control.c console/conscfg.c console/printk_support.c \ -
c/src/lib/libbsp/i386/pc386/console/printk_support.c
r41572c4 r441b90e 23 23 #include <libchip/serial.h> 24 24 #include <libchip/ns16550.h> 25 26 BSP_output_char_function_type BSP_output_char = _IBMPC_outch; 27 BSP_polling_getchar_function_type BSP_poll_char = BSP_wait_polled_input; 25 #include "../../../shared/console_private.h" 28 26 29 27 rtems_device_minor_number BSPPrintkPort = 0; … … 33 31 ); 34 32 35 void BSP_com_outch(char ch) 33 void BSP_outch(char ch); 34 int BSP_inch(void); 35 36 void BSP_outch(char ch) 36 37 { 37 console_tbl *cptr; 38 if ( BSPPrintkPort == BSP_CONSOLE_VGA ) { 39 _IBMPC_outch( ch ); 40 } else { 41 console_tbl *cptr; 38 42 39 cptr = &Console_Configuration_Ports[BSPPrintkPort];40 41 return cptr->pDeviceFns->deviceWritePolled( BSPPrintkPort, ch );43 cptr = &Console_Configuration_Ports[BSPPrintkPort]; 44 cptr->pDeviceFns->deviceWritePolled( BSPPrintkPort, ch ); 45 } 42 46 } 43 47 44 int BSP_ com_inch( void)48 int BSP_inch(void) 45 49 { 46 50 int result; 47 console_tbl *cptr;48 51 49 cptr = &Console_Configuration_Ports[BSPPrintkPort]; 50 51 do { 52 result = ns16550_inbyte_nonblocking_polled( BSPPrintkPort ); 53 } while (result == -1); 54 52 if ( BSPPrintkPort == BSP_CONSOLE_VGA ) { 53 result = BSP_wait_polled_input(); 54 } else { 55 do { 56 result = ns16550_inbyte_nonblocking_polled( BSPPrintkPort ); 57 } while (result == -1); 58 } 55 59 return result; 56 60 } 57 61 62 BSP_output_char_function_type BSP_output_char = BSP_outch; 63 BSP_polling_getchar_function_type BSP_poll_char = BSP_inch; 64 -
c/src/lib/libbsp/i386/pc386/include/bsp.h
r41572c4 r441b90e 135 135 136 136 /*-------------------------------------------------------------------------+ 137 | Console Defines 138 | WARNING: These Values MUST match the order in 139 | Console_Configuration_Ports 140 +--------------------------------------------------------------------------*/ 141 #define BSP_CONSOLE_VGA 0 142 #define BSP_CONSOLE_COM1 1 143 #define BSP_CONSOLE_COM2 2 144 145 /*-------------------------------------------------------------------------+ 137 146 | Macros 138 147 +--------------------------------------------------------------------------*/ -
c/src/lib/libbsp/i386/pc386/start/start.S
r41572c4 r441b90e 69 69 EXTERN (debugPollingGetChar) 70 70 EXTERN (checkCPUtypeSetCr0) 71 EXTERN (BSP_console_select)72 71 EXTERN (printk) 73 72 #ifdef __SSE__
Note: See TracChangeset
for help on using the changeset viewer.