Move DiskInfo Protocol from MdeModulePkg to IntelFrameworkModule package.

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
index b91fc59fbe7926bc03f30cf7cb112e1de5971d99..47f47b5bd4773f71dbc6379a8462a3eb97e81faf 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
@@ -1,5 +1,5 @@
 #/** @file\r
-# Component description file for PS2 keyboard module.\r
+# Component description file for IdeBus module.\r
 #\r
 # IDE bus driver. This driver will enumerate IDE device and export the blockIo\r
 #  protocol for every device.\r
@@ -55,7 +55,7 @@
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  \r
+  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec  \r
 \r
 \r
 [LibraryClasses]\r

diff --git a/IntelFrameworkModulePkg/Include/Protocol/DiskInfo.h b/IntelFrameworkModulePkg/Include/Protocol/DiskInfo.h
new file mode 100644 (file)
index 0000000..8409d98
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Protocol/DiskInfo.h
@@ -0,0 +1,158 @@
+/** @file\r
+  Disk Info protocol is used to export Inquiry Data for a drive.\r
+  It supports low level formating of drives in a DOS compatible manner.\r
+\r
+Copyright (c) 2006 - 2008, Intel Corporation. <BR>\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
+**/\r
+\r
+#ifndef __DISK_INFO_H__\r
+#define __DISK_INFO_H__\r
+\r
+#define EFI_DISK_INFO_PROTOCOL_GUID \\r
+  { \\r
+    0xd432a67f, 0x14dc, 0x484b, {0xb3, 0xbb, 0x3f, 0x2, 0x91, 0x84, 0x93, 0x27 } \\r
+  }\r
+\r
+//\r
+// Forward reference for pure ANSI compatability\r
+//\r
+typedef struct _EFI_DISK_INFO_PROTOCOL  EFI_DISK_INFO_PROTOCOL;\r
+\r
+/**\r
+  Return the results of the Inquiry command to a drive in InquiryData.\r
+  Data format of Inquiry data is defined by the Interface GUID.\r
+\r
+  @param  This                  Protocol instance pointer. \r
+  @param  InquiryData           Results of Inquiry command to device \r
+  @param  InquiryDataSize       Size of InquiryData in bytes. \r
+\r
+  @retval EFI_SUCCESS           InquiryData valid \r
+  @retval EFI_NOT_FOUND         Device does not support this data class \r
+  @retval EFI_DEVICE_ERROR      Error reading InquiryData from device \r
+  @retval EFI_BUFFER_TOO_SMALL  IntquiryDataSize not big enough \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_DISK_INFO_INQUIRY)(\r
+  IN EFI_DISK_INFO_PROTOCOL           * This,\r
+  IN OUT VOID                         *InquiryData,\r
+  IN OUT UINT32                       *InquiryDataSize\r
+  );\r
+\r
+\r
+/**\r
+  Return the results of the Identify command to a drive in IdentifyData.\r
+  Data format of Identify data is defined by the Interface GUID.\r
+\r
+  @param  This                  Protocol instance pointer. \r
+  @param  IdentifyData          Results of Identify command to device \r
+  @param  IdentifyDataSize      Size of IdentifyData in bytes. \r
+\r
+  @retval EFI_SUCCESS           IdentifyData valid \r
+  @retval EFI_NOT_FOUND         Device does not support this data class \r
+  @retval EFI_DEVICE_ERROR      Error reading IdentifyData from device \r
+  @retval EFI_BUFFER_TOO_SMALL  IdentifyDataSize not big enough \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_DISK_INFO_IDENTIFY)(\r
+  IN EFI_DISK_INFO_PROTOCOL           * This,\r
+  IN OUT VOID                         *IdentifyData,\r
+  IN OUT UINT32                       *IdentifyDataSize\r
+  );\r
+\r
+\r
+/**\r
+  Return the results of the Request Sense command to a drive in SenseData.\r
+  Data format of Sense data is defined by the Interface GUID.\r
+\r
+  @param  This                  Protocol instance pointer. \r
+  @param  SenseData             Results of Request Sense command to device \r
+  @param  SenseDataSize         Size of SenseData in bytes. \r
+  @param  SenseDataNumber       Type of SenseData \r
+\r
+  @retval EFI_SUCCESS           InquiryData valid \r
+  @retval EFI_NOT_FOUND         Device does not support this data class \r
+  @retval EFI_DEVICE_ERROR      Error reading InquiryData from device \r
+  @retval EFI_BUFFER_TOO_SMALL  SenseDataSize not big enough \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_DISK_INFO_SENSE_DATA)(\r
+  IN EFI_DISK_INFO_PROTOCOL           * This,\r
+  IN OUT VOID                         *SenseData,\r
+  IN OUT UINT32                       *SenseDataSize,\r
+  OUT UINT8                           *SenseDataNumber\r
+  );\r
+\r
+/**\r
+  Return the IDE device information.\r
+\r
+  @param  This                  Protocol instance pointer. \r
+  @param  IdeChannel            Primary or Secondary \r
+  @param  IdeDevice             Master or Slave \r
+\r
+  @retval EFI_SUCCESS           IdeChannel and IdeDevice are valid \r
+  @retval EFI_UNSUPPORTED       This is not an IDE device \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EFI_DISK_INFO_WHICH_IDE)(\r
+  IN EFI_DISK_INFO_PROTOCOL           * This,\r
+  OUT UINT32                          *IdeChannel,\r
+  OUT UINT32                          *IdeDevice\r
+  );\r
+\r
+//\r
+// GUIDs for EFI_DISK_INFO_PROTOCOL.Interface. Defines the format of the\r
+// buffers returned by member functions.\r
+//\r
+#define EFI_DISK_INFO_IDE_INTERFACE_GUID \\r
+  { \\r
+    0x5e948fe3, 0x26d3, 0x42b5, {0xaf, 0x17, 0x61, 0x2, 0x87, 0x18, 0x8d, 0xec } \\r
+  }\r
+extern EFI_GUID gEfiDiskInfoIdeInterfaceGuid;\r
+\r
+#define EFI_DISK_INFO_SCSI_INTERFACE_GUID \\r
+  { \\r
+    0x8f74baa, 0xea36, 0x41d9, {0x95, 0x21, 0x21, 0xa7, 0xf, 0x87, 0x80, 0xbc } \\r
+  }\r
+extern EFI_GUID gEfiDiskInfoScsiInterfaceGuid;\r
+\r
+#define EFI_DISK_INFO_USB_INTERFACE_GUID \\r
+  { \\r
+    0xcb871572, 0xc11a, 0x47b5, {0xb4, 0x92, 0x67, 0x5e, 0xaf, 0xa7, 0x77, 0x27 } \\r
+  }\r
+extern EFI_GUID gEfiDiskInfoUsbInterfaceGuid;\r
+\r
+#define EFI_DISK_INFO_AHCI_INTERFACE_GUID \\r
+  { \\r
+    0x9e498932, 0x4abc, 0x45af, {0xa3, 0x4d, 0x2, 0x47, 0x78, 0x7b, 0xe7, 0xc6} \\r
+  }\r
+extern EFI_GUID gEfiDiskInfoAhciInterfaceGuid;\r
+\r
+struct _EFI_DISK_INFO_PROTOCOL {\r
+  EFI_GUID                  Interface;  ///> The format of the buffers returned by member functions.\r
+  EFI_DISK_INFO_INQUIRY     Inquiry;\r
+  EFI_DISK_INFO_IDENTIFY    Identify;\r
+  EFI_DISK_INFO_SENSE_DATA  SenseData;\r
+  EFI_DISK_INFO_WHICH_IDE   WhichIde;\r
+};\r
+\r
+extern EFI_GUID gEfiDiskInfoProtocolGuid;\r
+\r
+#endif\r
+\r
+\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 0b83cf2711ec3503576abe5580f666d613a03c11..3da24231304614c20728ffc1647185903d8db5e4 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -36,6 +36,22 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}\r
   gTianoCustomDecompressGuid     = { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }}\r
 \r
+  ## Guid for EFI_DISK_INFO_PROTOCOL.Interface to specify Usb interface.\r
+  ## Include/Protocol/DiskInfo.h\r
+  gEfiDiskInfoUsbInterfaceGuid   = { 0xCB871572, 0xC11A, 0x47B5, { 0xB4, 0x92, 0x67, 0x5E, 0xAF, 0xA7, 0x77, 0x27 }}\r
+  \r
+  ## Guid for EFI_DISK_INFO_PROTOCOL.Interface to specify Scsi interface.\r
+  ## Include/Protocol/DiskInfo.h\r
+  gEfiDiskInfoScsiInterfaceGuid  = { 0x08F74BAA, 0xEA36, 0x41D9, { 0x95, 0x21, 0x21, 0xA7, 0x0F, 0x87, 0x80, 0xBC }}\r
+  \r
+  ## Guid for EFI_DISK_INFO_PROTOCOL.Interface to specify Ide interface.\r
+  ## Include/Protocol/DiskInfo.h\r
+  gEfiDiskInfoIdeInterfaceGuid   = { 0x5E948FE3, 0x26D3, 0x42B5, { 0xAF, 0x17, 0x61, 0x02, 0x87, 0x18, 0x8D, 0xEC }}\r
+  \r
+  ## Guid for EFI_DISK_INFO_PROTOCOL.Interface to specify Ahci interface.\r
+  ## Include/Protocol/DiskInfo.h\r
+  gEfiDiskInfoAhciInterfaceGuid  = { 0x9e498932, 0x4abc, 0x45af, { 0xa3, 0x4d, 0x02, 0x47, 0x78, 0x7b, 0xe7, 0xc6 }}\r
+\r
 [Protocols.common]\r
   gEfiPciHotPlugRequestProtocolGuid = { 0x19CB87AB, 0x2CB9, 0x4665, { 0x83, 0x60, 0xDD, 0xCF, 0x60, 0x54, 0xF7, 0x9D }}\r
   gEfiVgaMiniPortProtocolGuid    = { 0xc7735a2f, 0x88f5, 0x4882, { 0xae, 0x63, 0xfa, 0xac, 0x8c, 0x8b, 0x86, 0xb3 }}\r
@@ -43,6 +59,10 @@
   gEfiIsaAcpiProtocolGuid        = { 0x64a892dc, 0x5561, 0x4536, { 0x92, 0xc7, 0x79, 0x9b, 0xfc, 0x18, 0x33, 0x55 }}\r
   gEfiPs2PolicyProtocolGuid      = { 0x4DF19259, 0xDC71, 0x4D46, { 0xBE, 0xF1, 0x35, 0x7B, 0xB5, 0x78, 0xC4, 0x18 }}\r
 \r
+  ## Disk Info protocol is used to export Inquiry Data for a drive.\r
+  ## Include/Protocol/DiskInfo.h\r
+  gEfiDiskInfoProtocolGuid       = { 0xD432A67F, 0x14DC, 0x484B, { 0xB3, 0xBB, 0x3F, 0x02, 0x91, 0x84, 0x93, 0x27 }}\r
+\r
 [PcdsDynamic.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|UINT16|0x00010025\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128|UINT16|0x0001002e\r