Move FileInfo.h, FileSystemInfo.h, FileSystemVolumeLabelInfo.h from protocol directory to guid directory, because these three files define the related GUID not protcol.

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

5 files changed, 15 insertions, 16 deletions

diff --git a/MdePkg/Include/Protocol/FileInfo.h b/MdePkg/Include/Guid/FileInfo.h
index 55cf6ae38e..55cf6ae38e 100644
--- a/MdePkg/Include/Protocol/FileInfo.h
+++ b/MdePkg/Include/Guid/FileInfo.h
diff --git a/MdePkg/Include/Protocol/FileSystemInfo.h b/MdePkg/Include/Guid/FileSystemInfo.h
index f6e7488a08..f6e7488a08 100644
--- a/MdePkg/Include/Protocol/FileSystemInfo.h
+++ b/MdePkg/Include/Guid/FileSystemInfo.h
diff --git a/MdePkg/Include/Protocol/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
index baba2764db..baba2764db 100644
--- a/MdePkg/Include/Protocol/FileSystemVolumeLabelInfo.h
+++ b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 1f2862776c..53d601bbf0 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -2375,9 +2375,6 @@ typedef enum {
 #include <Protocol/DriverDiagnostics.h>

 #include <Protocol/Ebc.h>

 #include <Protocol/EfiNetworkInterfaceIdentifier.h>

-#include <Protocol/FileInfo.h>

-#include <Protocol/FileSystemInfo.h>

-#include <Protocol/FileSystemVolumeLabelInfo.h>

 #include <Protocol/PciIo.h>

 #include <Protocol/PciRootBridgeIo.h>

 #include <Protocol/PlatformDriverOverride.h>

@@ -2397,7 +2394,9 @@ typedef enum {
 #include <Guid/PcAnsi.h>

 #include <Guid/SmBios.h>

 #include <Guid/SalSystemTable.h>

-

+#include <Guid/FileInfo.h>

+#include <Guid/FileSystemInfo.h>

+#include <Guid/FileSystemVolumeLabelInfo.h>

 

 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)

 //

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 81af159af7..774fbf0b0c 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -366,6 +366,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <IncludeHeader>Include/Guid/FirmwareFileSystem.h</IncludeHeader>

       <HelpText/>

     </IndustryStdHeader>

+    <IndustryStdHeader Name="FileInfo">

+      <IncludeHeader>Include/Guid/FileInfo.h</IncludeHeader>

+      <HelpText/>

+    </IndustryStdHeader>

+    <IndustryStdHeader Name="FileSystemInfo">

+      <IncludeHeader>Include/Guid/FileSystemInfo.h</IncludeHeader>

+      <HelpText/>

+    </IndustryStdHeader>

+    <IndustryStdHeader Name="FileSystemVolumeLabelInfo">

+      <IncludeHeader>Include/Guid/FileSystemVolumeLabelInfo.h</IncludeHeader>

+      <HelpText/>

+    </IndustryStdHeader>

     <IndustryStdHeader Name="FrameworkDevicePath">

       <IncludeHeader>Include/Guid/FrameworkDevicePath.h</IncludeHeader>

       <HelpText/>

@@ -810,18 +822,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <IncludeHeader>Include/Protocol/EfiNetworkInterfaceIdentifier.h</IncludeHeader>

       <HelpText/>

     </IndustryStdHeader>

-    <IndustryStdHeader Name="FileInfo">

-      <IncludeHeader>Include/Protocol/FileInfo.h</IncludeHeader>

-      <HelpText/>

-    </IndustryStdHeader>

-    <IndustryStdHeader Name="FileSystemInfo">

-      <IncludeHeader>Include/Protocol/FileSystemInfo.h</IncludeHeader>

-      <HelpText/>

-    </IndustryStdHeader>

-    <IndustryStdHeader Name="FileSystemVolumeLabelInfo">

-      <IncludeHeader>Include/Protocol/FileSystemVolumeLabelInfo.h</IncludeHeader>

-      <HelpText/>

-    </IndustryStdHeader>

     <IndustryStdHeader Name="FirmwareVolume">

       <IncludeHeader>Include/Protocol/FirmwareVolume.h</IncludeHeader>

       <HelpText/>