diff --git a/IntelFrameworkModulePkg/Include/Protocol/DiskInfo.h b/IntelFrameworkModulePkg/Include/Protocol/DiskInfo.h deleted file mode 100644 index b6695e1655..0000000000 --- a/IntelFrameworkModulePkg/Include/Protocol/DiskInfo.h +++ /dev/null @@ -1,160 +0,0 @@ -/** @file - Disk Info protocol Provides the basic interfaces to abstract - platform information regarding an IDE controller. - -Copyright (c) 2006 - 2009, 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. - -**/ - -#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; - -/** - This function is used by the IDE bus driver to get inquiry data. - Data format of Identify data is defined by the Interface GUID. - - @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. - @param InquiryData Pointer to a buffer for the inquiry data. - @param InquiryDataSize Pointer to the value for the inquiry data size. - - @retval EFI_SUCCESS The command was accepted without any errors. - @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 InquiryDataSize 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 - ); - - -/** - This function is used by the IDE bus driver to get identify data. - Data format of Identify data is defined by the Interface GUID. - - @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. - @param IdentifyData Pointer to a buffer for the identify data. - @param IdentifyDataSize Pointer to the value for the identify data size. - - @retval EFI_SUCCESS The command was accepted without any errors. - @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 - ); - - -/** - This function is used by the IDE bus driver to get sense data. - Data format of Sense data is defined by the Interface GUID. - - @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. - @param SenseData Pointer to the SenseData. - @param SenseDataSize Size of SenseData in bytes. - @param SenseDataNumber Pointer to the value for the identify data size. - - @retval EFI_SUCCESS The command was accepted without any errors. - @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 - ); - -/** - This function is used by the IDE bus driver to get controller information. - - @param This Pointer to the EFI_DISK_INFO_PROTOCOL instance. - @param IdeChannel Pointer to the Ide Channel number. Primary or secondary. - @param IdeDevice Pointer to the Ide Device number. 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 - ); - -// -// GUID of the type of interfaces -// -#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 { - /// - /// A GUID that defines the format of buffers for the other member functions of this protocol. - /// - EFI_GUID Interface; - 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 - - diff --git a/IntelFrameworkModulePkg/Include/Protocol/PciHotPlugRequest.h b/IntelFrameworkModulePkg/Include/Protocol/PciHotPlugRequest.h deleted file mode 100644 index 52eacaa45d..0000000000 --- a/IntelFrameworkModulePkg/Include/Protocol/PciHotPlugRequest.h +++ /dev/null @@ -1,86 +0,0 @@ -/** @file - Provides services to notify the PCI bus driver that some events have happened in a hot-plug controller - (such as a PC Card socket, or PHPC), and to ask the PCI bus driver to create or destroy handles for - PCI-like devices. - -Copyright (c) 2006 - 2009, 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. - -**/ - -#ifndef __PCI_HOTPLUG_REQUEST_H_ -#define __PCI_HOTPLUG_REQUEST_H_ - -#define EFI_PCI_HOTPLUG_REQUEST_PROTOCOL_GUID \ - { \ - 0x19cb87ab, 0x2cb9, 0x4665, {0x83, 0x60, 0xdd, 0xcf, 0x60, 0x54, 0xf7, 0x9d} \ - } - -typedef enum { - /// - /// The PCI bus driver is requested to create handles for the specified devices. An array of - /// EFI_HANDLE is returned, with a NULL element marking the end of the array. - /// - EfiPciHotPlugRequestAdd, - - /// - /// The PCI bus driver is requested to destroy handles for the specified devices. - /// - EfiPciHotplugRequestRemove -} EFI_PCI_HOTPLUG_OPERATION; - -typedef struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL EFI_PCI_HOTPLUG_REQUEST_PROTOCOL; - -/** - This function allows the PCI bus driver to be notified to act as requested when a hot-plug event has happened on the hot-plug controller. Currently, the operations include add operation and remove operation. - @param This A pointer to the hot plug request protocol. - @param Operation The operation the PCI bus driver is requested to make. - @param Controller The handle of the hot-plug controller. - @param RemainingDevicePath The remaining device path for the PCI-like hot-plug device. - @param NumberOfChildren The number of child handles. For an add operation, it is an output parameter. - For a remove operation, it's an input parameter. When it contains a non-zero - value, children handles specified in ChildHandleBuffer are destroyed. Otherwise, - PCI bus driver is notified to stop managing the controller handle. - @param ChildHandleBuffer The buffer which contains the child handles. For an add operation, it is an output - parameter and contains all newly created child handles. For a remove operation, it - contains child handles to be destroyed when NumberOfChildren contains a non- - zero value. It can be NULL when NumberOfChildren is 0. It's the caller's - responsibility to allocate and free memory for this buffer. - - @retval EFI_SUCCESS The handles for the specified device have been created or destroyed - as requested, and for an add operation, the new handles are - returned in ChildHandleBuffer. - @retval EFI_INVALID_PARAMETER Operation is not a legal value. - @retval EFI_INVALID_PARAMETER Controller is NULL or not a valid handle. - @retval EFI_INVALID_PARAMETER NumberOfChildren is NULL. - @retval EFI_INVALID_PARAMETER ChildHandleBuffer is NULL while Operation is remove and - NumberOfChildren contains a non-zero value. - @retval EFI_INVALID_PARAMETER ChildHandleBuffer is NULL while Operation is add. - @retval EFI_OUT_OF_RESOURCES There are no enough resources to start the devices. -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_PCI_HOTPLUG_REQUEST_NOTIFY) ( - IN EFI_PCI_HOTPLUG_REQUEST_PROTOCOL *This, - IN EFI_PCI_HOTPLUG_OPERATION Operation, - IN EFI_HANDLE Controller, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL, - IN OUT UINT8 *NumberOfChildren, - IN OUT EFI_HANDLE *ChildHandleBuffer -); - - - -struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL { - EFI_PCI_HOTPLUG_REQUEST_NOTIFY Notify; -}; - -extern EFI_GUID gEfiPciHotPlugRequestProtocolGuid; - -#endif diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec index 775b651043..8a3b60e152 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec @@ -20,10 +20,10 @@ PACKAGE_GUID = 88894582-7553-4822-B484-624E24B6DECF PACKAGE_VERSION = 0.1 -[Includes.common] +[Includes] Include # Root include for the package -[LibraryClasses.common] +[LibraryClasses] ## @libraryclass OEM status code libary is used to report status code to OEM device. OemHookStatusCodeLib|Include/Library/OemHookStatusCodeLib.h @@ -33,7 +33,7 @@ ## @libraryclass Generic BDS library definition, include the data structure and function. GenericBdsLib|Include/Library/GenericBdsLib.h -[Guids.common] +[Guids] ## IntelFrameworkModule package token space guid ## Include/Guid/IntelFrameworkModulePkgTokenSpace.h gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }} @@ -58,27 +58,7 @@ ## Include/Guid/StatusCodeDataTypeDebug.h gEfiStatusCodeDataTypeDebugGuid = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }} - ## 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] - ## This protocol is used to add or remove all PCI child devices on the PCI root bridge. - ## Include/Protocol/PciHotPlugRequest.h - gEfiPciHotPlugRequestProtocolGuid = { 0x19CB87AB, 0x2CB9, 0x4665, { 0x83, 0x60, 0xDD, 0xCF, 0x60, 0x54, 0xF7, 0x9D }} - +[Protocols] ## Vga Mini port binding for a VGA controller ## Include/Protocol/VgaMiniPort.h gEfiVgaMiniPortProtocolGuid = { 0xc7735a2f, 0x88f5, 0x4882, { 0xae, 0x63, 0xfa, 0xac, 0x8c, 0x8b, 0x86, 0xb3 }} @@ -95,10 +75,6 @@ ## Include/Protocol/Ps2Policy.h 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 }} - ## OEM Badging Protocol defines the interface to get the OEM badging image with the dispaly attribute. ## Include/Protocol/OEMBadging.h gEfiOEMBadgingProtocolGuid = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}