Adding Simple Pointer, GOP, SimpleTextInEx, and Networking protocols to the emulator. Cleaned up POSIX include situation by centralizing it in a single file, like NT32. Fixed TPL issue with TPL High not being emulated correctly, it was possible to take a timer tick when the locks in the DXE core should have prevented this. Remove some unused files to make things easier to maintain.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11105 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 17 insertions, 31 deletions

diff --git a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
index 00c0414211..52618d73a0 100644
--- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
+++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-This following section documents the envirnoment variables for the Win UNIX 

+This following section documents the environment variables for the UNIX 

 build.  These variables are used to define the (virtual) hardware 

 configuration of the UNIX environment

 

@@ -118,15 +118,17 @@ EFI_DRIVER_BINDING_PROTOCOL           gUnixBusDriverBinding = {
 // device path.

 //

 UNIX_PCD_ENTRY  mPcdEnvironment[] = {

-  {PcdToken(PcdUnixConsole),       &gEfiUnixConsoleGuid},

-  {PcdToken(PcdUnixUga),           &gEfiUnixUgaGuid},

-  {PcdToken(PcdUnixFileSystem),    &gEfiUnixFileSystemGuid},

-  {PcdToken(PcdUnixSerialPort),    &gEfiUnixSerialPortGuid},

-  {PcdToken(PcdUnixVirtualDisk),   &gEfiUnixVirtualDisksGuid},

-  {PcdToken(PcdUnixPhysicalDisk),  &gEfiUnixPhysicalDisksGuid},

-  {PcdToken(PcdUnixCpuModel),      &gEfiUnixCPUModelGuid},

-  {PcdToken(PcdUnixCpuSpeed),      &gEfiUnixCPUSpeedGuid},

-  {PcdToken(PcdUnixMemorySize),    &gEfiUnixMemoryGuid}

+  {PcdToken(PcdUnixConsole),           &gEfiUnixConsoleGuid},

+  {PcdToken(PcdUnixUga),               &gEfiUnixUgaGuid},

+  {PcdToken(PcdUnixGop),               &gEfiUnixGopGuid},

+  {PcdToken(PcdUnixFileSystem),        &gEfiUnixFileSystemGuid},

+  {PcdToken(PcdUnixSerialPort),        &gEfiUnixSerialPortGuid},

+  {PcdToken(PcdUnixVirtualDisk),       &gEfiUnixVirtualDisksGuid},

+  {PcdToken(PcdUnixPhysicalDisk),      &gEfiUnixPhysicalDisksGuid},

+  {PcdToken(PcdUnixCpuModel),          &gEfiUnixCPUModelGuid},

+  {PcdToken(PcdUnixCpuSpeed),          &gEfiUnixCPUSpeedGuid},

+  {PcdToken(PcdUnixMemorySize),        &gEfiUnixMemoryGuid},

+  {PcdToken(PcdUnixNetworkInterface),  &gEfiUnixNetworkGuid}

 };

 

 VOID *

@@ -168,13 +170,6 @@ Returns:
   None

 

 --*/

-// TODO:    This - add argument and description to function comment

-// TODO:    ControllerHandle - add argument and description to function comment

-// TODO:    RemainingDevicePath - add argument and description to function comment

-// TODO:    EFI_UNSUPPORTED - add return value to function comment

-// TODO:    EFI_UNSUPPORTED - add return value to function comment

-// TODO:    EFI_SUCCESS - add return value to function comment

-// TODO:    EFI_SUCCESS - add return value to function comment

 {

   EFI_STATUS                Status;

   EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;

@@ -300,12 +295,6 @@ Returns:
   None

 

 --*/

-// TODO:    This - add argument and description to function comment

-// TODO:    ControllerHandle - add argument and description to function comment

-// TODO:    RemainingDevicePath - add argument and description to function comment

-// TODO:    EFI_OUT_OF_RESOURCES - add return value to function comment

-// TODO:    EFI_OUT_OF_RESOURCES - add return value to function comment

-// TODO:    EFI_SUCCESS - add return value to function comment

 {

   EFI_STATUS                      Status;

   EFI_STATUS                      InstallStatus;

@@ -403,7 +392,7 @@ Returns:
     StartString = TempStr;

 

     //

-    // Parse the envirnment variable into sub strings using '!' as a delimator.

+    // Parse the environment variable into sub strings using '!' as a delimator.

     // Each substring needs it's own handle to be added to the system. This code

     // does not understand the sub string. Thats the device drivers job.

     //

@@ -566,13 +555,6 @@ Returns:
     None

 

 --*/

-// TODO:    This - add argument and description to function comment

-// TODO:    ControllerHandle - add argument and description to function comment

-// TODO:    NumberOfChildren - add argument and description to function comment

-// TODO:    ChildHandleBuffer - add argument and description to function comment

-// TODO:    EFI_SUCCESS - add return value to function comment

-// TODO:    EFI_DEVICE_ERROR - add return value to function comment

-// TODO:    EFI_SUCCESS - add return value to function comment

 {

   EFI_STATUS                Status;

   UINTN                     Index;

diff --git a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
index bf83906cb2..b5eb940f42 100644
--- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
+++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
@@ -61,6 +61,7 @@
 [Guids]

   gEfiUnixConsoleGuid                          # ALWAYS_CONSUMED

   gEfiUnixUgaGuid                              # ALWAYS_CONSUMED

+  gEfiUnixGopGuid                              # ALWAYS_CONSUMED

   gEfiUnixSerialPortGuid                       # ALWAYS_CONSUMED

   gEfiUnixFileSystemGuid                       # ALWAYS_CONSUMED

   gEfiUnixPhysicalDisksGuid                    # ALWAYS_CONSUMED

@@ -68,6 +69,7 @@
   gEfiUnixCPUModelGuid

   gEfiUnixCPUSpeedGuid

   gEfiUnixMemoryGuid

+  gEfiUnixNetworkGuid

 

 

 [Protocols]

@@ -86,5 +88,7 @@
   gEfiUnixPkgTokenSpaceGuid.PcdUnixVirtualDisk

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFileSystem

   gEfiUnixPkgTokenSpaceGuid.PcdUnixUga

+  gEfiUnixPkgTokenSpaceGuid.PcdUnixGop

   gEfiUnixPkgTokenSpaceGuid.PcdUnixConsole

+  gEfiUnixPkgTokenSpaceGuid.PcdUnixNetworkInterface