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

IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf

@@ -1,5 +1,5 @@
 #/** @file
-# Component description file for PS2 keyboard module.
+# Component description file for IdeBus module.
 #
 # IDE bus driver. This driver will enumerate IDE device and export the blockIo
 #  protocol for every device.
@@ -55,7 +55,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
-  
+  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec  
 
 
 [LibraryClasses]

IntelFrameworkModulePkg/Include/Protocol/DiskInfo.h

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

IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

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