3 files changed, 7 insertions, 16 deletions
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c
index 309cf1a9ed..e8ea11c4f8 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c
@@ -5,7 +5,7 @@
   Availible on http://www.t13.org/#Project drafts
   Currently at ftp://fission.dt.wdc.com/pub/standards/x3t13/project/d1386r4.pdf
 
-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.<BR>
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
@@ -68,8 +68,6 @@ BIOS_LEGACY_DRIVE           *mLegacyDriverUnder1Mb;
 //
 VOID                        *mEdd11Buffer;
 
-EFI_GUID                    mUnknownDevGuid = UNKNOWN_DEVICE_GUID;
-
 /**
   Driver entry point.
 
@@ -635,8 +633,8 @@ SetBiosInitBlockIoDevicePath (
   OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePath
   )
 {
-  EFI_STATUS                        Status;
-  UNKNOWN_DEVICE_VENDOR_DEVICE_PATH VendorNode;
+  EFI_STATUS                  Status;
+  BLOCKIO_VENDOR_DEVICE_PATH  VendorNode;
   
   Status = EFI_UNSUPPORTED;
   
@@ -658,7 +656,7 @@ SetBiosInitBlockIoDevicePath (
     VendorNode.DevicePath.Header.Type     = HARDWARE_DEVICE_PATH;
     VendorNode.DevicePath.Header.SubType  = HW_VENDOR_DP;
     SetDevicePathNodeLength (&VendorNode.DevicePath.Header, sizeof (VendorNode));
-    CopyMem (&VendorNode.DevicePath.Guid, &mUnknownDevGuid, sizeof (EFI_GUID));
+    CopyMem (&VendorNode.DevicePath.Guid, &gBlockIoVendorGuid, sizeof (EFI_GUID));
     VendorNode.LegacyDriveLetter  = Drive->Number;
     *DevicePath                   = AppendDevicePathNode (BaseDevicePath, &VendorNode.DevicePath.Header);
   }
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h
index de3c8d3518..91617b79d9 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.<BR>
 
 This program and the accompanying materials
 are licensed and made available under the terms and conditions
@@ -23,6 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/LegacyBios.h>
 #include <Protocol/DevicePath.h>
 #include <Guid/LegacyBios.h>
+#include <Guid/BlockIoVendor.h>
 
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/DebugLib.h>
@@ -36,14 +37,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "Edd.h"
 
-#define UNKNOWN_DEVICE_GUID \
-  { 0xcf31fac5, 0xc24e, 0x11d2,  {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b}  }
-
-typedef struct {
-  VENDOR_DEVICE_PATH              DevicePath;
-  UINT8                           LegacyDriveLetter;
-} UNKNOWN_DEVICE_VENDOR_DEVICE_PATH;
-
 //
 // Global Variables
 //
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
index 3fcaa2723c..0e02f7eb27 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
@@ -49,7 +49,7 @@
 
 [Guids]
   gEfiLegacyBiosGuid
-
+  gBlockIoVendorGuid
 
 [Packages]
   MdePkg/MdePkg.dec