xt-sys/exectos
3
5
Fork 2
Code Issues 6 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Store all configuration in a linked list, read config from INI file and EFI shell
All checks were successful
Builds / ExectOS (amd64) (push) Successful in 46s
Details
Builds / ExectOS (i686) (push) Successful in 25s
Details

Browse Source
This commit is contained in:
Rafal Kupiec
2023-12-11 16:31:15 +01:00
parent 6ffedf6302
commit 0cea10ad42
9 changed files with 344 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
xtldr2/debug.c
View File

@@ -36,14 +36,14 @@ BlDebugPrint(IN PUINT16 Format,
VA_START(Arguments, Format);
/* Check if serial debug port is enabled */
if((BlpConfiguration.DebugPort & XTBL_DEBUGPORT_SERIAL) && (BlpSerialPort.Flags & COMPORT_FLAG_INIT))
if((BlpDebugPort & XTBL_DEBUGPORT_SERIAL) && (BlpSerialPort.Flags & COMPORT_FLAG_INIT))
{
/* Format and print the string to the serial console */
BlpStringPrint(BlpDebugPutChar, Format, Arguments);
}
/* Check if screen debug port is enabled and Boot Services are still available */
if((BlpConfiguration.DebugPort & XTBL_DEBUGPORT_SCREEN) && (BlpStatus.BootServices == TRUE))
if((BlpDebugPort & XTBL_DEBUGPORT_SCREEN) && (BlpStatus.BootServices == TRUE))
{
/* Format and print the string to the screen */
BlpStringPrint(BlpConsolePrintChar, Format, Arguments);
@@ -66,7 +66,7 @@ EFI_STATUS
BlpInitializeDebugConsole()
{
ULONG PortAddress, PortNumber, BaudRate;
PWCHAR DebugPort, LastPort;
PWCHAR DebugConfiguration, DebugPort, LastPort;
EFI_STATUS Status;
/* Set default serial port options */
@@ -74,11 +74,14 @@ BlpInitializeDebugConsole()
PortNumber = 0;
BaudRate = 0;
/* Make sure any debug options are provided */
if(BlpConfiguration.Debug)
/* Get debug configuration */
DebugConfiguration = BlGetConfigValue(L"DEBUG");
/* Make sure any debug options are provided and debug console is not initialized yet */
if(DebugConfiguration && BlpDebugPort == 0)
{
/* Find all debug ports */
DebugPort = RtlTokenizeWideString(BlpConfiguration.Debug, L";", &LastPort);
DebugPort = RtlTokenizeWideString(DebugConfiguration, L";", &LastPort);
/* Iterate over all debug ports */
while(DebugPort != NULL)
@@ -138,12 +141,12 @@ BlpInitializeDebugConsole()
}
/* Enable debug port */
BlpConfiguration.DebugPort |= XTBL_DEBUGPORT_SERIAL;
BlpDebugPort |= XTBL_DEBUGPORT_SERIAL;
}
else if(RtlCompareWideStringInsensitive(DebugPort, L"SCREEN", 5) == 0)
{
/* Enable debug port */
BlpConfiguration.DebugPort |= XTBL_DEBUGPORT_SCREEN;
BlpDebugPort |= XTBL_DEBUGPORT_SCREEN;
}
else
{
@@ -158,14 +161,14 @@ BlpInitializeDebugConsole()
}
/* Check if serial debug port is enabled */
if(BlpConfiguration.DebugPort & XTBL_DEBUGPORT_SERIAL)
if(BlpDebugPort & XTBL_DEBUGPORT_SERIAL)
{
/* Try to initialize COM port */
Status = BlpInitializeSerialPort(PortNumber, PortAddress, BaudRate);
if(Status != STATUS_EFI_SUCCESS)
{
/* Remove serial debug port, as COM port initialization failed and return */
BlpConfiguration.DebugPort &= ~XTBL_DEBUGPORT_SERIAL;
BlpDebugPort &= ~XTBL_DEBUGPORT_SERIAL;
return Status;
}
}