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

Match new RTL API to fix build
All checks were successful
Builds / ExectOS (amd64) (push) Successful in 30s
Details
Builds / ExectOS (i686) (push) Successful in 48s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2023-12-06 22:56:31 +01:00
parent 1c94f9ff02
commit cd1ab2128b
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xtldr2/config.c
View File

@ -55,13 +55,13 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
SIZE_T Length; SIZE_T Length;
/* Tokenize provided options */ /* Tokenize provided options */
Argument = RtlWideStringTokenize(Options, L" ", &LastArg); Argument = RtlTokenizeWideString(Options, L" ", &LastArg);
/* Iterate over all arguments passed to boot loader */ /* Iterate over all arguments passed to boot loader */
while(Argument != NULL) while(Argument != NULL)
{ {
/* Check all provided parameters */ /* Check all provided parameters */
if(RtlWideStringCompare(Argument, L"DEFAULT=", 8) == 0) if(RtlCompareWideString(Argument, L"DEFAULT=", 8) == 0)
{ {
/* Skip to the argument value and calculate argument length */ /* Skip to the argument value and calculate argument length */
Argument += 8; Argument += 8;
@ -72,7 +72,7 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
RtlCopyMemory(BlpConfiguration.Default, Argument, (Length * sizeof(WCHAR)) - 1); RtlCopyMemory(BlpConfiguration.Default, Argument, (Length * sizeof(WCHAR)) - 1);
BlpConfiguration.Default[Length] = '\0'; BlpConfiguration.Default[Length] = '\0';
} }
else if(RtlWideStringCompare(Argument, L"DEBUG=", 6) == 0) else if(RtlCompareWideString(Argument, L"DEBUG=", 6) == 0)
{ {
/* Skip to the argument value */ /* Skip to the argument value */
Argument += 6; Argument += 6;
@ -87,12 +87,12 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
BlpConfiguration.Debug[Length] = '\0'; BlpConfiguration.Debug[Length] = '\0';
} }
} }
else if(RtlWideStringCompare(Argument, L"SHELL", 5) == 0) else if(RtlCompareWideString(Argument, L"SHELL", 5) == 0)
{ {
/* Force shell mode */ /* Force shell mode */
BlpConfiguration.Shell = TRUE; BlpConfiguration.Shell = TRUE;
} }
else if(RtlWideStringCompare(Argument, L"TIMEOUT=", 8) == 0) else if(RtlCompareWideString(Argument, L"TIMEOUT=", 8) == 0)
{ {
/* Skip to the argument value */ /* Skip to the argument value */
Argument += 8; Argument += 8;
@ -108,7 +108,7 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
Argument++; Argument++;
} }
} }
else if(RtlWideStringCompare(Argument, L"TUNE=", 5) == 0) else if(RtlCompareWideString(Argument, L"TUNE=", 5) == 0)
{ {
/* Skip to the argument value */ /* Skip to the argument value */
Argument += 5; Argument += 5;
@ -121,6 +121,6 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
} }
/* Take next argument */ /* Take next argument */
Argument = RtlWideStringTokenize(NULL, L" ", &LastArg); Argument = RtlTokenizeWideString(NULL, L" ", &LastArg);
} }
} }

2
xtldr2/console.c
View File

@ -79,7 +79,7 @@ BlConsolePrint(IN PUINT16 Format,
BlpStringPrint(BlpConsolePrintChar, Format, Arguments); BlpStringPrint(BlpConsolePrintChar, Format, Arguments);
/* Print to serial console only if not running under OVMF */ /* Print to serial console only if not running under OVMF */
if(RtlWideStringCompare(EfiSystemTable->FirmwareVendor, L"EDK II", 6) != 0) if(RtlCompareWideString(EfiSystemTable->FirmwareVendor, L"EDK II", 6) != 0)
{ {
/* Check if debugging enabled and if EFI serial port is fully initialized */ /* Check if debugging enabled and if EFI serial port is fully initialized */
if(DEBUG && (BlpSerialPort.Flags & COMPORT_FLAG_INIT)) if(DEBUG && (BlpSerialPort.Flags & COMPORT_FLAG_INIT))

10
xtldr2/debug.c
View File

@ -78,13 +78,13 @@ BlpInitializeDebugConsole()
if(BlpConfiguration.Debug) if(BlpConfiguration.Debug)
{ {
/* Find all debug ports */ /* Find all debug ports */
DebugPort = RtlWideStringTokenize(BlpConfiguration.Debug, L";", &LastPort); DebugPort = RtlTokenizeWideString(BlpConfiguration.Debug, L";", &LastPort);
/* Iterate over all debug ports */ /* Iterate over all debug ports */
while(DebugPort != NULL) while(DebugPort != NULL)
{ {
/* Check what port is set for debugging */ /* Check what port is set for debugging */
if(RtlWideStringCompare(DebugPort, L"COM", 3) == 0) if(RtlCompareWideString(DebugPort, L"COM", 3) == 0)
{ {
/* Read COM port number */ /* Read COM port number */
DebugPort += 3; DebugPort += 3;
@ -97,7 +97,7 @@ BlpInitializeDebugConsole()
} }
/* Check if custom COM port address supplied */ /* Check if custom COM port address supplied */
if(PortNumber == 0 && RtlWideStringCompare(DebugPort, L":0x", 3) == 0) if(PortNumber == 0 && RtlCompareWideString(DebugPort, L":0x", 3) == 0)
{ {
/* COM port address provided */ /* COM port address provided */
DebugPort += 3; DebugPort += 3;
@ -140,7 +140,7 @@ BlpInitializeDebugConsole()
/* Enable debug port */ /* Enable debug port */
BlpConfiguration.DebugPort |= XTBL_DEBUGPORT_SERIAL; BlpConfiguration.DebugPort |= XTBL_DEBUGPORT_SERIAL;
} }
else if(RtlWideStringCompare(DebugPort, L"SCREEN", 5) == 0) else if(RtlCompareWideString(DebugPort, L"SCREEN", 5) == 0)
{ {
/* Enable debug port */ /* Enable debug port */
BlpConfiguration.DebugPort |= XTBL_DEBUGPORT_SCREEN; BlpConfiguration.DebugPort |= XTBL_DEBUGPORT_SCREEN;
@ -153,7 +153,7 @@ BlpInitializeDebugConsole()
} }
/* Take next debug port */ /* Take next debug port */
DebugPort = RtlWideStringTokenize(NULL, L";", &LastPort); DebugPort = RtlTokenizeWideString(NULL, L";", &LastPort);
} }
} }