Remove bmp.h and shellFile.h from MdeModulePkg to IntelFrameworkpkg

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

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
index cb89a8d501d6668167c359655c0e3e6042d610dc..f9860a24777101c86681c1ac1d5a24a7ef1b0da6 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 #include "InternalBdsLib.h"\r
+#include "Bmp.h"\r
 \r
 /**\r
   Check if we need to save the EFI variable with "ConVarName" as name\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index e88f169b4f04c53bea636fdaed44d9e36d4609e9..f1a977ae1cb7b0aff17948697bac4aef995cd1c7 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -45,7 +45,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/PcAnsi.h>\r
 #include <Guid/ShellFile.h>\r
-#include <Guid/Bmp.h>\r
 #include <Guid/Performance.h>\r
 \r
 #include <Library/PrintLib.h>\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/bmp.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/bmp.h
new file mode 100644 (file)
index 0000000..f1aff9b
--- /dev/null
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/bmp.h
@@ -0,0 +1,48 @@
+/** @file\r
+  This file defines BMP file header data structures.\r
+\r
+Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#ifndef _GENERIC_BDS_BMP_H__\r
+#define _GENERIC_BDS_BMP_H__\r
+\r
+#pragma pack(1)\r
+\r
+typedef struct {\r
+  UINT8   Blue;\r
+  UINT8   Green;\r
+  UINT8   Red;\r
+  UINT8   Reserved;\r
+} BMP_COLOR_MAP;\r
+\r
+typedef struct {\r
+  CHAR8         CharB;\r
+  CHAR8         CharM;\r
+  UINT32        Size;\r
+  UINT16        Reserved[2];\r
+  UINT32        ImageOffset;\r
+  UINT32        HeaderSize;\r
+  UINT32        PixelWidth;\r
+  UINT32        PixelHeight;\r
+  UINT16        Planes;          ///> Must be 1\r
+  UINT16        BitPerPixel;     ///> 1, 4, 8, or 24\r
+  UINT32        CompressionType;\r
+  UINT32        ImageSize;       ///> Compressed image size in bytes\r
+  UINT32        XPixelsPerMeter;\r
+  UINT32        YPixelsPerMeter;\r
+  UINT32        NumberOfColors;\r
+  UINT32        ImportantColors;\r
+} BMP_IMAGE_HEADER;\r
+\r
+#pragma pack()\r
+\r
+#endif\r