i386/pc: Initialise the printk serial port on first use

This commit is contained in:
Chris Johns
2020-06-17 15:57:26 +10:00
parent 4a8b135dd6
commit bc73a08598
2 changed files with 37 additions and 12 deletions

View File

@@ -46,15 +46,14 @@
#define CLOCK_RATE (115200 * 16)
static uint8_t com_get_register(uint32_t addr, uint8_t i)
static uint8_t com_get_register(uintptr_t addr, uint8_t i)
{
register uint8_t val;
uint8_t val;
inport_byte( (addr + i), val );
return val;
}
static void com_set_register(uint32_t addr, uint8_t i, uint8_t val)
static void com_set_register(uintptr_t addr, uint8_t i, uint8_t val)
{
outport_byte( (addr + i), val );
}

View File

@@ -29,6 +29,28 @@
rtems_device_minor_number BSPPrintkPort = 0;
static bool serialInit;
static bool serialOK;
static bool serialValid(console_tbl *port)
{
if (port->pDeviceFns) {
if (!serialInit) {
serialOK = true;
if (port->pDeviceFns->deviceProbe != NULL) {
if (!port->pDeviceFns->deviceProbe( BSPPrintkPort ))
serialOK = false;
else if (port->pDeviceFns->deviceInitialize != NULL)
port->pDeviceFns->deviceInitialize( BSPPrintkPort );
else
serialOK = false;
}
serialInit = true;
}
}
return serialOK;
}
void BSP_outch(char ch);
int BSP_inch(void);
@@ -42,11 +64,13 @@ void BSP_outch(char ch)
if ( !isVga ) {
console_tbl *port = Console_Port_Tbl[BSPPrintkPort];
if (port->pDeviceFns && port->pDeviceFns->deviceWritePolled) {
if (serialValid(port)) {
if (port->pDeviceFns->deviceWritePolled) {
port->pDeviceFns->deviceWritePolled( BSPPrintkPort, ch );
}
return;
}
}
#if BSP_ENABLE_VGA
_IBMPC_outch( ch );
@@ -65,13 +89,15 @@ int BSP_inch(void)
if ( !isVga ) {
console_tbl *port = Console_Port_Tbl[BSPPrintkPort];
if (port->pDeviceFns && port->pDeviceFns->deviceRead) {
if (serialValid(port)) {
if (port->pDeviceFns->deviceRead) {
do {
result = port->pDeviceFns->deviceRead( BSPPrintkPort );
} while (result == -1);
return result;
}
}
}
#if BSP_ENABLE_VGA
result = BSP_wait_polled_input();