Merged in MHR-31 (pull request #16)

MHR-31: Round robin scheduler.

5 files changed, 14 insertions, 13 deletions

diff --git a/Boot/BootKit/BootKit.hxx b/Boot/BootKit/BootKit.hxx
index 3eab16cb..93b9986e 100644
--- a/Boot/BootKit/BootKit.hxx
+++ b/Boot/BootKit/BootKit.hxx
@@ -279,7 +279,7 @@ private:
 
 		/// before going to forks, we must check for the catalog name first.
 		if (blob->fKind == kNewFSCatalogKindDir &&
-			blob->fFileName[strlen(blob->fFileName) - 1] != '/')
+			blob->fFileName[strlen(blob->fFileName) - 1] != kNewFSSeparator)
 		{
 			EFI::ThrowError(L"Developer-Error", L"This is caused by the developer of the bootloader.");
 		}
diff --git a/Boot/NetBoot/NetBoot.hxx b/Boot/NetBoot/NetBoot.hxx
index ccb43290..e3119c5f 100644
--- a/Boot/NetBoot/NetBoot.hxx
+++ b/Boot/NetBoot/NetBoot.hxx
@@ -19,9 +19,8 @@ typedef struct NetBootInternetHeader
 	CharacterTypeUTF8 NB3; /// magic char 3 'T'
 	CharacterTypeUTF8 NB4; /// magic char 4 'B'
 
-	CharacterTypeUTF8 PatchName[255]; /// example: ColdChoco
-	NewOS::Int32 PatchLength; /// the patch length.
+	CharacterTypeUTF8 PatchName[255];	/// example: ColdChoco
+	NewOS::Int32	  PatchLength;		/// the patch length.
 	CharacterTypeUTF8 PatchTarget[255]; /// the target file.
-	NewOS::Boolean ImpliesROM; /// does it implies EEPROM patching?
+	NewOS::Boolean	  ImpliesROM;		/// does it implies EEPROM patching?
 } NetBootInternetHeader;
-
diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx
index 5ab7914a..fab212ee 100644
--- a/Boot/Sources/HEL/AMD64/BootMain.cxx
+++ b/Boot/Sources/HEL/AMD64/BootMain.cxx
@@ -81,8 +81,8 @@ STATIC Bool CheckBootDevice(BootDeviceATA& ataDev)
 EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 							  EfiSystemTable* SystemTable)
 {
-	InitEFI(SystemTable);	   ///! Init the EFI library.
-	InitVideoFB(); ///! Init the GOP.
+	InitEFI(SystemTable); ///! Init the EFI library.
+	InitVideoFB();		  ///! Init the GOP.
 
 	BTextWriter writer;
 
@@ -146,13 +146,13 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr	  ImageHandle,
 	GXInit();
 
 	GXDraw(RGB(9d, 9d, 9d), handoverHdrPtr->f_GOP.f_Height,
-					handoverHdrPtr->f_GOP.f_Width, 0, 0);
+		   handoverHdrPtr->f_GOP.f_Width, 0, 0);
 
 	GXFini();
 
 	GXDrawImg(NewBoot, NEWBOOT_HEIGHT, NEWBOOT_WIDTH,
-					(handoverHdrPtr->f_GOP.f_Width - NEWBOOT_WIDTH) / 2,
-					(handoverHdrPtr->f_GOP.f_Height - NEWBOOT_HEIGHT) / 2);
+			  (handoverHdrPtr->f_GOP.f_Width - NEWBOOT_WIDTH) / 2,
+			  (handoverHdrPtr->f_GOP.f_Height - NEWBOOT_HEIGHT) / 2);
 
 	GXFini();
 
diff --git a/Boot/makefile b/Boot/amd64-efi.make
index 4bee19a2..37ac3704 100644
--- a/Boot/makefile
+++ b/Boot/amd64-efi.make
@@ -12,10 +12,12 @@ ADD_FILE=touch
 COPY=cp
 HTTP_GET=wget
 
-ifneq ($(shell uname), Windows_NT)
+# Select this for UNIX distributions
+ifneq ($(shell uname), CYGWIN_NT-10.0-19045)
 EMU=qemu-system-x86_64
 else
-EMU=qemu-system-x86_64w
+# this for NT distributions
+EMU=qemu-system-x86_64w.exe
 endif
 
 ifeq ($(NEWS_MODEL), )
@@ -26,7 +28,7 @@ BIOS=OVMF.fd
 IMG=epm.img
 IMG_2=epm-slave.img
 
-EMU_FLAGS=-net none -smp 4 -serial stdio -m 4G -M q35 \
+EMU_FLAGS=-net none -smp 4 -m 4G -M q35 -d int \
 			-bios $(BIOS) -device piix3-ide,id=ide \
 			-drive id=disk,file=$(IMG),format=raw,if=none \
 			-device ide-hd,drive=disk,bus=ide.0 -drive \
diff --git a/Boot/Sources/ovmf.ps1 b/Boot/download-ovmf.ps1
index 5a2c5f0e..5a2c5f0e 100644
--- a/Boot/Sources/ovmf.ps1
+++ b/Boot/download-ovmf.ps1