Move FileInfo.h, FileSystemInfo.h, FileSystemVolumeLabelInfo.h from protocol director...

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

diff --git a/MdePkg/Include/Guid/FileInfo.h b/MdePkg/Include/Guid/FileInfo.h
new file mode 100644 (file)
index 0000000..55cf6ae
--- /dev/null
+++ b/MdePkg/Include/Guid/FileInfo.h
@@ -0,0 +1,53 @@
+/** @file\r
+  SimpleFileSystem protocol as defined in the EFI 1.0 specification.\r
+\r
+  The SimpleFileSystem protocol is the programatic access to the FAT (12,16,32) \r
+  file system specified in EFI 1.0. It can also be used to abstract any \r
+  file system other than FAT.\r
+\r
+  EFI 1.0 can boot from any valid EFI image contained in a SimpleFileSystem\r
+\r
+  Copyright (c) 2006, 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
+\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
+  Module Name:  FileInfo.c\r
+\r
+**/\r
+\r
+#ifndef __FILE_INFO_H__\r
+#define __FILE_INFO_H__\r
+\r
+#define EFI_FILE_INFO_ID \\r
+  { \\r
+    0x9576e92, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
+  }\r
+\r
+typedef struct {\r
+  UINT64    Size;\r
+  UINT64    FileSize;\r
+  UINT64    PhysicalSize;\r
+  EFI_TIME  CreateTime;\r
+  EFI_TIME  LastAccessTime;\r
+  EFI_TIME  ModificationTime;\r
+  UINT64    Attribute;\r
+  CHAR16    FileName[1];\r
+} EFI_FILE_INFO;\r
+\r
+//\r
+// The FileName field of the EFI_FILE_INFO data structure is variable length.\r
+// Whenever code needs to know the size of the EFI_FILE_INFO data structure, it needs to\r
+// be the size of the data structure without the FileName field.  The following macro\r
+// computes this size correctly no matter how big the FileName array is declared.\r
+// This is required to make the EFI_FILE_INFO data structure ANSI compilant.\r
+//\r
+#define SIZE_OF_EFI_FILE_INFO EFI_FIELD_OFFSET (EFI_FILE_INFO, FileName)\r
+\r
+extern EFI_GUID gEfiFileInfoGuid;\r
+\r
+#endif\r

diff --git a/MdePkg/Include/Guid/FileSystemInfo.h b/MdePkg/Include/Guid/FileSystemInfo.h
new file mode 100644 (file)
index 0000000..f6e7488
--- /dev/null
+++ b/MdePkg/Include/Guid/FileSystemInfo.h
@@ -0,0 +1,45 @@
+/** @file\r
+  FileSystemInfo protocol as defined in the EFI 1.0 specification.\r
+\r
+  Copyright (c) 2006, 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
+\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
+  Module Name:  FileSystemInfo.h\r
+\r
+**/\r
+\r
+#ifndef __FILE_SYSTEM_INFO_H__\r
+#define __FILE_SYSTEM_INFO_H__\r
+\r
+#define EFI_FILE_SYSTEM_INFO_ID_GUID \\r
+  { \\r
+    0x9576e93, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
+  }\r
+\r
+typedef struct {\r
+  UINT64  Size;\r
+  BOOLEAN ReadOnly;\r
+  UINT64  VolumeSize;\r
+  UINT64  FreeSpace;\r
+  UINT32  BlockSize;\r
+  CHAR16  VolumeLabel[1];\r
+} EFI_FILE_SYSTEM_INFO;\r
+\r
+//\r
+// The VolumeLabel field of the EFI_FILE_SYSTEM_INFO data structure is variable length.\r
+// Whenever code needs to know the size of the EFI_FILE_SYSTEM_INFO data structure, it needs\r
+// to be the size of the data structure without the VolumeLable field.  The following macro\r
+// computes this size correctly no matter how big the VolumeLable array is declared.\r
+// This is required to make the EFI_FILE_SYSTEM_INFO data structure ANSI compilant.\r
+//\r
+#define SIZE_OF_EFI_FILE_SYSTEM_INFO  EFI_FIELD_OFFSET (EFI_FILE_SYSTEM_INFO, VolumeLabel)\r
+\r
+extern EFI_GUID gEfiFileSystemInfoGuid;\r
+\r
+#endif\r

diff --git a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
new file mode 100644 (file)
index 0000000..baba276
--- /dev/null
+++ b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
@@ -0,0 +1,42 @@
+/** @file\r
+  FileSystemVolumeLabelInfo protocol as defined in the EFI 1.0 specification.\r
+\r
+  Copyright (c) 2006, 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
+\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
+  Module Name:  FileSystemVolumeLabelInfo.h\r
+\r
+**/\r
+\r
+#ifndef __FILE_SYSTEM_VOLUME_LABEL_INFO_H__\r
+#define __FILE_SYSTEM_VOLUME_LABEL_INFO_H__\r
+\r
+#define EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID \\r
+  { \\r
+    0xDB47D7D3, 0xFE81, 0x11d3, {0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D } \\r
+  }\r
+\r
+//\r
+// Protocol Name defined in spec.\r
+//\r
+#define EFI_FILE_SYSTEM_VOLUME_LABEL_ID \\r
+        EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID\r
+\r
+typedef struct {\r
+  CHAR16  VolumeLabel[1];\r
+} EFI_FILE_SYSTEM_VOLUME_LABEL_INFO;\r
+\r
+typedef EFI_FILE_SYSTEM_VOLUME_LABEL_INFO EFI_FILE_SYSTEM_VOLUME_LABEL;\r
+\r
+#define SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO \\r
+        EFI_FIELD_OFFSET (EFI_FILE_SYSTEM_VOLUME_LABEL_INFO, VolumeLabel)\r
+\r
+extern EFI_GUID gEfiFileSystemVolumeLabelInfoIdGuid;\r
+\r
+#endif\r

diff --git a/MdePkg/Include/Protocol/FileInfo.h b/MdePkg/Include/Protocol/FileInfo.h
deleted file mode 100644 (file)
index 55cf6ae..0000000
--- a/MdePkg/Include/Protocol/FileInfo.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file\r
-  SimpleFileSystem protocol as defined in the EFI 1.0 specification.\r
-\r
-  The SimpleFileSystem protocol is the programatic access to the FAT (12,16,32) \r
-  file system specified in EFI 1.0. It can also be used to abstract any \r
-  file system other than FAT.\r
-\r
-  EFI 1.0 can boot from any valid EFI image contained in a SimpleFileSystem\r
-\r
-  Copyright (c) 2006, 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
-\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
-  Module Name:  FileInfo.c\r
-\r
-**/\r
-\r
-#ifndef __FILE_INFO_H__\r
-#define __FILE_INFO_H__\r
-\r
-#define EFI_FILE_INFO_ID \\r
-  { \\r
-    0x9576e92, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
-  }\r
-\r
-typedef struct {\r
-  UINT64    Size;\r
-  UINT64    FileSize;\r
-  UINT64    PhysicalSize;\r
-  EFI_TIME  CreateTime;\r
-  EFI_TIME  LastAccessTime;\r
-  EFI_TIME  ModificationTime;\r
-  UINT64    Attribute;\r
-  CHAR16    FileName[1];\r
-} EFI_FILE_INFO;\r
-\r
-//\r
-// The FileName field of the EFI_FILE_INFO data structure is variable length.\r
-// Whenever code needs to know the size of the EFI_FILE_INFO data structure, it needs to\r
-// be the size of the data structure without the FileName field.  The following macro\r
-// computes this size correctly no matter how big the FileName array is declared.\r
-// This is required to make the EFI_FILE_INFO data structure ANSI compilant.\r
-//\r
-#define SIZE_OF_EFI_FILE_INFO EFI_FIELD_OFFSET (EFI_FILE_INFO, FileName)\r
-\r
-extern EFI_GUID gEfiFileInfoGuid;\r
-\r
-#endif\r

diff --git a/MdePkg/Include/Protocol/FileSystemInfo.h b/MdePkg/Include/Protocol/FileSystemInfo.h
deleted file mode 100644 (file)
index f6e7488..0000000
--- a/MdePkg/Include/Protocol/FileSystemInfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/** @file\r
-  FileSystemInfo protocol as defined in the EFI 1.0 specification.\r
-\r
-  Copyright (c) 2006, 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
-\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
-  Module Name:  FileSystemInfo.h\r
-\r
-**/\r
-\r
-#ifndef __FILE_SYSTEM_INFO_H__\r
-#define __FILE_SYSTEM_INFO_H__\r
-\r
-#define EFI_FILE_SYSTEM_INFO_ID_GUID \\r
-  { \\r
-    0x9576e93, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r
-  }\r
-\r
-typedef struct {\r
-  UINT64  Size;\r
-  BOOLEAN ReadOnly;\r
-  UINT64  VolumeSize;\r
-  UINT64  FreeSpace;\r
-  UINT32  BlockSize;\r
-  CHAR16  VolumeLabel[1];\r
-} EFI_FILE_SYSTEM_INFO;\r
-\r
-//\r
-// The VolumeLabel field of the EFI_FILE_SYSTEM_INFO data structure is variable length.\r
-// Whenever code needs to know the size of the EFI_FILE_SYSTEM_INFO data structure, it needs\r
-// to be the size of the data structure without the VolumeLable field.  The following macro\r
-// computes this size correctly no matter how big the VolumeLable array is declared.\r
-// This is required to make the EFI_FILE_SYSTEM_INFO data structure ANSI compilant.\r
-//\r
-#define SIZE_OF_EFI_FILE_SYSTEM_INFO  EFI_FIELD_OFFSET (EFI_FILE_SYSTEM_INFO, VolumeLabel)\r
-\r
-extern EFI_GUID gEfiFileSystemInfoGuid;\r
-\r
-#endif\r

diff --git a/MdePkg/Include/Protocol/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Protocol/FileSystemVolumeLabelInfo.h
deleted file mode 100644 (file)
index baba276..0000000
--- a/MdePkg/Include/Protocol/FileSystemVolumeLabelInfo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/** @file\r
-  FileSystemVolumeLabelInfo protocol as defined in the EFI 1.0 specification.\r
-\r
-  Copyright (c) 2006, 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
-\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
-  Module Name:  FileSystemVolumeLabelInfo.h\r
-\r
-**/\r
-\r
-#ifndef __FILE_SYSTEM_VOLUME_LABEL_INFO_H__\r
-#define __FILE_SYSTEM_VOLUME_LABEL_INFO_H__\r
-\r
-#define EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID \\r
-  { \\r
-    0xDB47D7D3, 0xFE81, 0x11d3, {0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D } \\r
-  }\r
-\r
-//\r
-// Protocol Name defined in spec.\r
-//\r
-#define EFI_FILE_SYSTEM_VOLUME_LABEL_ID \\r
-        EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID\r
-\r
-typedef struct {\r
-  CHAR16  VolumeLabel[1];\r
-} EFI_FILE_SYSTEM_VOLUME_LABEL_INFO;\r
-\r
-typedef EFI_FILE_SYSTEM_VOLUME_LABEL_INFO EFI_FILE_SYSTEM_VOLUME_LABEL;\r
-\r
-#define SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO \\r
-        EFI_FIELD_OFFSET (EFI_FILE_SYSTEM_VOLUME_LABEL_INFO, VolumeLabel)\r
-\r
-extern EFI_GUID gEfiFileSystemVolumeLabelInfoIdGuid;\r
-\r
-#endif\r

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 1f2862776ce6d090204ae612c66ca430e4875703..53d601bbf0041eb15507b6184c0ca17052832987 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -2375,9 +2375,6 @@ typedef enum {
 #include <Protocol/DriverDiagnostics.h>\r
 #include <Protocol/Ebc.h>\r
 #include <Protocol/EfiNetworkInterfaceIdentifier.h>\r
-#include <Protocol/FileInfo.h>\r
-#include <Protocol/FileSystemInfo.h>\r
-#include <Protocol/FileSystemVolumeLabelInfo.h>\r
 #include <Protocol/PciIo.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 #include <Protocol/PlatformDriverOverride.h>\r
@@ -2397,7 +2394,9 @@ typedef enum {
 #include <Guid/PcAnsi.h>\r
 #include <Guid/SmBios.h>\r
 #include <Guid/SalSystemTable.h>\r
-\r
+#include <Guid/FileInfo.h>\r
+#include <Guid/FileSystemInfo.h>\r
+#include <Guid/FileSystemVolumeLabelInfo.h>\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 //\r

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 81af159af75ca6dfc940b5434540b0c73193c6ea..774fbf0b0cec1c257100d5236ce55184856df4b0 100644 (file)
--- 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>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FileInfo">\r
+      <IncludeHeader>Include/Guid/FileInfo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FileSystemInfo">\r
+      <IncludeHeader>Include/Guid/FileSystemInfo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
+    <IndustryStdHeader Name="FileSystemVolumeLabelInfo">\r
+      <IncludeHeader>Include/Guid/FileSystemVolumeLabelInfo.h</IncludeHeader>\r
+      <HelpText/>\r
+    </IndustryStdHeader>\r
     <IndustryStdHeader Name="FrameworkDevicePath">\r
       <IncludeHeader>Include/Guid/FrameworkDevicePath.h</IncludeHeader>\r
       <HelpText/>\r
@@ -810,18 +822,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <IncludeHeader>Include/Protocol/EfiNetworkInterfaceIdentifier.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
-    <IndustryStdHeader Name="FileInfo">\r
-      <IncludeHeader>Include/Protocol/FileInfo.h</IncludeHeader>\r
-      <HelpText/>\r
-    </IndustryStdHeader>\r
-    <IndustryStdHeader Name="FileSystemInfo">\r
-      <IncludeHeader>Include/Protocol/FileSystemInfo.h</IncludeHeader>\r
-      <HelpText/>\r
-    </IndustryStdHeader>\r
-    <IndustryStdHeader Name="FileSystemVolumeLabelInfo">\r
-      <IncludeHeader>Include/Protocol/FileSystemVolumeLabelInfo.h</IncludeHeader>\r
-      <HelpText/>\r
-    </IndustryStdHeader>\r
     <IndustryStdHeader Name="FirmwareVolume">\r
       <IncludeHeader>Include/Protocol/FirmwareVolume.h</IncludeHeader>\r
       <HelpText/>\r