Roll back revision 2222 to recover the wrong checking.

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

diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
index de4bb2e0ef58499cc66032970599c7f92f5f7e1f..bf95be158c9c5c52d88c7d6bfc7d745fecaf344e 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c
@@ -12,11 +12,6 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "DiskIo.h"\r
 \r
 //\r
 #include "DiskIo.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
index 5df48c61c5aa6d37d57fd28ab223e6a9422f223e..c1a572f846bafcd5c5ae0e6bbf68d6a5e948eb78 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h
@@ -16,11 +16,6 @@
 #ifndef _DISK_IO_H\r
 #define _DISK_IO_H\r
 \r
 #ifndef _DISK_IO_H\r
 #define _DISK_IO_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r
 #include <Protocol/ComponentName.h>\r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r
 #include <Protocol/ComponentName.h>\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
index 3030bda1dd353bf4341cefa5c5c0d43fb7314bcc..ad736793020721cf6bae8ddeb1d7569a2b1475ff 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
@@ -1,13 +1,12 @@
 #/** @file\r
 #/** @file\r

-# Component description file for DiskIo module.\r
-#\r
-# DiskIo driver that layers it's self on every Block IO protocol in the system.\r
-# Copyright (c) 2006 - 2007, Intel Corporation\r
+#  Component description file for DiskIo module.\r

 #\r
 #\r

+#  Copyright (c) 2006 - 2007, Intel Corporation\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
 #  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
 #  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


@@ -35,8 +34,8 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r

-#  DRIVER_BINDING                =  gDiskIoDriverBinding                         \r
-#  COMPONENT_NAME                =  gDiskIoComponentName                         \r
+#  DRIVER_BINDING                =  gDiskIoDriverBinding\r
+#  COMPONENT_NAME                =  gDiskIoComponentName\r

 #\r
 \r
 ################################################################################\r
 #\r
 \r
 ################################################################################\r


@@ -49,8 +48,6 @@
   ComponentName.c\r
   DiskIo.h\r
   diskio.c\r
   ComponentName.c\r
   DiskIo.h\r
   diskio.c\r

-  CommonHeader.h\r
-  EntryPoint.c\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r


@@ -63,6 +60,18 @@
 [Includes]\r
   $(WORKSPACE)/MdePkg/Include/Library\r
 \r
 [Includes]\r
   $(WORKSPACE)/MdePkg/Include/Library\r
 \r

+################################################################################\r
+#\r
+# Package Dependency Section - list of Package files that are required for\r
+#                              this module.\r
+#\r
+################################################################################\r
+\r
+[Packages]\r
+  $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec\r
+  $(WORKSPACE)/MdePkg/MdePkg.dec\r
+\r
+\r

 ################################################################################\r
 #\r
 # Library Class Section - list of Library Classes that are required for\r
 ################################################################################\r
 #\r
 # Library Class Section - list of Library Classes that are required for\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
index d5efd634cfe3ae03ecb04de096a555f5c8cc29bc..0cb49224ca7ad80c13ad43cc0340482a05378976 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c
@@ -20,11 +20,6 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "DiskIo.h"\r
 \r
 EFI_DRIVER_BINDING_PROTOCOL gDiskIoDriverBinding = {\r
 #include "DiskIo.h"\r
 \r
 EFI_DRIVER_BINDING_PROTOCOL gDiskIoDriverBinding = {\r

diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c
index 8e8153fbc03226471925baa5467a025f957ead0b..e922cb0f9285e8813fc1517d587280665ec5b7f7 100644 (file)
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c
@@ -12,11 +12,6 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Partition.h"\r
 \r
 //\r
 #include "Partition.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c
index ab93c089311b22239f608387ad4c404e76f877e2..37ac710ff0104d46963a38dcc5f897337f2b8616 100644 (file)
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c
@@ -13,11 +13,6 @@
 **/\r
 \r
 \r
 **/\r
 \r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Partition.h"\r
 \r
 \r
 #include "Partition.h"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
index c5978a16beaeb89ce8a9cf801fd6e4710084e7fc..581007e92af8475d8e2f0dd07d7b0b2416f35f66 100644 (file)
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
@@ -14,11 +14,6 @@
 **/\r
 \r
 \r
 **/\r
 \r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Partition.h"\r
 \r
 \r
 #include "Partition.h"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
index bc08963e5402fa627cc9396138e9078755289b7b..d71698c82673dcb08641b05b5482c4c4eca4f755 100644 (file)
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c
@@ -29,11 +29,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Partition.h"\r
 \r
 STATIC\r
 #include "Partition.h"\r
 \r
 STATIC\r

diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c
index de2c802b7d64bbefc710122c8e2ee3306d6abcd5..4d0c76f251960d54d5a908290813e4c054064e87 100644 (file)
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c
@@ -16,11 +16,6 @@
 **/\r
 \r
 \r
 **/\r
 \r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Partition.h"\r
 \r
 //\r
 #include "Partition.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
index 289c9a544308e98da4b21ec0c2284f0d54d1c31a..570d0194b5114d9b8bb722cd40ceaade34d62435 100644 (file)
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h
@@ -18,11 +18,6 @@
 #ifndef _PARTITION_H \r
 #define _PARTITION_H \r
 \r
 #ifndef _PARTITION_H \r
 #define _PARTITION_H \r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r
 #include <Guid/Gpt.h>\r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r
 #include <Guid/Gpt.h>\r

diff --git a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf
index 2036fa7afb914f90fa59ccd92c5776eaa937b24a..1e00fccfd6898ded261b32cc6aa1fe9fc2a3bbf5 100644 (file)
--- a/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf
+++ b/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf
@@ -5,12 +5,13 @@
 #  that represents the bytes Start to End of the Parent Block IO \r
 #  device (one partition of physical BlockIo device, \r
 #  which can be one of GPT, MBR, ElTorito partition).\r
 #  that represents the bytes Start to End of the Parent Block IO \r
 #  device (one partition of physical BlockIo device, \r
 #  which can be one of GPT, MBR, ElTorito partition).\r

-# Copyright (c) 2006 - 2007, Intel Corporation\r

 #\r
 #\r

+#  Copyright (c) 2006 - 2007, Intel Corporation\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
 #  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
 #  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


@@ -55,8 +56,6 @@
   ElTorito.c\r
   Partition.c\r
   Partition.h\r
   ElTorito.c\r
   Partition.c\r
   Partition.h\r

-  CommonHeader.h\r
-  EntryPoint.c\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r


@@ -69,6 +68,17 @@
 [Includes]\r
   $(WORKSPACE)/MdePkg/Include/Library\r
 \r
 [Includes]\r
   $(WORKSPACE)/MdePkg/Include/Library\r
 \r

+################################################################################\r
+#\r
+# Package Dependency Section - list of Package files that are required for\r
+#                              this module.\r
+#\r
+################################################################################\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+\r
+\r

 ################################################################################\r
 #\r
 # Library Class Section - list of Library Classes that are required for\r
 ################################################################################\r
 #\r
 # Library Class Section - list of Library Classes that are required for\r

diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c
index 88811f1611f5d6025f487e5265fc6f5345f4e87b..2eb325ec56148fc124c0d944148a1701ba2f839c 100644 (file)
--- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c
+++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c
@@ -13,11 +13,6 @@
 **/\r
 \r
 \r
 **/\r
 \r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "SecurityStub.h"\r
 \r
 //\r
 #include "SecurityStub.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
index df57d9e9aa407e1446b94c74afa06276e72297da..dedc14afdbe1e22ff4d3c47f982288cbcfeb4086 100644 (file)
--- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
+++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h
@@ -16,11 +16,6 @@
 #define _SECURITY_STUB_ARCH_PROTOCOL_H\r
 \r
 \r
 #define _SECURITY_STUB_ARCH_PROTOCOL_H\r
 \r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 //\r
 // Common header files for this module.\r
 //\r
 //\r
 // Common header files for this module.\r
 //\r

diff --git a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf
index 36504f9860b6fde4e400c5648cc217e4d49056c1..ec17ceacf809116109129d2d8c6337b405e5965b 100644 (file)
--- a/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf
+++ b/MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf
@@ -1,13 +1,12 @@
 #/** @file\r
 #/** @file\r

-# Component description file for SecurityStub module\r
-#\r
-# This driver supports platform security service.\r
-# Copyright (c) 2006 - 2007, Intel Corporation\r
+#  Component description file for SecurityStub module\r

 #\r
 #\r

+#  Copyright (c) 2006 - 2007, Intel Corporation\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
 #  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
 #  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


@@ -46,7 +45,6 @@
   SecurityStub.c\r
   SecurityStub.h\r
   SecurityStub.dxs\r
   SecurityStub.c\r
   SecurityStub.h\r
   SecurityStub.dxs\r

-  CommonHeader.h\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r


@@ -59,6 +57,17 @@
 [Includes]\r
   $(WORKSPACE)/MdePkg/Include/Library\r
 \r
 [Includes]\r
   $(WORKSPACE)/MdePkg/Include/Library\r
 \r

+################################################################################\r
+#\r
+# Package Dependency Section - list of Package files that are required for\r
+#                              this module.\r
+#\r
+################################################################################\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+\r
+\r

 ################################################################################\r
 #\r
 # Library Class Section - list of Library Classes that are required for\r
 ################################################################################\r
 #\r
 # Library Class Section - list of Library Classes that are required for\r