Add BlockIO support to the emulator, still needs testing. Also update Emulator start code to only pass 2 args in place of 3. The 3rd argument is not needed. Still need a function as the BaseLib functoin does not have the correct calling conventions. Cleanup build script for binary shell case.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11718 6f19259b-4bc3-4df7-8a09-765794883524
author: andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> 2011-05-31 20:23:36 +0000
committer: andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> 2011-05-31 20:23:36 +0000
commit: d59326d3a871f1df6e9416334ca2181ac4373d42 (patch)
tree: 1ed7cfdd245be8f6edcb3061a371cdaf4c835734
parent: 283d361e98f2e7da579b022426d3dfb4fc1e33a8 (diff)
download: edk2-platforms-d59326d3a871f1df6e9416334ca2181ac4373d42.tar.xz
17 files changed, 3128 insertions, 34 deletions
diff --git a/InOsEmuPkg/EmuBlockIoDxe/ComponentName.c b/InOsEmuPkg/EmuBlockIoDxe/ComponentName.c
new file mode 100644
index 0000000000..2cad6ca836
--- /dev/null
+++ b/InOsEmuPkg/EmuBlockIoDxe/ComponentName.c
@@ -0,0 +1,354 @@
+/**@file
+
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  ComponentName.c
+
+Abstract:
+
+**/
+
+#include "EmuBlockIo.h"
+
+//
+// EFI Component Name Functions
+//
+/**
+  Retrieves a Unicode string that is the user readable name of the driver.
+
+  This function retrieves the user readable name of a driver in the form of a
+  Unicode string. If the driver specified by This has a user readable name in
+  the language specified by Language, then a pointer to the driver name is
+  returned in DriverName, and EFI_SUCCESS is returned. If the driver specified
+  by This does not support the language specified by Language,
+  then EFI_UNSUPPORTED is returned.
+
+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
+                                EFI_COMPONENT_NAME_PROTOCOL instance.
+
+  @param  Language[in]          A pointer to a Null-terminated ASCII string
+                                array indicating the language. This is the
+                                language of the driver name that the caller is
+                                requesting, and it must match one of the
+                                languages specified in SupportedLanguages. The
+                                number of languages supported by a driver is up
+                                to the driver writer. Language is specified
+                                in RFC 4646 or ISO 639-2 language code format.
+
+  @param  DriverName[out]       A pointer to the Unicode string to return.
+                                This Unicode string is the name of the
+                                driver specified by This in the language
+                                specified by Language.
+
+  @retval EFI_SUCCESS           The Unicode string for the Driver specified by
+                                This and the language specified by Language was
+                                returned in DriverName.
+
+  @retval EFI_INVALID_PARAMETER Language is NULL.
+
+  @retval EFI_INVALID_PARAMETER DriverName is NULL.
+
+  @retval EFI_UNSUPPORTED       The driver specified by This does not support
+                                the language specified by Language.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoComponentNameGetDriverName (
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,
+  IN  CHAR8                        *Language,
+  OUT CHAR16                       **DriverName
+  );
+
+
+/**
+  Retrieves a Unicode string that is the user readable name of the controller
+  that is being managed by a driver.
+
+  This function retrieves the user readable name of the controller specified by
+  ControllerHandle and ChildHandle in the form of a Unicode string. If the
+  driver specified by This has a user readable name in the language specified by
+  Language, then a pointer to the controller name is returned in ControllerName,
+  and EFI_SUCCESS is returned.  If the driver specified by This is not currently
+  managing the controller specified by ControllerHandle and ChildHandle,
+  then EFI_UNSUPPORTED is returned.  If the driver specified by This does not
+  support the language specified by Language, then EFI_UNSUPPORTED is returned.
+
+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
+                                EFI_COMPONENT_NAME_PROTOCOL instance.
+
+  @param  ControllerHandle[in]  The handle of a controller that the driver
+                                specified by This is managing.  This handle
+                                specifies the controller whose name is to be
+                                returned.
+
+  @param  ChildHandle[in]       The handle of the child controller to retrieve
+                                the name of.  This is an optional parameter that
+                                may be NULL.  It will be NULL for device
+                                drivers.  It will also be NULL for a bus drivers
+                                that wish to retrieve the name of the bus
+                                controller.  It will not be NULL for a bus
+                                driver that wishes to retrieve the name of a
+                                child controller.
+
+  @param  Language[in]          A pointer to a Null-terminated ASCII string
+                                array indicating the language.  This is the
+                                language of the driver name that the caller is
+                                requesting, and it must match one of the
+                                languages specified in SupportedLanguages. The
+                                number of languages supported by a driver is up
+                                to the driver writer. Language is specified in
+                                RFC 4646 or ISO 639-2 language code format.
+
+  @param  ControllerName[out]   A pointer to the Unicode string to return.
+                                This Unicode string is the name of the
+                                controller specified by ControllerHandle and
+                                ChildHandle in the language specified by
+                                Language from the point of view of the driver
+                                specified by This.
+
+  @retval EFI_SUCCESS           The Unicode string for the user readable name in
+                                the language specified by Language for the
+                                driver specified by This was returned in
+                                DriverName.
+
+  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.
+
+  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid
+                                EFI_HANDLE.
+
+  @retval EFI_INVALID_PARAMETER Language is NULL.
+
+  @retval EFI_INVALID_PARAMETER ControllerName is NULL.
+
+  @retval EFI_UNSUPPORTED       The driver specified by This is not currently
+                                managing the controller specified by
+                                ControllerHandle and ChildHandle.
+
+  @retval EFI_UNSUPPORTED       The driver specified by This does not support
+                                the language specified by Language.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoComponentNameGetControllerName (
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,
+  IN  EFI_HANDLE                                      ControllerHandle,
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,
+  IN  CHAR8                                           *Language,
+  OUT CHAR16                                          **ControllerName
+  );
+
+//
+// EFI Component Name Protocol
+//
+GLOBAL_REMOVE_IF_UNREFERENCED  EFI_COMPONENT_NAME_PROTOCOL     gEmuBlockIoComponentName = {
+  EmuBlockIoComponentNameGetDriverName,
+  EmuBlockIoComponentNameGetControllerName,
+  "eng"
+};
+
+//
+// EFI Component Name 2 Protocol
+//
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuBlockIoComponentName2 = {
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) EmuBlockIoComponentNameGetDriverName,
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) EmuBlockIoComponentNameGetControllerName,
+  "en"
+};
+
+
+EFI_UNICODE_STRING_TABLE mEmuBlockIoDriverNameTable[] = {
+  { "eng;en", L"Emu Block I/O Driver" },
+  { NULL , NULL }
+};
+
+/**
+  Retrieves a Unicode string that is the user readable name of the driver.
+
+  This function retrieves the user readable name of a driver in the form of a
+  Unicode string. If the driver specified by This has a user readable name in
+  the language specified by Language, then a pointer to the driver name is
+  returned in DriverName, and EFI_SUCCESS is returned. If the driver specified
+  by This does not support the language specified by Language,
+  then EFI_UNSUPPORTED is returned.
+
+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
+                                EFI_COMPONENT_NAME_PROTOCOL instance.
+
+  @param  Language[in]          A pointer to a Null-terminated ASCII string
+                                array indicating the language. This is the
+                                language of the driver name that the caller is
+                                requesting, and it must match one of the
+                                languages specified in SupportedLanguages. The
+                                number of languages supported by a driver is up
+                                to the driver writer. Language is specified
+                                in RFC 4646 or ISO 639-2 language code format.
+
+  @param  DriverName[out]       A pointer to the Unicode string to return.
+                                This Unicode string is the name of the
+                                driver specified by This in the language
+                                specified by Language.
+
+  @retval EFI_SUCCESS           The Unicode string for the Driver specified by
+                                This and the language specified by Language was
+                                returned in DriverName.
+
+  @retval EFI_INVALID_PARAMETER Language is NULL.
+
+  @retval EFI_INVALID_PARAMETER DriverName is NULL.
+
+  @retval EFI_UNSUPPORTED       The driver specified by This does not support
+                                the language specified by Language.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoComponentNameGetDriverName (
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,
+  IN  CHAR8                        *Language,
+  OUT CHAR16                       **DriverName
+  )
+{
+  return LookupUnicodeString2 (
+          Language,
+          This->SupportedLanguages,
+          mEmuBlockIoDriverNameTable,
+          DriverName,
+           (BOOLEAN)(This == &gEmuBlockIoComponentName)
+          );
+}
+
+/**
+  Retrieves a Unicode string that is the user readable name of the controller
+  that is being managed by a driver.
+
+  This function retrieves the user readable name of the controller specified by
+  ControllerHandle and ChildHandle in the form of a Unicode string. If the
+  driver specified by This has a user readable name in the language specified by
+  Language, then a pointer to the controller name is returned in ControllerName,
+  and EFI_SUCCESS is returned.  If the driver specified by This is not currently
+  managing the controller specified by ControllerHandle and ChildHandle,
+  then EFI_UNSUPPORTED is returned.  If the driver specified by This does not
+  support the language specified by Language, then EFI_UNSUPPORTED is returned.
+
+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or
+                                EFI_COMPONENT_NAME_PROTOCOL instance.
+
+  @param  ControllerHandle[in]  The handle of a controller that the driver
+                                specified by This is managing.  This handle
+                                specifies the controller whose name is to be
+                                returned.
+
+  @param  ChildHandle[in]       The handle of the child controller to retrieve
+                                the name of.  This is an optional parameter that
+                                may be NULL.  It will be NULL for device
+                                drivers.  It will also be NULL for a bus drivers
+                                that wish to retrieve the name of the bus
+                                controller.  It will not be NULL for a bus
+                                driver that wishes to retrieve the name of a
+                                child controller.
+
+  @param  Language[in]          A pointer to a Null-terminated ASCII string
+                                array indicating the language.  This is the
+                                language of the driver name that the caller is
+                                requesting, and it must match one of the
+                                languages specified in SupportedLanguages. The
+                                number of languages supported by a driver is up
+                                to the driver writer. Language is specified in
+                                RFC 4646 or ISO 639-2 language code format.
+
+  @param  ControllerName[out]   A pointer to the Unicode string to return.
+                                This Unicode string is the name of the
+                                controller specified by ControllerHandle and
+                                ChildHandle in the language specified by
+                                Language from the point of view of the driver
+                                specified by This.
+
+  @retval EFI_SUCCESS           The Unicode string for the user readable name in
+                                the language specified by Language for the
+                                driver specified by This was returned in
+                                DriverName.
+
+  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.
+
+  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid
+                                EFI_HANDLE.
+
+  @retval EFI_INVALID_PARAMETER Language is NULL.
+
+  @retval EFI_INVALID_PARAMETER ControllerName is NULL.
+
+  @retval EFI_UNSUPPORTED       The driver specified by This is not currently
+                                managing the controller specified by
+                                ControllerHandle and ChildHandle.
+
+  @retval EFI_UNSUPPORTED       The driver specified by This does not support
+                                the language specified by Language.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoComponentNameGetControllerName (
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,
+  IN  EFI_HANDLE                                      ControllerHandle,
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,
+  IN  CHAR8                                           *Language,
+  OUT CHAR16                                          **ControllerName
+  )
+{
+  EFI_STATUS              Status;
+  EFI_BLOCK_IO_PROTOCOL   *BlockIo;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+
+  //
+  // This is a device driver, so ChildHandle must be NULL.
+  //
+  if (ChildHandle != NULL) {
+    return EFI_UNSUPPORTED;
+  }
+  //
+  // Make sure this driver is currently managing ControllerHandle
+  //
+  Status = EfiTestManagedDevice (
+             ControllerHandle,
+             gEmuBlockIoDriverBinding.DriverBindingHandle,
+             &gEmuIoThunkProtocolGuid
+             );
+  if (EFI_ERROR (Status)) {
+    return EFI_UNSUPPORTED;
+  }
+  //
+  // Get our context back
+  //
+  Status = gBS->OpenProtocol (
+                  ControllerHandle,
+                  &gEfiBlockIoProtocolGuid,
+                  (VOID  **)&BlockIo,
+                  gEmuBlockIoDriverBinding.DriverBindingHandle,
+                  ControllerHandle,
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                  );
+  if (EFI_ERROR (Status)) {
+    return EFI_UNSUPPORTED;
+  }
+
+  Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (BlockIo);
+
+  return LookupUnicodeString2 (
+          Language,
+           This->SupportedLanguages,
+           Private->ControllerNameTable,
+           ControllerName,
+           (BOOLEAN)(This == &gEmuBlockIoComponentName)
+          );
+}
diff --git a/InOsEmuPkg/EmuBlockIoDxe/DriverConfiguration.c b/InOsEmuPkg/EmuBlockIoDxe/DriverConfiguration.c
new file mode 100644
index 0000000000..44a3cc33e3
--- /dev/null
+++ b/InOsEmuPkg/EmuBlockIoDxe/DriverConfiguration.c
@@ -0,0 +1,338 @@
+/**@file
+
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  DriverConfiguration.c
+
+Abstract:
+
+**/
+
+#include "EmuBlockIo.h"
+
+//
+// EFI Driver Configuration Functions
+//
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverConfigurationSetOptions (
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
+  IN  EFI_HANDLE                                             ControllerHandle,
+  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,
+  IN  CHAR8                                                  *Language,
+  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired
+  );
+
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverConfigurationOptionsValid (
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,
+  IN  EFI_HANDLE                                      ControllerHandle,
+  IN  EFI_HANDLE                                      ChildHandle  OPTIONAL
+  );
+
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverConfigurationForceDefaults (
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
+  IN  EFI_HANDLE                                             ControllerHandle,
+  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,
+  IN  UINT32                                                 DefaultType,
+  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired
+  );
+
+//
+// EFI Driver Configuration Protocol
+//
+EFI_DRIVER_CONFIGURATION_PROTOCOL gEmuBlockIoDriverConfiguration = {
+  EmuBlockIoDriverConfigurationSetOptions,
+  EmuBlockIoDriverConfigurationOptionsValid,
+  EmuBlockIoDriverConfigurationForceDefaults,
+  "eng"
+};
+
+/*++
+
+  Routine Description:
+    Allows the user to set controller specific options for a controller that a 
+    driver is currently managing.
+
+  Arguments:
+    This             - A pointer to the EFI_DRIVER_CONFIGURATION_ PROTOCOL instance.
+    ControllerHandle - The handle of the controller to set options on.
+    ChildHandle      - The handle of the child controller to set options on.  This
+                       is an optional parameter that may be NULL.  It will be NULL 
+                       for device drivers, and for a bus drivers that wish to set 
+                       options for the bus controller.  It will not be NULL for a 
+                       bus driver that wishes to set options for one of its child 
+                       controllers.
+    Language         - A pointer to a three character ISO 639-2 language identifier.
+                       This is the language of the user interface that should be 
+                       presented to the user, and it must match one of the languages 
+                       specified in SupportedLanguages.  The number of languages 
+                       supported by a driver is up to the driver writer.
+    ActionRequired   - A pointer to the action that the calling agent is required 
+                       to perform when this function returns.  See "Related 
+                       Definitions" for a list of the actions that the calling 
+                       agent is required to perform prior to accessing 
+                       ControllerHandle again.
+
+  Returns:
+    EFI_SUCCESS           - The driver specified by This successfully set the 
+                            configuration options for the controller specified 
+                            by ControllerHandle..
+    EFI_INVALID_PARAMETER - ControllerHandle is not a valid EFI_HANDLE.
+    EFI_INVALID_PARAMETER - ChildHandle is not NULL and it is not a valid EFI_HANDLE.
+    EFI_INVALID_PARAMETER - ActionRequired is NULL.
+    EFI_UNSUPPORTED       - The driver specified by This does not support setting 
+                            configuration options for the controller specified by 
+                            ControllerHandle and ChildHandle.
+    EFI_UNSUPPORTED       - The driver specified by This does not support the 
+                            language specified by Language.
+    EFI_DEVICE_ERROR      - A device error occurred while attempt to set the 
+                            configuration options for the controller specified 
+                            by ControllerHandle and ChildHandle.
+    EFI_OUT_RESOURCES     - There are not enough resources available to set the 
+                            configuration options for the controller specified 
+                            by ControllerHandle and ChildHandle.
+
+--*/
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverConfigurationSetOptions (
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
+  IN  EFI_HANDLE                                             ControllerHandle,
+  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,
+  IN  CHAR8                                                  *Language,
+  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired
+  )
+{
+  EFI_STATUS            Status;
+  EFI_BLOCK_IO_PROTOCOL *BlockIo;
+  CHAR8                 *SupportedLanguage;
+
+  SupportedLanguage = This->SupportedLanguages;
+
+  Status            = EFI_UNSUPPORTED;
+  while (*SupportedLanguage != 0) {
+    if (AsciiStrnCmp (Language, SupportedLanguage, 3) == 0) {
+      Status = EFI_SUCCESS;
+    }
+
+    SupportedLanguage += 3;
+  }
+
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  if (ActionRequired == NULL || ControllerHandle == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (ChildHandle != NULL) {
+    return EFI_UNSUPPORTED;
+  }
+
+  //
+  // Validate controller handle
+  //
+  Status = gBS->OpenProtocol (
+                  ControllerHandle,
+                  &gEmuIoThunkProtocolGuid,
+                  (VOID **)&BlockIo,
+                  gEmuBlockIoDriverBinding.DriverBindingHandle,
+                  ControllerHandle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+
+  if (!EFI_ERROR (Status)) {
+    gBS->CloseProtocol (
+          ControllerHandle,
+          &gEmuIoThunkProtocolGuid,
+          gEmuBlockIoDriverBinding.DriverBindingHandle,
+          ControllerHandle
+          );
+
+    return EFI_UNSUPPORTED;
+  }
+
+  if (Status == EFI_UNSUPPORTED) {
+    return Status;
+  } else if (Status != EFI_ALREADY_STARTED) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  *ActionRequired = EfiDriverConfigurationActionNone;
+  return EFI_SUCCESS;
+}
+
+/*++
+
+  Routine Description:
+    Tests to see if a controller's current configuration options are valid.
+
+  Arguments:
+    This             - A pointer to the EFI_DRIVER_CONFIGURATION_PROTOCOL instance.
+    ControllerHandle - The handle of the controller to test if it's current 
+                       configuration options are valid.
+    ChildHandle      - The handle of the child controller to test if it's current
+                       configuration options are valid.  This is an optional 
+                       parameter that may be NULL.  It will be NULL for device 
+                       drivers.  It will also be NULL for a bus drivers that wish
+                       to test the configuration options for the bus controller.
+                       It will not be NULL for a bus driver that wishes to test 
+                       configuration options for one of its child controllers.
+
+  Returns:
+    EFI_SUCCESS           - The controller specified by ControllerHandle and 
+                            ChildHandle that is being managed by the driver 
+                            specified by This has a valid set of  configuration
+                            options.
+    EFI_INVALID_PARAMETER - ControllerHandle is not a valid EFI_HANDLE.
+    EFI_INVALID_PARAMETER - ChildHandle is not NULL and it is not a valid EFI_HANDLE.
+    EFI_UNSUPPORTED       - The driver specified by This is not currently 
+                            managing the controller specified by ControllerHandle 
+                            and ChildHandle.
+    EFI_DEVICE_ERROR      - The controller specified by ControllerHandle and 
+                            ChildHandle that is being managed by the driver 
+                            specified by This has an invalid set of configuration 
+                            options.
+
+--*/
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverConfigurationOptionsValid (
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,
+  IN  EFI_HANDLE                                      ControllerHandle,
+  IN  EFI_HANDLE                                      ChildHandle  OPTIONAL
+  )
+{
+  EFI_STATUS            Status;
+  EFI_BLOCK_IO_PROTOCOL *BlockIo;
+
+  if (ChildHandle != NULL) {
+    return EFI_UNSUPPORTED;
+  }
+
+  if (ControllerHandle == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  //
+  // Validate controller handle
+  //
+  Status = gBS->OpenProtocol (
+                  ControllerHandle,
+                  &gEmuIoThunkProtocolGuid,
+                  (VOID **)&BlockIo,
+                  gEmuBlockIoDriverBinding.DriverBindingHandle,
+                  ControllerHandle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+
+  if (!EFI_ERROR (Status)) {
+    gBS->CloseProtocol (
+          ControllerHandle,
+          &gEmuIoThunkProtocolGuid,
+          gEmuBlockIoDriverBinding.DriverBindingHandle,
+          ControllerHandle
+          );
+
+    return EFI_UNSUPPORTED;
+  }
+
+  if (Status == EFI_UNSUPPORTED) {
+    return Status;
+  } else if (Status != EFI_ALREADY_STARTED) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  return EFI_SUCCESS;
+}
+
+/*++
+
+  Routine Description:
+    Forces a driver to set the default configuration options for a controller.
+
+  Arguments:
+    This             - A pointer to the EFI_DRIVER_CONFIGURATION_ PROTOCOL instance.
+    ControllerHandle - The handle of the controller to force default configuration options on.
+    ChildHandle      - The handle of the child controller to force default configuration options on  This is an optional parameter that may be NULL.  It will be NULL for device drivers.  It will also be NULL for a bus drivers that wish to force default configuration options for the bus controller.  It will not be NULL for a bus driver that wishes to force default configuration options for one of its child controllers.
+    DefaultType      - The type of default configuration options to force on the controller specified by ControllerHandle and ChildHandle.  See Table 9-1 for legal values.  A DefaultType of 0x00000000 must be supported by this protocol.
+    ActionRequired   - A pointer to the action that the calling agent is required to perform when this function returns.  See "Related Definitions" in Section 9.1for a list of the actions that the calling agent is required to perform prior to accessing ControllerHandle again.
+
+  Returns:
+    EFI_SUCCESS           - The driver specified by This successfully forced the default configuration options on the controller specified by ControllerHandle and ChildHandle.
+    EFI_INVALID_PARAMETER - ControllerHandle is not a valid EFI_HANDLE.
+    EFI_INVALID_PARAMETER - ChildHandle is not NULL and it is not a valid EFI_HANDLE.
+    EFI_INVALID_PARAMETER - ActionRequired is NULL.
+    EFI_UNSUPPORTED       - The driver specified by This does not support forcing the default configuration options on the controller specified by ControllerHandle and ChildHandle.
+    EFI_UNSUPPORTED       - The driver specified by This does not support the configuration type specified by DefaultType.
+    EFI_DEVICE_ERROR      - A device error occurred while attempt to force the default configuration options on the controller specified by  ControllerHandle and ChildHandle.
+    EFI_OUT_RESOURCES     - There are not enough resources available to force the default configuration options on the controller specified by ControllerHandle and ChildHandle.
+
+--*/
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverConfigurationForceDefaults (
+  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
+  IN  EFI_HANDLE                                             ControllerHandle,
+  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,
+  IN  UINT32                                                 DefaultType,
+  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired
+  )
+{
+  EFI_STATUS            Status;
+  EFI_BLOCK_IO_PROTOCOL *BlockIo;
+
+  if (ChildHandle != NULL) {
+    return EFI_UNSUPPORTED;
+  }
+
+  if (ActionRequired == NULL || ControllerHandle == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  //
+  // Validate controller handle
+  //
+  Status = gBS->OpenProtocol (
+                  ControllerHandle,
+                  &gEmuIoThunkProtocolGuid,
+                  (VOID **)&BlockIo,
+                  gEmuBlockIoDriverBinding.DriverBindingHandle,
+                  ControllerHandle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+
+  if (!EFI_ERROR (Status)) {
+    gBS->CloseProtocol (
+          ControllerHandle,
+          &gEmuIoThunkProtocolGuid,
+          gEmuBlockIoDriverBinding.DriverBindingHandle,
+          ControllerHandle
+          );
+
+    return EFI_UNSUPPORTED;
+  }
+
+  if (Status == EFI_UNSUPPORTED) {
+    return Status;
+  } else if (Status != EFI_ALREADY_STARTED) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  *ActionRequired = EfiDriverConfigurationActionNone;
+  return EFI_SUCCESS;
+}
diff --git a/InOsEmuPkg/EmuBlockIoDxe/DriverDiagnostics.c b/InOsEmuPkg/EmuBlockIoDxe/DriverDiagnostics.c
new file mode 100644
index 0000000000..ebb730bf06
--- /dev/null
+++ b/InOsEmuPkg/EmuBlockIoDxe/DriverDiagnostics.c
@@ -0,0 +1,219 @@
+/**@file
+
+Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  DriverDiagnostics.c
+
+Abstract:
+
+**/
+
+#include "EmuBlockIo.h"
+
+//
+// EFI Driver Diagnostics Functions
+//
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverDiagnosticsRunDiagnostics (
+  IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,
+  IN  EFI_HANDLE                                    ControllerHandle,
+  IN  EFI_HANDLE                                    ChildHandle  OPTIONAL,
+  IN  EFI_DRIVER_DIAGNOSTIC_TYPE                    DiagnosticType,
+  IN  CHAR8                                         *Language,
+  OUT EFI_GUID                                      **ErrorType,
+  OUT UINTN                                         *BufferSize,
+  OUT CHAR16                                        **Buffer
+  );
+
+//
+// EFI Driver Diagnostics Protocol
+//
+EFI_DRIVER_DIAGNOSTICS_PROTOCOL gEmuBlockIoDriverDiagnostics = {
+  EmuBlockIoDriverDiagnosticsRunDiagnostics,
+  "eng"
+};
+
+//
+// EFI Driver Diagnostics 2 Protocol
+//
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gEmuBlockIoDriverDiagnostics2 = {
+  (EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS) EmuBlockIoDriverDiagnosticsRunDiagnostics,
+  "en"
+};
+
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverDiagnosticsRunDiagnostics (
+  IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,
+  IN  EFI_HANDLE                                    ControllerHandle,
+  IN  EFI_HANDLE                                    ChildHandle  OPTIONAL,
+  IN  EFI_DRIVER_DIAGNOSTIC_TYPE                    DiagnosticType,
+  IN  CHAR8                                         *Language,
+  OUT EFI_GUID                                      **ErrorType,
+  OUT UINTN                                         *BufferSize,
+  OUT CHAR16                                        **Buffer
+  )
+/*++
+
+  Routine Description:
+    Runs diagnostics on a controller.
+
+  Arguments:
+    This             - A pointer to the EFI_DRIVER_DIAGNOSTICS_PROTOCOL instance.
+    ControllerHandle - The handle of the controller to run diagnostics on.
+    ChildHandle      - The handle of the child controller to run diagnostics on  
+                       This is an optional parameter that may be NULL.  It will 
+                       be NULL for device drivers.  It will also be NULL for a 
+                       bus drivers that wish to run diagnostics on the bus 
+                       controller.  It will not be NULL for a bus driver that 
+                       wishes to run diagnostics on one of its child controllers.
+    DiagnosticType   - Indicates type of diagnostics to perform on the controller 
+                       specified by ControllerHandle and ChildHandle.   See 
+                       "Related Definitions" for the list of supported types.
+    Language         - A pointer to a three character ISO 639-2 language 
+                       identifier or a Null-terminated ASCII string array indicating
+                       the language.  This is the language in which the optional
+                       error message should be returned in Buffer, and it must 
+                       match one of the languages specified in SupportedLanguages.
+                       The number of languages supported by a driver is up to 
+                       the driver writer.  
+    ErrorType        - A GUID that defines the format of the data returned in 
+                       Buffer.  
+    BufferSize       - The size, in bytes, of the data returned in Buffer.  
+    Buffer           - A buffer that contains a Null-terminated Unicode string 
+                       plus some additional data whose format is defined by 
+                       ErrorType.  Buffer is allocated by this function with 
+                       AllocatePool(), and it is the caller's responsibility 
+                       to free it with a call to FreePool().  
+
+  Returns:
+    EFI_SUCCESS           - The controller specified by ControllerHandle and 
+                            ChildHandle passed the diagnostic.
+    EFI_INVALID_PARAMETER - ControllerHandle is not a valid EFI_HANDLE.
+    EFI_INVALID_PARAMETER - ChildHandle is not NULL and it is not a valid 
+                            EFI_HANDLE.
+    EFI_INVALID_PARAMETER - Language is NULL.
+    EFI_INVALID_PARAMETER - ErrorType is NULL.
+    EFI_INVALID_PARAMETER - BufferType is NULL.
+    EFI_INVALID_PARAMETER - Buffer is NULL.
+    EFI_UNSUPPORTED       - The driver specified by This does not support 
+                            running diagnostics for the controller specified 
+                            by ControllerHandle and ChildHandle.
+    EFI_UNSUPPORTED       - The driver specified by This does not support the 
+                            type of diagnostic specified by DiagnosticType.
+    EFI_UNSUPPORTED       - The driver specified by This does not support the 
+                            language specified by Language.
+    EFI_OUT_OF_RESOURCES  - There are not enough resources available to complete
+                            the diagnostics.
+    EFI_OUT_OF_RESOURCES  - There are not enough resources available to return
+                            the status information in ErrorType, BufferSize, 
+                            and Buffer.
+    EFI_DEVICE_ERROR      - The controller specified by ControllerHandle and 
+                            ChildHandle did not pass the diagnostic.
+
+--*/
+{
+  EFI_STATUS            Status;
+  EFI_BLOCK_IO_PROTOCOL *BlockIo;
+  CHAR8                 *SupportedLanguages;
+  BOOLEAN               Iso639Language;
+  BOOLEAN               Found;
+  UINTN                 Index;
+
+  if (Language         == NULL ||
+      ErrorType        == NULL ||
+      Buffer           == NULL ||
+      ControllerHandle == NULL ||
+      BufferSize       == NULL) {
+
+    return EFI_INVALID_PARAMETER;
+  }
+
+  SupportedLanguages = This->SupportedLanguages;
+  Iso639Language = (BOOLEAN)(This == &gEmuBlockIoDriverDiagnostics);
+  //
+  // Make sure Language is in the set of Supported Languages
+  //
+  Found = FALSE;
+  while (*SupportedLanguages != 0) {
+    if (Iso639Language) {
+      if (CompareMem (Language, SupportedLanguages, 3) == 0) {
+        Found = TRUE;
+      break;
+    }
+      SupportedLanguages += 3;
+    } else {
+      for (Index = 0; SupportedLanguages[Index] != 0 && SupportedLanguages[Index] != ';'; Index++);
+      if ((AsciiStrnCmp(SupportedLanguages, Language, Index) == 0) && (Language[Index] == 0)) {
+        Found = TRUE;
+        break;
+  }
+      SupportedLanguages += Index;
+      for (; *SupportedLanguages != 0 && *SupportedLanguages == ';'; SupportedLanguages++);
+    }
+  }
+  //
+  // If Language is not a member of SupportedLanguages, then return EFI_UNSUPPORTED
+  //
+  if (!Found) {
+    return EFI_UNSUPPORTED;
+  }
+
+  *ErrorType  = NULL;
+  *BufferSize = 0;
+  if (DiagnosticType != EfiDriverDiagnosticTypeStandard) {
+    *ErrorType  = &gEfiBlockIoProtocolGuid;
+    *BufferSize = 0x60;
+    Buffer = AllocatePool ((UINTN) (*BufferSize));
+    CopyMem (*Buffer, L"Windows Block I/O Driver Diagnostics Failed\n", *BufferSize);
+    return EFI_DEVICE_ERROR;
+  }
+
+  //
+  // This is a device driver, so ChildHandle must be NULL.
+  //
+  if (ChildHandle != NULL) {
+    return EFI_UNSUPPORTED;
+  }
+
+  //
+  // Validate controller handle
+  //
+  Status = gBS->OpenProtocol (
+                  ControllerHandle,
+                  &gEmuIoThunkProtocolGuid,
+                  (VOID **)&BlockIo,
+                  gEmuBlockIoDriverBinding.DriverBindingHandle,
+                  ControllerHandle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+
+  if (!EFI_ERROR (Status)) {
+    gBS->CloseProtocol (
+          ControllerHandle,
+          &gEmuIoThunkProtocolGuid,
+          gEmuBlockIoDriverBinding.DriverBindingHandle,
+          ControllerHandle
+          );
+
+    return EFI_UNSUPPORTED;
+  }
+
+  if (Status == EFI_UNSUPPORTED) {
+    return Status;
+  } else if (Status != EFI_ALREADY_STARTED) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  return EFI_SUCCESS;
+}
diff --git a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.c b/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.c
new file mode 100644
index 0000000000..999445bae2
--- /dev/null
+++ b/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.c
@@ -0,0 +1,749 @@
+/**@file
+
+Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+bbe
+**/
+
+#include "EmuBlockIo.h"
+
+
+/**
+  Reset the block device hardware.
+
+  @param[in]  This                 Indicates a pointer to the calling context.
+  @param[in]  ExtendedVerification Indicates that the driver may perform a more
+                                   exhausive verfication operation of the device
+                                   during reset.
+
+  @retval EFI_SUCCESS          The device was reset.
+  @retval EFI_DEVICE_ERROR     The device is not functioning properly and could
+                               not be reset.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIo2Reset (
+  IN EFI_BLOCK_IO2_PROTOCOL  *This,
+  IN BOOLEAN                 ExtendedVerification
+  )
+{
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+  EFI_TPL                 OldTpl;
+
+  Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Status = Private->Io->Reset (Private->Io, ExtendedVerification);
+
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+/**
+  Read BufferSize bytes from Lba into Buffer.
+  
+  This function reads the requested number of blocks from the device. All the
+  blocks are read, or an error is returned.
+  If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_or EFI_MEDIA_CHANGED is returned and
+  non-blocking I/O is being used, the Event associated with this request will
+  not be signaled.
+
+  @param[in]       This       Indicates a pointer to the calling context.
+  @param[in]       MediaId    Id of the media, changes every time the media is 
+                              replaced.
+  @param[in]       Lba        The starting Logical Block Address to read from.
+  @param[in, out]  Token	    A pointer to the token associated with the transaction.
+  @param[in]       BufferSize Size of Buffer, must be a multiple of device block size.  
+  @param[out]      Buffer     A pointer to the destination buffer for the data. The 
+                              caller is responsible for either having implicit or 
+                              explicit ownership of the buffer.
+
+  @retval EFI_SUCCESS           The read request was queued if Token->Event is
+                                not NULL.The data was read correctly from the
+                                device if the Token->Event is NULL.
+  @retval EFI_DEVICE_ERROR      The device reported an error while performing
+                                the read.
+  @retval EFI_NO_MEDIA          There is no media in the device.
+  @retval EFI_MEDIA_CHANGED     The MediaId is not for the current media.
+  @retval EFI_BAD_BUFFER_SIZE   The BufferSize parameter is not a multiple of the
+                                intrinsic block size of the device.
+  @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, 
+                                or the buffer is not on proper alignment.
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack
+                                of resources.
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIo2ReadBlocksEx (
+  IN     EFI_BLOCK_IO2_PROTOCOL *This,
+  IN     UINT32                 MediaId,
+  IN     EFI_LBA                LBA,
+  IN OUT EFI_BLOCK_IO2_TOKEN    *Token,
+  IN     UINTN                  BufferSize,
+     OUT VOID                  *Buffer
+  )
+{
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+  EFI_TPL                 OldTpl;
+
+  Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Status = Private->Io->ReadBlocks (Private->Io, MediaId, LBA, Token, BufferSize, Buffer);
+
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+
+/**
+  Write BufferSize bytes from Lba into Buffer.
+
+  This function writes the requested number of blocks to the device. All blocks
+  are written, or an error is returned.If EFI_DEVICE_ERROR, EFI_NO_MEDIA,
+  EFI_WRITE_PROTECTED or EFI_MEDIA_CHANGED is returned and non-blocking I/O is
+  being used, the Event associated with this request will not be signaled.
+
+  @param[in]       This       Indicates a pointer to the calling context.
+  @param[in]       MediaId    The media ID that the write request is for.
+  @param[in]       Lba        The starting logical block address to be written. The
+                              caller is responsible for writing to only legitimate
+                              locations.
+  @param[in, out]  Token      A pointer to the token associated with the transaction.
+  @param[in]       BufferSize Size of Buffer, must be a multiple of device block size.
+  @param[in]       Buffer     A pointer to the source buffer for the data.
+
+  @retval EFI_SUCCESS           The write request was queued if Event is not NULL.
+                                The data was written correctly to the device if
+                                the Event is NULL.
+  @retval EFI_WRITE_PROTECTED   The device can not be written to.
+  @retval EFI_NO_MEDIA          There is no media in the device.
+  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
+  @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.
+  @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, 
+                                or the buffer is not on proper alignment.
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack
+                                of resources.
+
+**/
+EFI_STATUS
+EFIAPI 
+EmuBlockIo2WriteBlocksEx (
+  IN     EFI_BLOCK_IO2_PROTOCOL  *This,
+  IN     UINT32                 MediaId,
+  IN     EFI_LBA                LBA,
+  IN OUT EFI_BLOCK_IO2_TOKEN    *Token,
+  IN     UINTN                  BufferSize,
+  IN     VOID                   *Buffer
+  )
+{
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+  EFI_TPL                 OldTpl;
+
+  Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Status = Private->Io->WriteBlocks (Private->Io, MediaId, LBA, Token, BufferSize, Buffer);
+
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+
+
+/**
+  Flush the Block Device.
+ 
+  If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_EFI_WRITE_PROTECTED or EFI_MEDIA_CHANGED
+  is returned and non-blocking I/O is being used, the Event associated with
+  this request will not be signaled.  
+
+  @param[in]      This     Indicates a pointer to the calling context.
+  @param[in,out]  Token    A pointer to the token associated with the transaction
+
+  @retval EFI_SUCCESS          The flush request was queued if Event is not NULL.
+                               All outstanding data was written correctly to the
+                               device if the Event is NULL.
+  @retval EFI_DEVICE_ERROR     The device reported an error while writting back
+                               the data.
+  @retval EFI_WRITE_PROTECTED  The device cannot be written to.
+  @retval EFI_NO_MEDIA         There is no media in the device.
+  @retval EFI_MEDIA_CHANGED    The MediaId is not for the current media.
+  @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
+                               of resources.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIo2Flush (
+  IN     EFI_BLOCK_IO2_PROTOCOL   *This,
+  IN OUT EFI_BLOCK_IO2_TOKEN      *Token
+  )
+{
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+  EFI_TPL                 OldTpl;
+
+  Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Status = Private->Io->FlushBlocks (Private->Io, Token);
+
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+
+
+/**
+  Reset the Block Device.
+
+  @param  This                 Indicates a pointer to the calling context.
+  @param  ExtendedVerification Driver may perform diagnostics on reset.
+
+  @retval EFI_SUCCESS          The device was reset.
+  @retval EFI_DEVICE_ERROR     The device is not functioning properly and could
+                               not be reset.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoReset (
+  IN EFI_BLOCK_IO_PROTOCOL          *This,
+  IN BOOLEAN                        ExtendedVerification
+  )
+{
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+  EFI_TPL                 OldTpl;
+
+  Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Status = Private->Io->Reset (Private->Io, ExtendedVerification);
+
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+
+/**
+  Read BufferSize bytes from Lba into Buffer.
+
+  @param  This       Indicates a pointer to the calling context.
+  @param  MediaId    Id of the media, changes every time the media is replaced.
+  @param  Lba        The starting Logical Block Address to read from
+  @param  BufferSize Size of Buffer, must be a multiple of device block size.
+  @param  Buffer     A pointer to the destination buffer for the data. The caller is
+                     responsible for either having implicit or explicit ownership of the buffer.
+
+  @retval EFI_SUCCESS           The data was read correctly from the device.
+  @retval EFI_DEVICE_ERROR      The device reported an error while performing the read.
+  @retval EFI_NO_MEDIA          There is no media in the device.
+  @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.
+  @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.
+  @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, 
+                                or the buffer is not on proper alignment.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoReadBlocks
+(
+  IN EFI_BLOCK_IO_PROTOCOL          *This,
+  IN UINT32                         MediaId,
+  IN EFI_LBA                        Lba,
+  IN UINTN                          BufferSize,
+  OUT VOID                          *Buffer
+  )
+{
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+  EFI_TPL                 OldTpl;
+  EFI_BLOCK_IO2_TOKEN     Token;
+
+  Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Token.Event = NULL;
+  Status = Private->Io->ReadBlocks (Private->Io, MediaId, Lba, &Token, BufferSize, Buffer);
+
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+
+/**
+  Write BufferSize bytes from Lba into Buffer.
+
+  @param  This       Indicates a pointer to the calling context.
+  @param  MediaId    The media ID that the write request is for.
+  @param  Lba        The starting logical block address to be written. The caller is
+                     responsible for writing to only legitimate locations.
+  @param  BufferSize Size of Buffer, must be a multiple of device block size.
+  @param  Buffer     A pointer to the source buffer for the data.
+
+  @retval EFI_SUCCESS           The data was written correctly to the device.
+  @retval EFI_WRITE_PROTECTED   The device can not be written to.
+  @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
+  @retval EFI_NO_MEDIA          There is no media in the device.
+  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.
+  @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, 
+                                or the buffer is not on proper alignment.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoWriteBlocks (
+  IN EFI_BLOCK_IO_PROTOCOL          *This,
+  IN UINT32                         MediaId,
+  IN EFI_LBA                        Lba,
+  IN UINTN                          BufferSize,
+  IN VOID                           *Buffer
+  )
+{
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+  EFI_TPL                 OldTpl;
+  EFI_BLOCK_IO2_TOKEN     Token;
+
+  Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Token.Event = NULL;
+  Status = Private->Io->WriteBlocks (Private->Io, MediaId, Lba, &Token, BufferSize, Buffer);
+
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+/**
+  Flush the Block Device.
+
+  @param  This              Indicates a pointer to the calling context.
+
+  @retval EFI_SUCCESS       All outstanding data was written to the device
+  @retval EFI_DEVICE_ERROR  The device reported an error while writting back the data
+  @retval EFI_NO_MEDIA      There is no media in the device.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoFlushBlocks (
+  IN EFI_BLOCK_IO_PROTOCOL  *This
+  )
+{
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE    *Private;
+  EFI_TPL                 OldTpl;
+  EFI_BLOCK_IO2_TOKEN     Token;
+
+  Private = EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS (This);
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Token.Event = NULL;
+  Status = Private->Io->FlushBlocks (Private->Io, &Token);
+
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+
+
+/**
+  Tests to see if this driver supports a given controller. If a child device is provided, 
+  it further tests to see if this driver supports creating a handle for the specified child device.
+
+  This function checks to see if the driver specified by This supports the device specified by 
+  ControllerHandle. Drivers will typically use the device path attached to 
+  ControllerHandle and/or the services from the bus I/O abstraction attached to 
+  ControllerHandle to determine if the driver supports ControllerHandle. This function 
+  may be called many times during platform initialization. In order to reduce boot times, the tests 
+  performed by this function must be very small, and take as little time as possible to execute. This 
+  function must not change the state of any hardware devices, and this function must be aware that the 
+  device specified by ControllerHandle may already be managed by the same driver or a 
+  different driver. This function must match its calls to AllocatePages() with FreePages(), 
+  AllocatePool() with FreePool(), and OpenProtocol() with CloseProtocol().  
+  Because ControllerHandle may have been previously started by the same driver, if a protocol is 
+  already in the opened state, then it must not be closed with CloseProtocol(). This is required 
+  to guarantee the state of ControllerHandle is not modified by this function.
+
+  @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+  @param[in]  ControllerHandle     The handle of the controller to test. This handle 
+                                   must support a protocol interface that supplies 
+                                   an I/O abstraction to the driver.
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This 
+                                   parameter is ignored by device drivers, and is optional for bus 
+                                   drivers. For bus drivers, if this parameter is not NULL, then 
+                                   the bus driver must determine if the bus controller specified 
+                                   by ControllerHandle and the child controller specified 
+                                   by RemainingDevicePath are both supported by this 
+                                   bus driver.
+
+  @retval EFI_SUCCESS              The device specified by ControllerHandle and
+                                   RemainingDevicePath is supported by the driver specified by This.
+  @retval EFI_ALREADY_STARTED      The device specified by ControllerHandle and
+                                   RemainingDevicePath is already being managed by the driver
+                                   specified by This.
+  @retval EFI_ACCESS_DENIED        The device specified by ControllerHandle and
+                                   RemainingDevicePath is already being managed by a different
+                                   driver or an application that requires exclusive access.
+                                   Currently not implemented.
+  @retval EFI_UNSUPPORTED          The device specified by ControllerHandle and
+                                   RemainingDevicePath is not supported by the driver specified by This.
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverBindingSupported (
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,
+  IN  EFI_HANDLE                   Handle,
+  IN  EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath
+  )
+{
+  EFI_STATUS              Status;
+  EMU_IO_THUNK_PROTOCOL  *EmuIoThunk;
+
+  //
+  // Open the IO Abstraction(s) needed to perform the supported test
+  //
+  Status = gBS->OpenProtocol (
+                  Handle,
+                  &gEmuIoThunkProtocolGuid,
+                  (VOID **)&EmuIoThunk,
+                  This->DriverBindingHandle,
+                  Handle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Make sure GUID is for a File System handle.
+  //
+  Status = EFI_UNSUPPORTED;
+  if (CompareGuid (EmuIoThunk->Protocol, &gEmuVirtualDisksGuid)) {
+    Status = EFI_SUCCESS;
+  }
+
+  //
+  // Close the I/O Abstraction(s) used to perform the supported test
+  //
+  gBS->CloseProtocol (
+        Handle,
+        &gEmuIoThunkProtocolGuid,
+        This->DriverBindingHandle,
+        Handle
+        );
+  return Status;
+}
+
+
+/**
+  Starts a device controller or a bus controller.
+
+  The Start() function is designed to be invoked from the EFI boot service ConnectController().
+  As a result, much of the error checking on the parameters to Start() has been moved into this 
+  common boot service. It is legal to call Start() from other locations, 
+  but the following calling restrictions must be followed, or the system behavior will not be deterministic.
+  1. ControllerHandle must be a valid EFI_HANDLE.
+  2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned
+     EFI_DEVICE_PATH_PROTOCOL.
+  3. Prior to calling Start(), the Supported() function for the driver specified by This must
+     have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.  
+
+  @param[in]  This                 A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+  @param[in]  ControllerHandle     The handle of the controller to start. This handle 
+                                   must support a protocol interface that supplies 
+                                   an I/O abstraction to the driver.
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This 
+                                   parameter is ignored by device drivers, and is optional for bus 
+                                   drivers. For a bus driver, if this parameter is NULL, then handles 
+                                   for all the children of Controller are created by this driver.  
+                                   If this parameter is not NULL and the first Device Path Node is 
+                                   not the End of Device Path Node, then only the handle for the 
+                                   child device specified by the first Device Path Node of 
+                                   RemainingDevicePath is created by this driver.
+                                   If the first Device Path Node of RemainingDevicePath is 
+                                   the End of Device Path Node, no child handle is created by this
+                                   driver.
+
+  @retval EFI_SUCCESS              The device was started.
+  @retval EFI_DEVICE_ERROR         The device could not be started due to a device error.Currently not implemented.
+  @retval EFI_OUT_OF_RESOURCES     The request could not be completed due to a lack of resources.
+  @retval Others                   The driver failded to start the device.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverBindingStart (
+  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,
+  IN  EFI_HANDLE                    Handle,
+  IN  EFI_DEVICE_PATH_PROTOCOL      *RemainingDevicePath
+  )
+{
+  EFI_STATUS                  Status;
+  EMU_IO_THUNK_PROTOCOL       *EmuIoThunk;
+  EMU_BLOCK_IO_PRIVATE        *Private;
+
+  //
+  // Grab the protocols we need
+  //
+  
+  Status = gBS->OpenProtocol (
+                  Handle,
+                  &gEmuIoThunkProtocolGuid,
+                  (void *)&EmuIoThunk,
+                  This->DriverBindingHandle,
+                  Handle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  //
+  // Set DiskType
+  //
+  if (!CompareGuid (EmuIoThunk->Protocol, &gEmuVirtualDisksGuid)) {
+    Status = EFI_UNSUPPORTED;
+    goto Done;
+  }
+
+  Status = EmuIoThunk->Open (EmuIoThunk);
+  if (EFI_ERROR (Status)) {
+    goto Done;
+  }
+
+  Private = AllocatePool (sizeof (EMU_BLOCK_IO_PRIVATE));
+  if (Private == NULL) {
+    goto Done;
+  }
+
+  Private->Signature = EMU_BLOCK_IO_PRIVATE_SIGNATURE;
+  Private->IoThunk   = EmuIoThunk;
+  Private->Io        = EmuIoThunk->Interface;
+  
+  Private->BlockIo.Revision    = EFI_BLOCK_IO_PROTOCOL_REVISION2;
+  Private->BlockIo.Media       = &Private->Media;
+  Private->BlockIo.Reset       = EmuBlockIoReset;
+  Private->BlockIo.ReadBlocks  = EmuBlockIoReadBlocks;
+  Private->BlockIo.WriteBlocks = EmuBlockIoWriteBlocks;
+  Private->BlockIo.FlushBlocks = EmuBlockIoFlushBlocks;
+
+  Private->BlockIo2.Media         = &Private->Media;
+  Private->BlockIo2.Reset         = EmuBlockIo2Reset;
+  Private->BlockIo2.ReadBlocksEx  = EmuBlockIo2ReadBlocksEx;
+  Private->BlockIo2.WriteBlocksEx = EmuBlockIo2WriteBlocksEx;
+  Private->BlockIo2.FlushBlocksEx = (EFI_BLOCK_FLUSH_EX)EmuBlockIoFlushBlocks;
+
+  Private->ControllerNameTable = NULL;
+
+  Status = Private->Io->CreateMapping (Private->Io, &Private->Media);
+  if (EFI_ERROR (Status)) {
+    goto Done;
+  }
+
+  AddUnicodeString2 (
+    "eng",
+    gEmuBlockIoComponentName.SupportedLanguages,
+    &Private->ControllerNameTable,
+    EmuIoThunk->ConfigString,
+    TRUE
+    );
+    
+  AddUnicodeString2 (
+    "en",
+    gEmuBlockIoComponentName2.SupportedLanguages,
+    &Private->ControllerNameTable,
+    EmuIoThunk->ConfigString,
+    FALSE
+    );
+
+  Status = gBS->InstallMultipleProtocolInterfaces (
+                  &Handle,
+                  &gEfiBlockIoProtocolGuid,    &Private->BlockIo,
+                  &gEfiBlockIo2ProtocolGuid,   &Private->BlockIo2,
+                  NULL
+                  );
+
+Done:
+  if (EFI_ERROR (Status)) {
+    if (Private != NULL) {
+      if (Private->ControllerNameTable != NULL) {
+        FreeUnicodeStringTable (Private->ControllerNameTable);
+      }
+      
+      gBS->FreePool (Private);
+    
+    }
+    
+    gBS->CloseProtocol (
+          Handle,
+          &gEmuIoThunkProtocolGuid,
+          This->DriverBindingHandle,
+          Handle
+          );
+  }
+
+  return Status;
+}
+
+
+/**
+  Stops a device controller or a bus controller.
+  
+  The Stop() function is designed to be invoked from the EFI boot service DisconnectController(). 
+  As a result, much of the error checking on the parameters to Stop() has been moved 
+  into this common boot service. It is legal to call Stop() from other locations, 
+  but the following calling restrictions must be followed, or the system behavior will not be deterministic.
+  1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
+     same driver's Start() function.
+  2. The first NumberOfChildren handles of ChildHandleBuffer must all be a valid
+     EFI_HANDLE. In addition, all of these handles must have been created in this driver's
+     Start() function, and the Start() function must have called OpenProtocol() on
+     ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
+  
+  @param[in]  This              A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
+  @param[in]  ControllerHandle  A handle to the device being stopped. The handle must 
+                                support a bus specific I/O protocol for the driver 
+                                to use to stop the device.
+  @param[in]  NumberOfChildren  The number of child device handles in ChildHandleBuffer.
+  @param[in]  ChildHandleBuffer An array of child handles to be freed. May be NULL 
+                                if NumberOfChildren is 0.
+
+  @retval EFI_SUCCESS           The device was stopped.
+  @retval EFI_DEVICE_ERROR      The device could not be stopped due to a device error.
+
+**/
+EFI_STATUS
+EFIAPI
+EmuBlockIoDriverBindingStop (
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,
+  IN  EFI_HANDLE                   Handle,
+  IN  UINTN                        NumberOfChildren,
+  IN  EFI_HANDLE                   *ChildHandleBuffer
+  )
+{
+  EFI_BLOCK_IO_PROTOCOL   *BlockIo;
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE *Private;
+
+  //
+  // Get our context back
+  //
+  Status = gBS->OpenProtocol (
+                  Handle,
+                  &gEfiBlockIoProtocolGuid,
+                  (void *)&BlockIo,
+                  This->DriverBindingHandle,
+                  Handle,
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                  );
+  if (EFI_ERROR (Status)) {
+    return EFI_UNSUPPORTED;
+  }
+
+  Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (BlockIo);
+  Status = Private->IoThunk->Close (Private->IoThunk);
+
+  Status = gBS->UninstallMultipleProtocolInterfaces (
+                  Private->EfiHandle,
+                  &gEfiBlockIoProtocolGuid,   &Private->BlockIo,
+                  &gEfiBlockIo2ProtocolGuid,  &Private->BlockIo2,
+                  NULL
+                  );
+  if (!EFI_ERROR (Status)) {
+    Status = gBS->CloseProtocol (
+                    Handle,
+                    &gEmuIoThunkProtocolGuid,
+                    This->DriverBindingHandle,
+                    Handle
+                    );
+  }
+  
+  if (!EFI_ERROR (Status)) {
+    //
+    // Free our instance data
+    //
+    FreeUnicodeStringTable (Private->ControllerNameTable);
+    gBS->FreePool (Private);
+  }
+
+  return Status;
+}
+
+
+
+
+
+EFI_DRIVER_BINDING_PROTOCOL gEmuBlockIoDriverBinding = {
+  EmuBlockIoDriverBindingSupported,
+  EmuBlockIoDriverBindingStart,
+  EmuBlockIoDriverBindingStop,
+  0xa,
+  NULL,
+  NULL
+};
+
+
+
+
+/**
+  The user Entry Point for module EmuBlockIo . The user code starts with this function.
+
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  
+  @param[in] SystemTable    A pointer to the EFI System Table.
+  
+  @retval EFI_SUCCESS       The entry point is executed successfully.
+  @retval other             Some error occurs when executing this entry point.
+
+**/
+EFI_STATUS
+EFIAPI
+InitializeEmuBlockIo (
+  IN EFI_HANDLE           ImageHandle,
+  IN EFI_SYSTEM_TABLE     *SystemTable
+  )
+{
+  EFI_STATUS              Status;
+
+  Status = EfiLibInstallAllDriverProtocols2 (
+             ImageHandle,
+             SystemTable,
+             &gEmuBlockIoDriverBinding,
+             ImageHandle,
+             &gEmuBlockIoComponentName,
+             &gEmuBlockIoComponentName2,
+             NULL,
+             NULL,
+             &gEmuBlockIoDriverDiagnostics,
+             &gEmuBlockIoDriverDiagnostics2
+             );
+  ASSERT_EFI_ERROR (Status);
+
+
+  return Status;
+}
+
+
+
diff --git a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.h b/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.h
new file mode 100644
index 0000000000..b11f305720
--- /dev/null
+++ b/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIo.h
@@ -0,0 +1,84 @@
+/*++
+
+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  EmuBlockIo.h
+
+Abstract:
+
+  Produce block IO abstractions for real devices on your PC using Posix APIs.
+  The configuration of what devices to mount or emulate comes from UNIX 
+  environment variables. The variables must be visible to the Microsoft* 
+  Developer Studio for them to work.
+
+  * Other names and brands may be claimed as the property of others.
+
+**/
+
+#ifndef _EMU_BLOCK_IO_H_
+#define _EMU_BLOCK_IO_H_
+
+#include <PiDxe.h>
+#include <Protocol/EmuIoThunk.h>
+#include <Protocol/BlockIo.h>
+#include <Protocol/BlockIo2.h>
+#include <Protocol/EmuBlockIo.h>
+
+#include <Guid/EmuPhysicalDisk.h>
+#include <Guid/EmuVirtualDisk.h>
+
+#include <Library/DebugLib.h>
+#include <Library/BaseLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/UefiLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+
+
+//
+// Language supported for driverconfiguration protocol
+//
+
+#define EMU_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'M', 'b', 'k')
+typedef struct {
+  UINTN                       Signature;
+  EMU_IO_THUNK_PROTOCOL       *IoThunk;
+  EMU_BLOCK_IO_PROTOCOL       *Io;
+
+  EFI_HANDLE                  EfiHandle;
+  EFI_BLOCK_IO_PROTOCOL       BlockIo;
+  EFI_BLOCK_IO2_PROTOCOL      BlockIo2;
+  EFI_BLOCK_IO_MEDIA          Media;
+
+  EFI_UNICODE_STRING_TABLE    *ControllerNameTable;
+
+} EMU_BLOCK_IO_PRIVATE;
+
+#define EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS(a) \
+         CR(a, EMU_BLOCK_IO_PRIVATE, BlockIo, EMU_BLOCK_IO_PRIVATE_SIGNATURE)
+
+#define EMU_BLOCK_IO2_PRIVATE_DATA_FROM_THIS(a) \
+         CR(a, EMU_BLOCK_IO_PRIVATE, BlockIo2, EMU_BLOCK_IO_PRIVATE_SIGNATURE)
+
+
+//
+// Block I/O Global Variables
+//
+extern EFI_DRIVER_BINDING_PROTOCOL        gEmuBlockIoDriverBinding;
+extern EFI_COMPONENT_NAME_PROTOCOL        gEmuBlockIoComponentName;
+extern EFI_COMPONENT_NAME2_PROTOCOL       gEmuBlockIoComponentName2;
+extern EFI_DRIVER_CONFIGURATION_PROTOCOL  gEmuBlockIoDriverConfiguration;
+extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL    gEmuBlockIoDriverDiagnostics;
+extern EFI_DRIVER_DIAGNOSTICS2_PROTOCOL   gEmuBlockIoDriverDiagnostics2;
+
+#endif
diff --git a/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf b/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
new file mode 100644
index 0000000000..24f4759d66
--- /dev/null
+++ b/InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
@@ -0,0 +1,69 @@
+## @file
+# Block Io driver
+#
+# Produce block IO abstractions for real devices on your PC using Unix APIs.
+#  The configuration of what devices to mount or emulate comes from
+#  environment variables.
+# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#
+#  This program and the accompanying materials
+#  are licensed and made available under the terms and conditions of the BSD License
+#  which accompanies this distribution. The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.php
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = EmuBlockIo
+  FILE_GUID                      = C6760651-A38D-5F4F-AEAF-F6661549DF75
+  MODULE_TYPE                    = UEFI_DRIVER
+  VERSION_STRING                 = 1.0
+
+  ENTRY_POINT                    = InitializeEmuBlockIo
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#
+#  DRIVER_BINDING                =  gUnixBlockIoDriverBinding                    
+#  COMPONENT_NAME                =  gUnixBlockIoComponentName                    
+#  DRIVER_DIAG                   =  gUnixBlockIoDriverDiagnostics                
+#
+
+[Sources]
+  DriverDiagnostics.c
+  DriverConfiguration.c
+  ComponentName.c
+  EmuBlockIo.c
+  EmuBlockIo.h
+
+
+[Packages]
+  MdePkg/MdePkg.dec
+  InOsEmuPkg/InOsEmuPkg.dec
+
+[LibraryClasses]
+  UefiBootServicesTableLib
+  MemoryAllocationLib
+  BaseMemoryLib
+  UefiLib
+  UefiDriverEntryPoint
+  BaseLib
+  DebugLib
+
+
+[Guids]
+  gEmuPhysicalDisksGuid                    # SOMETIMES_CONSUMED
+  gEmuVirtualDisksGuid                     # ALWAYS_CONSUMED
+
+
+[Protocols]
+  gEfiBlockIoProtocolGuid                     # PROTOCOL BY_START
+  gEfiBlockIo2ProtocolGuid                    # PROTOCOL BY_START
+  gEmuIoThunkProtocolGuid                     # PROTOCOL TO_START
+
diff --git a/InOsEmuPkg/InOsEmuPkg.dec b/InOsEmuPkg/InOsEmuPkg.dec
index 9d49e6b642..3a7417fd97 100644
--- a/InOsEmuPkg/InOsEmuPkg.dec
+++ b/InOsEmuPkg/InOsEmuPkg.dec
@@ -43,9 +43,9 @@
 [Guids]
   gInOsEmuPkgTokenSpaceGuid  = { 0x4F792E68, 0xE8C8, 0x794E, { 0xB1, 0xD8, 0x37, 0x03, 0xF3, 0xF2, 0xD5, 0xA5 } }
   gEmuSystemConfigGuid       = { 0xF8626165, 0x6CEB, 0x924A, { 0xBA, 0xFC, 0xF1, 0x3A, 0xB9, 0xD6, 0x57, 0x28 } }
+  gEmuVirtualDisksGuid       = { 0xf2ba331a, 0x8985, 0x11db, { 0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
+  gEmuPhysicalDisksGuid      = { 0xf2bdcc96, 0x8985, 0x11db, { 0x87, 0x19, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
 
-#  gEmuVirtualDisksGuid       = {0xf2ba331a, 0x8985, 0x11db, {0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
-#  gEmuPhysicalDisksGuid      = {0xf2bdcc96, 0x8985, 0x11db, {0x87, 0x19, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
 #  gEmuFileSystemGuid         = {0xf2c16b9e, 0x8985, 0x11db, {0x92, 0xc8, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
 #  gEmuSerialPortGuid         = {0x6d3a727d, 0x66c8, 0x4d19, {0x87, 0xe6, 0x02, 0x15, 0x86, 0x14, 0x90, 0xf3}}
 #  gEmuNetworkGuid            = {0x081603B4, 0x0F1D, 0x4022, {0xB6, 0xFD, 0x4C, 0xE3, 0x5E, 0x09, 0xA1, 0xA6}}
diff --git a/InOsEmuPkg/Include/Guid/EmuPhysicalDisk.h b/InOsEmuPkg/Include/Guid/EmuPhysicalDisk.h
new file mode 100644
index 0000000000..324dc0474f
--- /dev/null
+++ b/InOsEmuPkg/Include/Guid/EmuPhysicalDisk.h
@@ -0,0 +1,24 @@
+/** @file
+  Setup Variable data structure for Emu platform.
+
+Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+
+**/
+
+#ifndef __EMU_PHYSICAL_DISK_H__
+#define __EMU_PHYSICAL_DISK_H__
+
+#define EFI_EMU_PHYSICAL_DISK_GUID  \
+ { 0xf2ba331a, 0x8985, 0x11db, { 0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
+
+extern EFI_GUID   gEmuPhysicalDisksGuid;
+
+#endif
diff --git a/InOsEmuPkg/Include/Guid/EmuVirtualDisk.h b/InOsEmuPkg/Include/Guid/EmuVirtualDisk.h
new file mode 100644
index 0000000000..17b97dc72b
--- /dev/null
+++ b/InOsEmuPkg/Include/Guid/EmuVirtualDisk.h
@@ -0,0 +1,24 @@
+/** @file
+  Setup Variable data structure for Emu platform.
+
+Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+
+**/
+
+#ifndef __EMU_VIRTUAL_DISK_H__
+#define __EMU_VIRTUAL_DISK_H__
+
+#define EFI_EMU_VIRTUAL_DISK_GUID  \
+ { 0xf2ba331a, 0x8985, 0x11db, { 0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
+
+extern EFI_GUID   gEmuVirtualDisksGuid;
+
+#endif
diff --git a/InOsEmuPkg/Include/Protocol/EmuBlockIo.h b/InOsEmuPkg/Include/Protocol/EmuBlockIo.h
new file mode 100644
index 0000000000..f31124dc01
--- /dev/null
+++ b/InOsEmuPkg/Include/Protocol/EmuBlockIo.h
@@ -0,0 +1,192 @@
+/** @file
+  Emu Block IO2 protocol as defined in the UEFI 2.3.1 specification.
+
+  The Block IO2 protocol defines an extension to the Block IO protocol which
+  enables the ability to read and write data at a block level in a non-blocking
+  manner.
+
+  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials                          
+  are licensed and made available under the terms and conditions of the BSD License         
+  which accompanies this distribution.  The full text of the license may be found at        
+  http://opensource.org/licenses/bsd-license.php                                            
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+**/
+
+#ifndef __EMU_BLOCK_IO_H__
+#define __EMU_BLOCK_IO_H__
+
+#include <Protocol/BlockIo.h>
+#include <Protocol/BlockIo2.h>
+
+#define EMU_BLOCK_IO_PROTOCOL_GUID \
+ { 0x3EC5F7E0, 0x1124, 0xDF45, { 0x9F, 0x96, 0x7D, 0xD6, 0x63, 0xC0, 0xAF, 0xE7 } }
+
+typedef struct _EMU_BLOCK_IO_PROTOCOL   EMU_BLOCK_IO_PROTOCOL;
+
+
+
+/**
+  Reset the block device hardware.
+
+  @param[in]  This                 Indicates a pointer to the calling context.
+  @param[in]  ExtendedVerification Indicates that the driver may perform a more
+                                   exhausive verfication operation of the device
+                                   during reset.
+
+  @retval EFI_SUCCESS          The device was reset.
+  @retval EFI_DEVICE_ERROR     The device is not functioning properly and could
+                               not be reset.
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EMU_BLOCK_RESET) (
+  IN EMU_BLOCK_IO_PROTOCOL   *This,
+  IN BOOLEAN                 ExtendedVerification
+  );
+
+/**
+  Read BufferSize bytes from Lba into Buffer.
+  
+  This function reads the requested number of blocks from the device. All the
+  blocks are read, or an error is returned.
+  If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_or EFI_MEDIA_CHANGED is returned and
+  non-blocking I/O is being used, the Event associated with this request will
+  not be signaled.
+
+  @param[in]       This       Indicates a pointer to the calling context.
+  @param[in]       MediaId    Id of the media, changes every time the media is 
+                              replaced.
+  @param[in]       Lba        The starting Logical Block Address to read from.
+  @param[in, out]  Token	    A pointer to the token associated with the transaction.
+  @param[in]       BufferSize Size of Buffer, must be a multiple of device block size.  
+  @param[out]      Buffer     A pointer to the destination buffer for the data. The 
+                              caller is responsible for either having implicit or 
+                              explicit ownership of the buffer.
+
+  @retval EFI_SUCCESS           The read request was queued if Token->Event is
+                                not NULL.The data was read correctly from the
+                                device if the Token->Event is NULL.
+  @retval EFI_DEVICE_ERROR      The device reported an error while performing
+                                the read.
+  @retval EFI_NO_MEDIA          There is no media in the device.
+  @retval EFI_MEDIA_CHANGED     The MediaId is not for the current media.
+  @retval EFI_BAD_BUFFER_SIZE   The BufferSize parameter is not a multiple of the
+                                intrinsic block size of the device.
+  @retval EFI_INVALID_PARAMETER The read request contains LBAs that are not valid, 
+                                or the buffer is not on proper alignment.
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack
+                                of resources.
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EMU_BLOCK_READ) (
+  IN     EMU_BLOCK_IO_PROTOCOL  *This,
+  IN     UINT32                 MediaId,
+  IN     EFI_LBA                LBA,
+  IN OUT EFI_BLOCK_IO2_TOKEN    *Token,
+  IN     UINTN                  BufferSize,
+     OUT VOID                  *Buffer
+  );
+
+/**
+  Write BufferSize bytes from Lba into Buffer.
+
+  This function writes the requested number of blocks to the device. All blocks
+  are written, or an error is returned.If EFI_DEVICE_ERROR, EFI_NO_MEDIA,
+  EFI_WRITE_PROTECTED or EFI_MEDIA_CHANGED is returned and non-blocking I/O is
+  being used, the Event associated with this request will not be signaled.
+
+  @param[in]       This       Indicates a pointer to the calling context.
+  @param[in]       MediaId    The media ID that the write request is for.
+  @param[in]       Lba        The starting logical block address to be written. The
+                              caller is responsible for writing to only legitimate
+                              locations.
+  @param[in, out]  Token      A pointer to the token associated with the transaction.
+  @param[in]       BufferSize Size of Buffer, must be a multiple of device block size.
+  @param[in]       Buffer     A pointer to the source buffer for the data.
+
+  @retval EFI_SUCCESS           The write request was queued if Event is not NULL.
+                                The data was written correctly to the device if
+                                the Event is NULL.
+  @retval EFI_WRITE_PROTECTED   The device can not be written to.
+  @retval EFI_NO_MEDIA          There is no media in the device.
+  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
+  @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.
+  @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid, 
+                                or the buffer is not on proper alignment.
+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack
+                                of resources.
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EMU_BLOCK_WRITE) (
+  IN     EMU_BLOCK_IO_PROTOCOL   *This,
+  IN     UINT32                 MediaId,
+  IN     EFI_LBA                LBA,
+  IN OUT EFI_BLOCK_IO2_TOKEN    *Token,
+  IN     UINTN                  BufferSize,
+  IN     VOID                   *Buffer
+  );
+
+/**
+  Flush the Block Device.
+ 
+  If EFI_DEVICE_ERROR, EFI_NO_MEDIA,_EFI_WRITE_PROTECTED or EFI_MEDIA_CHANGED
+  is returned and non-blocking I/O is being used, the Event associated with
+  this request will not be signaled.  
+
+  @param[in]      This     Indicates a pointer to the calling context.
+  @param[in,out]  Token    A pointer to the token associated with the transaction
+
+  @retval EFI_SUCCESS          The flush request was queued if Event is not NULL.
+                               All outstanding data was written correctly to the
+                               device if the Event is NULL.
+  @retval EFI_DEVICE_ERROR     The device reported an error while writting back
+                               the data.
+  @retval EFI_WRITE_PROTECTED  The device cannot be written to.
+  @retval EFI_NO_MEDIA         There is no media in the device.
+  @retval EFI_MEDIA_CHANGED    The MediaId is not for the current media.
+  @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
+                               of resources.
+
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EMU_BLOCK_FLUSH) (
+  IN     EMU_BLOCK_IO_PROTOCOL    *This,
+  IN OUT EFI_BLOCK_IO2_TOKEN      *Token
+  );
+
+
+typedef
+EFI_STATUS
+(EFIAPI *EMU_BLOCK_CREATE_MAPPING) (
+  IN     EMU_BLOCK_IO_PROTOCOL    *This,
+  IN     EFI_BLOCK_IO_MEDIA       *Media
+  );
+
+
+///
+///  The Block I/O2 protocol defines an extension to the Block I/O protocol which
+///  enables the ability to read and write data at a block level in a non-blocking
+//   manner.
+///
+struct _EMU_BLOCK_IO_PROTOCOL  {
+  EMU_BLOCK_RESET           Reset;
+  EMU_BLOCK_READ            ReadBlocks;
+  EMU_BLOCK_WRITE           WriteBlocks;
+  EMU_BLOCK_FLUSH           FlushBlocks;
+  EMU_BLOCK_CREATE_MAPPING  CreateMapping;
+};
+
+extern EFI_GUID gEmuBlockIoProtocolGuid;
+
+#endif
+
diff --git a/InOsEmuPkg/Unix/Sec/BlockIo.c b/InOsEmuPkg/Unix/Sec/BlockIo.c
new file mode 100644
index 0000000000..3fc1d3f9aa
--- /dev/null
+++ b/InOsEmuPkg/Unix/Sec/BlockIo.c
@@ -0,0 +1,1053 @@
+/**@file
+
+Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  UnixBlockIo.c
+
+Abstract:
+
+  Produce block IO abstractions for real devices on your PC using Posix APIs.
+  The configuration of what devices to mount or emulate comes from UNIX 
+  environment variables. The variables must be visible to the Microsoft* 
+  Developer Studio for them to work.
+
+  <F>ixed       - Fixed disk like a hard drive.
+  <R>emovable   - Removable media like a floppy or CD-ROM.
+  Read <O>nly   - Write protected device.
+  Read <W>rite  - Read write device.
+  <block count> - Decimal number of blocks a device supports.
+  <block size>  - Decimal number of bytes per block.
+
+  UNIX envirnonment variable contents. '<' and '>' are not part of the variable, 
+  they are just used to make this help more readable. There should be no 
+  spaces between the ';'. Extra spaces will break the variable. A '!' is 
+  used to seperate multiple devices in a variable.
+
+  EFI_EMU_VIRTUAL_DISKS = 
+    <F | R><O | W>;<block count>;<block size>[!...]
+
+  EFI_EMU_PHYSICAL_DISKS =
+    <drive letter>:<F | R><O | W>;<block count>;<block size>[!...]
+
+  Virtual Disks: These devices use a file to emulate a hard disk or removable
+                 media device. 
+                 
+    Thus a 20 MB emulated hard drive would look like:
+    EFI_EMU_VIRTUAL_DISKS=FW;40960;512
+
+    A 1.44MB emulated floppy with a block size of 1024 would look like:
+    EFI_EMU_VIRTUAL_DISKS=RW;1440;1024
+
+  Physical Disks: These devices use UNIX to open a real device in your system
+
+    Thus a 120 MB floppy would look like:
+    EFI_EMU_PHYSICAL_DISKS=B:RW;245760;512
+
+    Thus a standard CD-ROM floppy would look like:
+    EFI_EMU_PHYSICAL_DISKS=Z:RO;307200;2048
+
+
+  * Other names and brands may be claimed as the property of others.
+
+**/
+
+#include <fcntl.h>
+#include <unistd.h>
+#include "UnixBlockIo.h"
+
+//
+// Block IO protocol member functions
+//
+EFI_STATUS
+EFIAPI
+UnixBlockIoReadBlocks (
+  IN EFI_BLOCK_IO_PROTOCOL  *This,
+  IN UINT32                 MediaId,
+  IN EFI_LBA                Lba,
+  IN UINTN                  BufferSize,
+  OUT VOID                  *Buffer
+  );
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoWriteBlocks (
+  IN EFI_BLOCK_IO_PROTOCOL  *This,
+  IN UINT32                 MediaId,
+  IN EFI_LBA                Lba,
+  IN UINTN                  BufferSize,
+  IN VOID                   *Buffer
+  );
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoFlushBlocks (
+  IN EFI_BLOCK_IO_PROTOCOL  *This
+  );
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoResetBlock (
+  IN EFI_BLOCK_IO_PROTOCOL  *This,
+  IN BOOLEAN                ExtendedVerification
+  );
+
+//
+// Private Worker functions
+//
+EFI_STATUS
+UnixBlockIoCreateMapping (
+  IN EMU_IO_THUNK_PROTOCOL             *EmuIoThunk,
+  IN EFI_HANDLE                         EfiDeviceHandle,
+  IN CHAR16                             *Filename,
+  IN BOOLEAN                            ReadOnly,
+  IN BOOLEAN                            RemovableMedia,
+  IN UINTN                              NumberOfBlocks,
+  IN UINTN                              BlockSize
+  );
+
+EFI_STATUS
+UnixBlockIoReadWriteCommon (
+  IN  EMU_BLOCK_IO_PRIVATE *Private,
+  IN UINT32                   MediaId,
+  IN EFI_LBA                  Lba,
+  IN UINTN                    BufferSize,
+  IN VOID                     *Buffer,
+  IN CHAR8                    *CallerName
+  );
+
+EFI_STATUS
+UnixBlockIoError (
+  IN EMU_BLOCK_IO_PRIVATE      *Private
+  );
+
+EFI_STATUS
+UnixBlockIoOpenDevice (
+  EMU_BLOCK_IO_PRIVATE         *Private
+  );
+
+CHAR16                                    *
+GetNextElementPastTerminator (
+  IN  CHAR16  *EnvironmentVariable,
+  IN  CHAR16  Terminator
+  );
+
+
+
+EFI_DRIVER_BINDING_PROTOCOL gUnixBlockIoDriverBinding = {
+  UnixBlockIoDriverBindingSupported,
+  UnixBlockIoDriverBindingStart,
+  UnixBlockIoDriverBindingStop,
+  0xa,
+  NULL,
+  NULL
+};
+
+/**
+  The user Entry Point for module UnixBlockIo. The user code starts with this function.
+
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  
+  @param[in] SystemTable    A pointer to the EFI System Table.
+  
+  @retval EFI_SUCCESS       The entry point is executed successfully.
+  @retval other             Some error occurs when executing this entry point.
+
+**/
+EFI_STATUS
+EFIAPI
+InitializeUnixBlockIo(
+  IN EFI_HANDLE           ImageHandle,
+  IN EFI_SYSTEM_TABLE     *SystemTable
+  )
+{
+  EFI_STATUS              Status;
+
+  Status = EfiLibInstallAllDriverProtocols2 (
+             ImageHandle,
+             SystemTable,
+             &gUnixBlockIoDriverBinding,
+             ImageHandle,
+             &gUnixBlockIoComponentName,
+             &gUnixBlockIoComponentName2,
+             NULL,
+             &gUnixBlockIoDriverDiagnostics,
+             &gUnixBlockIoDriverDiagnostics2
+             );
+  ASSERT_EFI_ERROR (Status);
+
+
+  return Status;
+}
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoDriverBindingSupported (
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,
+  IN  EFI_HANDLE                   Handle,
+  IN  EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath
+  )
+/*++
+
+Routine Description:
+
+Arguments:
+
+Returns:
+
+  None
+
+**/
+{
+  EFI_STATUS              Status;
+  EMU_IO_THUNK_PROTOCOL  *EmuIoThunk;
+
+  //
+  // Open the IO Abstraction(s) needed to perform the supported test
+  //
+  Status = gBS->OpenProtocol (
+                  Handle,
+                  &gEmuIoThunkProtocolGuid,
+                  (VOID **)&EmuIoThunk,
+                  This->DriverBindingHandle,
+                  Handle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Make sure the UnixThunkProtocol is valid
+  //
+  Status = EFI_UNSUPPORTED;
+  if (EmuIoThunk->UnixThunk->Signature == EFI_EMU_THUNK_PROTOCOL_SIGNATURE) {
+
+    //
+    // Check the GUID to see if this is a handle type the driver supports
+    //
+    if (CompareGuid (EmuIoThunk->TypeGuid, &gEfiUnixVirtualDisksGuid) ) {
+      Status = EFI_SUCCESS;
+    }
+  }
+
+  //
+  // Close the I/O Abstraction(s) used to perform the supported test
+  //
+  gBS->CloseProtocol (
+        Handle,
+        &gEmuIoThunkProtocolGuid,
+        This->DriverBindingHandle,
+        Handle
+        );
+  return Status;
+}
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoDriverBindingStart (
+  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,
+  IN  EFI_HANDLE                    Handle,
+  IN  EFI_DEVICE_PATH_PROTOCOL      *RemainingDevicePath
+  )
+/*++
+
+Routine Description:
+
+Arguments:
+
+Returns:
+
+  None
+
+**/
+{
+  EFI_STATUS                  Status;
+  EMU_IO_THUNK_PROTOCOL       *EmuIoThunk;
+  CHAR16                      Buffer[FILENAME_BUFFER_SIZE];
+  CHAR16                      *Str;
+  BOOLEAN                     RemovableMedia;
+  BOOLEAN                     WriteProtected;
+  UINTN                       NumberOfBlocks;
+  UINTN                       BlockSize;
+  INTN                        i;
+
+  //
+  // Grab the protocols we need
+  //
+  
+  Status = gBS->OpenProtocol (
+                  Handle,
+                  &gEmuIoThunkProtocolGuid,
+                  (void *)&EmuIoThunk,
+                  This->DriverBindingHandle,
+                  Handle,
+                  EFI_OPEN_PROTOCOL_BY_DRIVER
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  //
+  // Set DiskType
+  //
+  if (!CompareGuid (EmuIoThunk->TypeGuid, &gEfiUnixVirtualDisksGuid)) {
+    Status = EFI_UNSUPPORTED;
+    goto Done;
+  }
+
+  Status  = EFI_NOT_FOUND;
+  //  Extract filename.
+  Str     = EmuIoThunk->EnvString;
+  i = 0;
+  while (*Str && *Str != ':')
+    Buffer[i++] = *Str++;
+  Buffer[i] = 0;
+  if (*Str != ':') {
+    goto Done;
+  }
+
+  Str++;
+
+  RemovableMedia = FALSE;
+  WriteProtected = TRUE;
+  NumberOfBlocks = 0;
+  BlockSize = 512;
+  do {
+    if (*Str == 'R' || *Str == 'F') {
+      RemovableMedia = (BOOLEAN) (*Str == 'R');
+      Str++;
+    }
+    if (*Str == 'O' || *Str == 'W') {
+      WriteProtected  = (BOOLEAN) (*Str == 'O');
+      Str++;
+    }
+    if (*Str == 0)
+      break;
+    if (*Str != ';')
+      goto Done;
+    Str++;
+
+    NumberOfBlocks  = Atoi (Str);
+    Str       = GetNextElementPastTerminator (Str, ';');
+    if (NumberOfBlocks == 0)
+      break;
+
+    BlockSize = Atoi (Str);
+    if (BlockSize != 0)
+      Str       = GetNextElementPastTerminator (Str, ';');
+  } while (0);
+
+  //
+  // If we get here the variable is valid so do the work.
+  //
+  Status = UnixBlockIoCreateMapping (
+              EmuIoThunk,
+              Handle,
+              Buffer,
+              WriteProtected,
+              RemovableMedia,
+              NumberOfBlocks,
+              BlockSize
+              );
+
+Done:
+  if (EFI_ERROR (Status)) {
+    gBS->CloseProtocol (
+          Handle,
+          &gEmuIoThunkProtocolGuid,
+          This->DriverBindingHandle,
+          Handle
+          );
+  }
+
+  return Status;
+}
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoDriverBindingStop (
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,
+  IN  EFI_HANDLE                   Handle,
+  IN  UINTN                        NumberOfChildren,
+  IN  EFI_HANDLE                   *ChildHandleBuffer
+  )
+{
+  EFI_BLOCK_IO_PROTOCOL   *BlockIo;
+  EFI_STATUS              Status;
+  EMU_BLOCK_IO_PRIVATE *Private;
+
+  //
+  // Get our context back
+  //
+  Status = gBS->OpenProtocol (
+                  Handle,
+                  &gEfiBlockIoProtocolGuid,
+                  (void *)&BlockIo,
+                  This->DriverBindingHandle,
+                  Handle,
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                  );
+  if (EFI_ERROR (Status)) {
+    return EFI_UNSUPPORTED;
+  }
+
+  Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (BlockIo);
+
+  //
+  // BugBug: If we need to kick people off, we need to make Uninstall Close the handles.
+  //         We could pass in our image handle or FLAG our open to be closed via
+  //         Unistall (== to saying any CloseProtocol will close our open)
+  //
+  Status = gBS->UninstallMultipleProtocolInterfaces (
+                  Private->EfiHandle,
+                  &gEfiBlockIoProtocolGuid,
+                  &Private->BlockIo,
+                  NULL
+                  );
+  if (!EFI_ERROR (Status)) {
+
+    Status = gBS->CloseProtocol (
+                    Handle,
+                    &gEmuIoThunkProtocolGuid,
+                    This->DriverBindingHandle,
+                    Handle
+                    );
+
+    //
+    // Shut down our device
+    //
+    Private->UnixThunk->Close (Private->fd);
+
+    //
+    // Free our instance data
+    //
+    FreeUnicodeStringTable (Private->ControllerNameTable);
+
+    gBS->FreePool (Private);
+  }
+
+  return Status;
+}
+
+CHAR16 *
+GetNextElementPastTerminator (
+  IN  CHAR16  *EnvironmentVariable,
+  IN  CHAR16  Terminator
+  )
+/*++
+
+Routine Description:
+
+  Worker function to parse environment variables.
+
+Arguments:
+  EnvironmentVariable - Envirnment variable to parse.
+
+  Terminator          - Terminator to parse for.
+
+Returns: 
+
+  Pointer to next eliment past the first occurence of Terminator or the '\0'
+  at the end of the string.
+
+**/
+{
+  CHAR16  *Ptr;
+
+  for (Ptr = EnvironmentVariable; *Ptr != '\0'; Ptr++) {
+    if (*Ptr == Terminator) {
+      Ptr++;
+      break;
+    }
+  }
+
+  return Ptr;
+}
+
+EFI_STATUS
+UnixBlockIoCreateMapping (
+  IN EMU_IO_THUNK_PROTOCOL             *EmuIoThunk,
+  IN EFI_HANDLE                         EfiDeviceHandle,
+  IN CHAR16                             *Filename,
+  IN BOOLEAN                            ReadOnly,
+  IN BOOLEAN                            RemovableMedia,
+  IN UINTN                              NumberOfBlocks,
+  IN UINTN                              BlockSize
+  )
+{
+  EFI_STATUS              Status;
+  EFI_BLOCK_IO_PROTOCOL   *BlockIo;
+  EMU_BLOCK_IO_PRIVATE *Private;
+  UINTN                   Index;
+
+  Status = gBS->AllocatePool (
+                  EfiBootServicesData,
+                  sizeof (EMU_BLOCK_IO_PRIVATE),
+                  (void *)&Private
+                  );
+  ASSERT_EFI_ERROR (Status);
+
+  EfiInitializeLock (&Private->Lock, TPL_NOTIFY);
+
+  Private->UnixThunk = EmuIoThunk->UnixThunk;
+
+  Private->Signature  = EMU_BLOCK_IO_PRIVATE_SIGNATURE;
+  Private->LastBlock  = NumberOfBlocks - 1;
+  Private->BlockSize  = BlockSize;
+
+  for (Index = 0; Filename[Index] != 0; Index++) {
+    Private->Filename[Index] = Filename[Index];
+  }
+
+  Private->Filename[Index]      = 0;
+
+  Private->Mode                 = (ReadOnly ? O_RDONLY : O_RDWR);
+
+  Private->NumberOfBlocks       = NumberOfBlocks;
+  Private->fd                   = -1;
+
+  Private->ControllerNameTable  = NULL;
+
+  AddUnicodeString (
+    "eng",
+    gUnixBlockIoComponentName.SupportedLanguages,
+    &Private->ControllerNameTable,
+    Filename
+    );
+
+  BlockIo = &Private->BlockIo;
+  BlockIo->Revision = EFI_BLOCK_IO_PROTOCOL_REVISION;
+  BlockIo->Media = &Private->Media;
+  BlockIo->Media->BlockSize = Private->BlockSize;
+  BlockIo->Media->LastBlock = Private->NumberOfBlocks - 1;
+  BlockIo->Media->MediaId = 0;;
+
+  BlockIo->Reset = UnixBlockIoResetBlock;
+  BlockIo->ReadBlocks = UnixBlockIoReadBlocks;
+  BlockIo->WriteBlocks = UnixBlockIoWriteBlocks;
+  BlockIo->FlushBlocks = UnixBlockIoFlushBlocks;
+
+  BlockIo->Media->ReadOnly = ReadOnly;
+  BlockIo->Media->RemovableMedia = RemovableMedia;
+  BlockIo->Media->LogicalPartition = FALSE;
+  BlockIo->Media->MediaPresent = TRUE;
+  BlockIo->Media->WriteCaching = FALSE;
+
+  BlockIo->Media->IoAlign = 1;
+
+  Private->EfiHandle  = EfiDeviceHandle;
+  Status              = UnixBlockIoOpenDevice (Private);
+  if (!EFI_ERROR (Status)) {
+
+    Status = gBS->InstallMultipleProtocolInterfaces (
+                    &Private->EfiHandle,
+                    &gEfiBlockIoProtocolGuid,
+                    &Private->BlockIo,
+                    NULL
+                    );
+    if (EFI_ERROR (Status)) {
+      FreeUnicodeStringTable (Private->ControllerNameTable);
+      gBS->FreePool (Private);
+    }
+
+    DEBUG ((EFI_D_ERROR, "BlockDevice added: %s\n", Filename));
+  }
+
+  return Status;
+}
+
+EFI_STATUS
+UnixBlockIoOpenDevice (
+  EMU_BLOCK_IO_PRIVATE                 *Private
+  )
+{
+  EFI_STATUS            Status;
+  UINT64                FileSize;
+  UINT64                EndOfFile;
+  EFI_BLOCK_IO_PROTOCOL *BlockIo;
+
+  BlockIo = &Private->BlockIo;
+  EfiAcquireLock (&Private->Lock);
+
+  //
+  // If the device is already opened, close it
+  //
+  if (Private->fd >= 0) {
+    BlockIo->Reset (BlockIo, FALSE);
+  }
+
+  //
+  // Open the device
+  //
+  Private->fd = Private->UnixThunk->Open (Private->Filename, Private->Mode, 0644);
+  if (Private->fd < 0) {
+    DEBUG ((EFI_D_INFO, "PlOpenBlock: Could not open %a\n", Private->Filename));
+    BlockIo->Media->MediaPresent  = FALSE;
+    Status                        = EFI_NO_MEDIA;
+    goto Done;
+  }
+
+  if (!BlockIo->Media->MediaPresent) {
+    //
+    // BugBug: try to emulate if a CD appears - notify drivers to check it out
+    //
+    BlockIo->Media->MediaPresent = TRUE;
+    EfiReleaseLock (&Private->Lock);
+    EfiAcquireLock (&Private->Lock);
+  }
+
+  //
+  // get the size of the file
+  //
+  Status = SetFilePointer64 (Private, 0, &FileSize, SEEK_END);
+  if (EFI_ERROR (Status)) {
+    FileSize = MultU64x32 (Private->NumberOfBlocks, Private->BlockSize);
+    DEBUG ((EFI_D_ERROR, "PlOpenBlock: Could not get filesize of %a\n", Private->Filename));
+    Status = EFI_UNSUPPORTED;
+    goto Done;
+  }
+
+  if (Private->NumberOfBlocks == 0) {
+    Private->NumberOfBlocks = DivU64x32 (FileSize, Private->BlockSize);
+    Private->LastBlock = Private->NumberOfBlocks - 1;
+    Private->Media.LastBlock = Private->LastBlock;
+  }
+
+  EndOfFile = MultU64x32 (Private->NumberOfBlocks, Private->BlockSize);
+
+  if (FileSize != EndOfFile) {
+    //
+    // file is not the proper size, change it
+    //
+    DEBUG ((EFI_D_INIT, "PlOpenBlock: Initializing block device: %a\n", Private->Filename));
+
+    //
+    // first set it to 0
+    //
+    Private->UnixThunk->FTruncate (Private->fd, 0);
+
+    //
+    // then set it to the needed file size (OS will zero fill it)
+    //
+    Private->UnixThunk->FTruncate (Private->fd, EndOfFile);
+  }
+
+  DEBUG ((EFI_D_INIT, "%HPlOpenBlock: opened %a%N\n", Private->Filename));
+  Status = EFI_SUCCESS;
+
+Done:
+  if (EFI_ERROR (Status)) {
+    if (Private->fd >= 0) {
+      BlockIo->Reset (BlockIo, FALSE);
+    }
+  }
+
+  EfiReleaseLock (&Private->Lock);
+  return Status;
+}
+
+EFI_STATUS
+UnixBlockIoError (
+  IN EMU_BLOCK_IO_PRIVATE      *Private
+  )
+{
+  return EFI_DEVICE_ERROR;
+
+#if 0
+  EFI_BLOCK_IO_PROTOCOL *BlockIo;
+  EFI_STATUS            Status;
+  BOOLEAN               ReinstallBlockIoFlag;
+
+
+  BlockIo = &Private->BlockIo;
+
+  switch (Private->UnixThunk->GetLastError ()) {
+
+  case ERROR_NOT_READY:
+    Status                        = EFI_NO_MEDIA;
+    BlockIo->Media->ReadOnly      = FALSE;
+    BlockIo->Media->MediaPresent  = FALSE;
+    ReinstallBlockIoFlag          = FALSE;
+    break;
+
+  case ERROR_WRONG_DISK:
+    BlockIo->Media->ReadOnly      = FALSE;
+    BlockIo->Media->MediaPresent  = TRUE;
+    BlockIo->Media->MediaId += 1;
+    ReinstallBlockIoFlag  = TRUE;
+    Status                = EFI_MEDIA_CHANGED;
+    break;
+
+  case ERROR_WRITE_PROTECT:
+    BlockIo->Media->ReadOnly  = TRUE;
+    ReinstallBlockIoFlag      = FALSE;
+    Status                    = EFI_WRITE_PROTECTED;
+    break;
+
+  default:
+    ReinstallBlockIoFlag  = FALSE;
+    Status                = EFI_DEVICE_ERROR;
+    break;
+  }
+
+  if (ReinstallBlockIoFlag) {
+    BlockIo->Reset (BlockIo, FALSE);
+
+    gBS->ReinstallProtocolInterface (
+          Private->EfiHandle,
+          &gEfiBlockIoProtocolGuid,
+          BlockIo,
+          BlockIo
+          );
+  }
+
+  return Status;
+#endif
+}
+
+EFI_STATUS
+UnixBlockIoReadWriteCommon (
+  IN  EMU_BLOCK_IO_PRIVATE     *Private,
+  IN UINT32                       MediaId,
+  IN EFI_LBA                      Lba,
+  IN UINTN                        BufferSize,
+  IN VOID                         *Buffer,
+  IN CHAR8                        *CallerName
+  )
+{
+  EFI_STATUS  Status;
+  UINTN       BlockSize;
+  UINT64      LastBlock;
+  INT64       DistanceToMove;
+  UINT64      DistanceMoved;
+
+  if (Private->fd < 0) {
+    Status = UnixBlockIoOpenDevice (Private);
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+  }
+
+  if (!Private->Media.MediaPresent) {
+    DEBUG ((EFI_D_INIT, "%s: No Media\n", CallerName));
+    return EFI_NO_MEDIA;
+  }
+
+  if (Private->Media.MediaId != MediaId) {
+    return EFI_MEDIA_CHANGED;
+  }
+
+  if ((UINTN) Buffer % Private->Media.IoAlign != 0) {
+    return EFI_INVALID_PARAMETER;
+  }
+  
+  //
+  // Verify buffer size
+  //
+  BlockSize = Private->BlockSize;
+  if (BufferSize == 0) {
+    DEBUG ((EFI_D_INIT, "%s: Zero length read\n", CallerName));
+    return EFI_SUCCESS;
+  }
+
+  if ((BufferSize % BlockSize) != 0) {
+    DEBUG ((EFI_D_INIT, "%s: Invalid read size\n", CallerName));
+    return EFI_BAD_BUFFER_SIZE;
+  }
+
+  LastBlock = Lba + (BufferSize / BlockSize) - 1;
+  if (LastBlock > Private->LastBlock) {
+    DEBUG ((EFI_D_INIT, "ReadBlocks: Attempted to read off end of device\n"));
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Seek to End of File
+  //
+  DistanceToMove = MultU64x32 (Lba, BlockSize);
+  Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, SEEK_SET);
+
+  if (EFI_ERROR (Status)) {
+    DEBUG ((EFI_D_INIT, "WriteBlocks: SetFilePointer failed\n"));
+    return UnixBlockIoError (Private);
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoReadBlocks (
+  IN EFI_BLOCK_IO_PROTOCOL  *This,
+  IN UINT32                 MediaId,
+  IN EFI_LBA                Lba,
+  IN UINTN                  BufferSize,
+  OUT VOID                  *Buffer
+  )
+/*++
+
+  Routine Description:
+    Read BufferSize bytes from Lba into Buffer.
+
+  Arguments:
+    This       - Protocol instance pointer.
+    MediaId    - Id of the media, changes every time the media is replaced.
+    Lba        - The starting Logical Block Address to read from
+    BufferSize - Size of Buffer, must be a multiple of device block size.
+    Buffer     - Buffer containing read data
+
+  Returns:
+    EFI_SUCCESS           - The data was read correctly from the device.
+    EFI_DEVICE_ERROR      - The device reported an error while performing the read.
+    EFI_NO_MEDIA          - There is no media in the device.
+    EFI_MEDIA_CHANGED     - The MediaId does not matched the current device.
+    EFI_BAD_BUFFER_SIZE   - The Buffer was not a multiple of the block size of the 
+                            device.
+    EFI_INVALID_PARAMETER - The read request contains device addresses that are not 
+                            valid for the device.
+
+**/
+{
+  EMU_BLOCK_IO_PRIVATE *Private;
+  ssize_t                 len;
+  EFI_STATUS              Status;
+  EFI_TPL                 OldTpl;
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);
+
+  Status  = UnixBlockIoReadWriteCommon (Private, MediaId, Lba, BufferSize, Buffer, "UnixReadBlocks");
+  if (EFI_ERROR (Status)) {
+    goto Done;
+  }
+
+  len = Private->UnixThunk->Read (Private->fd, Buffer, BufferSize);
+  if (len != BufferSize) {
+    DEBUG ((EFI_D_INIT, "ReadBlocks: ReadFile failed.\n"));
+    Status = UnixBlockIoError (Private);
+    goto Done;
+  }
+
+  //
+  // If we wrote then media is present.
+  //
+  This->Media->MediaPresent = TRUE;
+  Status = EFI_SUCCESS;
+
+Done:
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoWriteBlocks (
+  IN EFI_BLOCK_IO_PROTOCOL  *This,
+  IN UINT32                 MediaId,
+  IN EFI_LBA                Lba,
+  IN UINTN                  BufferSize,
+  IN VOID                   *Buffer
+  )
+/*++
+
+  Routine Description:
+    Write BufferSize bytes from Lba into Buffer.
+
+  Arguments:
+    This       - Protocol instance pointer.
+    MediaId    - Id of the media, changes every time the media is replaced.
+    Lba        - The starting Logical Block Address to read from
+    BufferSize - Size of Buffer, must be a multiple of device block size.
+    Buffer     - Buffer containing read data
+
+  Returns:
+    EFI_SUCCESS           - The data was written correctly to the device.
+    EFI_WRITE_PROTECTED   - The device can not be written to.
+    EFI_DEVICE_ERROR      - The device reported an error while performing the write.
+    EFI_NO_MEDIA          - There is no media in the device.
+    EFI_MEDIA_CHNAGED     - The MediaId does not matched the current device.
+    EFI_BAD_BUFFER_SIZE   - The Buffer was not a multiple of the block size of the 
+                            device.
+    EFI_INVALID_PARAMETER - The write request contains a LBA that is not 
+                            valid for the device.
+
+**/
+{
+  EMU_BLOCK_IO_PRIVATE *Private;
+  ssize_t                 len;
+  EFI_STATUS              Status;
+  EFI_TPL                 OldTpl;
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+  Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);
+
+  Status  = UnixBlockIoReadWriteCommon (Private, MediaId, Lba, BufferSize, Buffer, "UnixWriteBlocks");
+  if (EFI_ERROR (Status)) {
+    goto Done;
+  }
+
+  len = Private->UnixThunk->Write (Private->fd, Buffer, BufferSize);
+  if (len != BufferSize) {
+    DEBUG ((EFI_D_INIT, "ReadBlocks: WriteFile failed.\n"));
+    Status = UnixBlockIoError (Private);
+    goto Done;
+  }
+
+  //
+  // If the write succeeded, we are not write protected and media is present.
+  //
+  This->Media->MediaPresent = TRUE;
+  This->Media->ReadOnly     = FALSE;
+  Status = EFI_SUCCESS;
+
+Done:
+  gBS->RestoreTPL (OldTpl);
+  return Status;
+}
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoFlushBlocks (
+  IN EFI_BLOCK_IO_PROTOCOL  *This
+  )
+/*++
+
+  Routine Description:
+    Flush the Block Device.
+
+  Arguments:
+    This             - Protocol instance pointer.
+
+  Returns:
+    EFI_SUCCESS      - All outstanding data was written to the device
+    EFI_DEVICE_ERROR - The device reported an error while writting back the data
+    EFI_NO_MEDIA     - There is no media in the device.
+
+**/
+{
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+EFIAPI
+UnixBlockIoResetBlock (
+  IN EFI_BLOCK_IO_PROTOCOL  *This,
+  IN BOOLEAN                ExtendedVerification
+  )
+/*++
+
+  Routine Description:
+    Reset the Block Device.
+
+  Arguments:
+    This                 - Protocol instance pointer.
+    ExtendedVerification - Driver may perform diagnostics on reset.
+
+  Returns:
+    EFI_SUCCESS           - The device was reset.
+    EFI_DEVICE_ERROR      - The device is not functioning properly and could 
+                            not be reset.
+
+**/
+{
+  EMU_BLOCK_IO_PRIVATE *Private;
+  EFI_TPL               OldTpl;
+
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+  
+  Private = EMU_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This);
+
+  if (Private->fd >= 0) {
+    Private->UnixThunk->Close (Private->fd);
+    Private->fd = -1;
+  }
+
+  gBS->RestoreTPL (OldTpl);
+
+  return EFI_SUCCESS;
+}
+
+UINTN
+Atoi (
+  CHAR16  *String
+  )
+/*++
+
+Routine Description:
+
+  Convert a unicode string to a UINTN
+
+Arguments:
+
+  String - Unicode string.
+
+Returns: 
+
+  UINTN of the number represented by String.  
+
+**/
+{
+  UINTN   Number;
+  CHAR16  *Str;
+
+  //
+  // skip preceeding white space
+  //
+  Str = String;
+  while ((*Str) && (*Str == ' ')) {
+    Str++;
+  }
+  //
+  // Convert ot a Number
+  //
+  Number = 0;
+  while (*Str != '\0') {
+    if ((*Str >= '0') && (*Str <= '9')) {
+      Number = (Number * 10) +*Str - '0';
+    } else {
+      break;
+    }
+
+    Str++;
+  }
+
+  return Number;
+}
+
+
+/*++
+
+This function extends the capability of SetFilePointer to accept 64 bit parameters
+
+**/
+EFI_STATUS
+SetFilePointer64 (
+  IN  EMU_BLOCK_IO_PRIVATE    *Private,
+  IN  INT64                      DistanceToMove,
+  OUT UINT64                     *NewFilePointer,
+  IN  INT32                      MoveMethod
+  )
+{
+  EFI_STATUS    Status;
+  off_t         res;
+
+  Status = EFI_SUCCESS;
+  res = Private->UnixThunk->Lseek(Private->fd, DistanceToMove, MoveMethod);
+  if (res == -1) {
+    Status = EFI_INVALID_PARAMETER;
+  }
+
+  if (NewFilePointer != NULL) {
+    *NewFilePointer = res;
+  }
+
+  return Status;
+}
diff --git a/InOsEmuPkg/Unix/Sec/SecMain.c b/InOsEmuPkg/Unix/Sec/SecMain.c
index c00268b383..9c0990b2cd 100644
--- a/InOsEmuPkg/Unix/Sec/SecMain.c
+++ b/InOsEmuPkg/Unix/Sec/SecMain.c
@@ -458,7 +458,6 @@ SecLoadFromCore (
     (SWITCH_STACK_ENTRY_POINT) (UINTN) PeiCoreEntryPoint,
     SecCoreData,
     (VOID *)gPpiList,
-    NULL,
     TopOfStack
     );
   //
diff --git a/InOsEmuPkg/Unix/Sec/SecMain.h b/InOsEmuPkg/Unix/Sec/SecMain.h
index 00ab7a61ab..19e5f17147 100644
--- a/InOsEmuPkg/Unix/Sec/SecMain.h
+++ b/InOsEmuPkg/Unix/Sec/SecMain.h
@@ -283,7 +283,6 @@ PeiSwitchStacks (
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,
   IN      VOID                      *Context1,  OPTIONAL
   IN      VOID                      *Context2,  OPTIONAL
-  IN      VOID                      *Context3,  OPTIONAL
   IN      VOID                      *NewStack
   );
 
diff --git a/InOsEmuPkg/Unix/Sec/X64/SwitchStack.S b/InOsEmuPkg/Unix/Sec/X64/SwitchStack.S
index 76567ac0e1..8a57b781b5 100644
--- a/InOsEmuPkg/Unix/Sec/X64/SwitchStack.S
+++ b/InOsEmuPkg/Unix/Sec/X64/SwitchStack.S
@@ -16,7 +16,7 @@
 #------------------------------------------------------------------------------
 # Routine Description:
 #
-#   Routine for switching stacks with 3 parameters EFI ABI
+#   Routine for switching stacks with 2 parameters EFI ABI
 #   Convert UNIX to EFI ABI
 #
 # Arguments:
@@ -24,8 +24,7 @@
 #   (rdi) EntryPoint    - Entry point with new stack.
 #   (rsi) Context1      - Parameter1 for entry point. (rcx)
 #   (rdx) Context2      - Parameter2 for entry point. (rdx) 
-#   (rcx) Context3      - Parameter3 for entry point. (r8)
-#   (r8)  NewStack      - The pointer to new stack.
+#   (rcx) NewStack      - The pointer to new stack.
 #
 # Returns:
 #
@@ -37,11 +36,11 @@ ASM_PFX(PeiSwitchStacks):
     pushq   $0            // tells gdb to stop unwinding frame
     movq    %rsp, %rbp
 
-    movq    %r8,  %rsp
+    movq    %rcx, %rsp    // update stack pointer
     
-    movq    %rdi, %rax
-    movq    %rsi, %rcx
-    movq    %rcx, %r8    
+    movq    %rdi, %rax    // entry point to %rax
+    movq    %rsi, %rcx    // Adjust Context1
+                          // Context2 already in the rigth spot
     
     #
     # Reserve space for register parameters (rcx, rdx, r8 & r9) on the stack,
diff --git a/InOsEmuPkg/Unix/UnixX64.dsc b/InOsEmuPkg/Unix/UnixX64.dsc
index dcae0176ff..06b7b34322 100644
--- a/InOsEmuPkg/Unix/UnixX64.dsc
+++ b/InOsEmuPkg/Unix/UnixX64.dsc
@@ -356,9 +356,9 @@
   InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
   InOsEmuPkg/EmuGopDxe/EmuGopDxe.inf
   InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
+  InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
 
 !if $(0)
-  UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
   UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
   UnixPkg/UnixConsoleDxe/UnixConsole.inf
   UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
diff --git a/InOsEmuPkg/Unix/UnixX64.fdf b/InOsEmuPkg/Unix/UnixX64.fdf
index 0ba58a39d0..14e5b6022a 100644
--- a/InOsEmuPkg/Unix/UnixX64.fdf
+++ b/InOsEmuPkg/Unix/UnixX64.fdf
@@ -253,24 +253,18 @@ INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
 INF FatPkg/EnhancedFatDxe/Fat.inf
 !else
 # Used checked in Visual Studio binaries
-INF  RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf
+FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
+    SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi
+  }
 !endif
 
 !if $(BUILD_NEW_SHELL)
 INF  ShellPkg/Application/Shell/Shell.inf
 !else
-!if $(USE_NEW_SHELL)
-INF  ShellBinPkg/UefiShell/UefiShell.inf
-!else
- FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
-!if $(BUILD_OLD_SHELL)
-  SECTION PE32 = Build/GccShellPkg/DEBUG_XCLANG/X64/ShellFull.efi
-!else
-  SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_Full.efi
-!endif
-  SECTION UI = "Shell"
- }
-!endif
+# Used checked in Visual Studio binaries
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
+    SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_Full.efi
+  }
 !endif
 
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
diff --git a/InOsEmuPkg/Unix/build64.sh b/InOsEmuPkg/Unix/build64.sh
index e575a9266e..a9294be02e 100755
--- a/InOsEmuPkg/Unix/build64.sh
+++ b/InOsEmuPkg/Unix/build64.sh
@@ -43,7 +43,8 @@ fi
 TARGET_TOOLS=MYTOOLS
 UNIXPKG_TOOLS=GCC44
 NETWORK_SUPPORT=
-COMPILE_BINS=
+BUILD_NEW_SHELL=
+BUILD_FAT=
 case `uname` in
   CYGWIN*) echo Cygwin not fully supported yet. ;;
   Darwin*)
@@ -56,8 +57,9 @@ case `uname` in
         TARGET_TOOLS=XCODE32
         UNIXPKG_TOOLS=XCLANG
       fi
-      NETWORK_SUPPORT="-D NETWORK_SUPPORT"
-      COMPILE_BINS="-D COMPILE_BINS"
+#      NETWORK_SUPPORT="-D NETWORK_SUPPORT"
+#      BUILD_NEW_SHELL="-D BUILD_NEW_SHELL"
+#      BUILD_FAT="-D BUILD_FAT"
       ;;
   Linux*) TARGET_TOOLS=ELFGCC ;;
 
@@ -112,11 +114,6 @@ do
     exit $?
   fi
 
-  if [[ $arg == shell ]]; then
-    build -p $WORKSPACE/ShellPkg/ShellPkg.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 $2 $3 $4 $5 $6 $7 $8
-    cp Build/Shell/DEBUG_$UNIXPKG_TOOLS/X64/Shell.efi ShellBinPkg/UefiShell/X64/Shell.efi
-    exit $?
-  fi
 done
 
 
@@ -126,7 +123,7 @@ done
 echo $PATH
 echo `which build`
 build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc      -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 $1 $2 $3 $4 $5 $6 $7 $8  modules
-build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc      -a X64 -t $UNIXPKG_TOOLS $NETWORK_SUPPORT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+build -p $WORKSPACE/InOsEmuPkg/Unix/UnixX64.dsc      -a X64 -t $UNIXPKG_TOOLS $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
 cp $WORKSPACE/Build/EmuUnixX64/DEBUG_"$TARGET_TOOLS"/X64/SecMain $WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64
 exit $?
author	andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>	2011-05-31 20:23:36 +0000
committer	andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>	2011-05-31 20:23:36 +0000
commit	d59326d3a871f1df6e9416334ca2181ac4373d42 (patch)
tree	1ed7cfdd245be8f6edcb3061a371cdaf4c835734
parent	283d361e98f2e7da579b022426d3dfb4fc1e33a8 (diff)
download	edk2-platforms-d59326d3a871f1df6e9416334ca2181ac4373d42.tar.xz