3 files changed, 17 insertions, 15 deletions
diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverDiagnostics.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverDiagnostics.c
index c7bd30a..83a273a 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverDiagnostics.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverDiagnostics.c
@@ -203,7 +203,7 @@ IDEBusDriverDiagnosticsRunDiagnostics (
       return Status;
     }
 
-    EfiCopyMem (*Buffer, IDE_BUS_DIAGNOSTIC_ERROR, *BufferSize);
+    CopyMem (*Buffer, IDE_BUS_DIAGNOSTIC_ERROR, *BufferSize);
 
     Status = EFI_DEVICE_ERROR;
   }
diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa
index 8a9b7a0..89dd978 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa
@@ -1,21 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>IdeBus</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
     <GuidValue>69FD8E47-A161-4550-B01A-5594CEB2B2B2</GuidValue>
     <Version>1.0</Version>
     <Abstract>Component description file for PS2 keyboard module.</Abstract>
-    <Description>
-      IDE bus driver. This driver will enumerate IDE device and export the blockIo
-      protocol for every device.
-    </Description>
+    <Description>IDE bus driver. This driver will enumerate IDE device and export the blockIo
+      protocol for every device.</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. 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,
+    <License>All rights reserved. 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.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -72,8 +70,8 @@
     <Filename>atapi.c</Filename>
     <Filename>ComponentName.c</Filename>
     <Filename>ComponentName.h</Filename>
-    <Filename ToolCode="DUMMY">DriverConfiguration.c</Filename>
-    <Filename ToolCode="DUMMY">DriverDiagnostics.c</Filename>
+    <Filename>DriverConfiguration.c</Filename>
+    <Filename>DriverDiagnostics.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index 4fe1dac..855fdd7 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -7,7 +7,11 @@
     <Version>1.0</Version>
     <Abstract>Component description file for PciBus module.</Abstract>
     <Description>PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO
-       space for these devices.</Description>
+       space for these devices.
+       LightPcdLib.c tagged with "ToolCode="DUMMY"" is light weight verison for PCI library
+       function. This version provide simple implementation and do not support hot plug. Only one
+       between PcdLib.c and LightPcdLib.c can be choosed. 
+    </Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License