Change UINAME to CName of GUID/PPI/Protocol in all Msa file and change tool to support it.

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

1 files changed, 22 insertions, 22 deletions

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
index b58e5dd..d450ca5 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--Copyright (c) 2006, Intel Corporation

-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,

+<!--Copyright (c) 2006, Intel Corporation
+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.-->

-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

   <MsaHeader>

     <ModuleName>Cpu</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

@@ -16,11 +16,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Abstract>Component description file for Cpu module.</Abstract>

     <Description>FIX ME!</Description>

     <Copyright>Copyright (c) 2004-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>

@@ -69,19 +69,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </PackageDependencies>

   <Protocols>

     <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>Cpu</ProtocolCName>

+      <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>CpuIo</ProtocolCName>

+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="SOMETIMES_CONSUMED">

-      <ProtocolCName>Hii</ProtocolCName>

+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="SOMETIMES_CONSUMED">

-      <ProtocolCName>DataHub</ProtocolCName>

+      <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>

     </Protocol>

     <ProtocolNotify Usage="SOMETIMES_CONSUMED">

-      <ProtocolNotifyCName>WinNtIo</ProtocolNotifyCName>

+      <ProtocolNotifyCName>gEfiWinNtIoProtocolGuid</ProtocolNotifyCName>

     </ProtocolNotify>

   </Protocols>

   <DataHubs>

@@ -94,16 +94,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </DataHubs>

   <Guids>

     <GuidCNames Usage="SOMETIMES_CONSUMED">

-      <GuidCName>ProcessorProducer</GuidCName>

+      <GuidCName>gEfiProcessorProducerGuid</GuidCName>

     </GuidCNames>

     <GuidCNames Usage="SOMETIMES_CONSUMED">

-      <GuidCName>ProcessorSubClass</GuidCName>

+      <GuidCName>gEfiProcessorSubClassGuid</GuidCName>

     </GuidCNames>

     <GuidCNames Usage="SOMETIMES_CONSUMED">

-      <GuidCName>WinNtCPUModel</GuidCName>

+      <GuidCName>gEfiWinNtCPUModelGuid</GuidCName>

     </GuidCNames>

     <GuidCNames Usage="SOMETIMES_CONSUMED">

-      <GuidCName>WinNtCPUSpeed</GuidCName>

+      <GuidCName>gEfiWinNtCPUSpeedGuid</GuidCName>

     </GuidCNames>

   </Guids>

   <Externs>