NULL\r
};\r
\r
-\r
-//\r
-// The ScsiBusProtocol is just used to locate ScsiBusDev\r
-// structure in the SCSIBusDriverBindingStop(). Then we can\r
-// Close all opened protocols and release this structure.\r
-//\r
-EFI_GUID mScsiBusProtocolGuid = EFI_SCSI_BUS_PROTOCOL_GUID;\r
-\r
VOID *mWorkingBuffer;\r
\r
/**\r
// \r
Status = gBS->InstallProtocolInterface (\r
&Controller,\r
- &mScsiBusProtocolGuid,\r
+ &gEfiCallerIdGuid,\r
EFI_NATIVE_INTERFACE,\r
&ScsiBusDev->BusIdentify\r
);\r
//\r
Status = gBS->OpenProtocol (\r
Controller,\r
- &mScsiBusProtocolGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &BusIdentify,\r
This->DriverBindingHandle,\r
Controller,\r
//\r
Status = gBS->OpenProtocol (\r
Controller,\r
- &mScsiBusProtocolGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &Scsidentifier,\r
This->DriverBindingHandle,\r
Controller,\r
//\r
gBS->UninstallProtocolInterface (\r
Controller,\r
- &mScsiBusProtocolGuid,\r
+ &gEfiCallerIdGuid,\r
&ScsiBusDev->BusIdentify\r
);\r
\r
//\r
// SCSI Bus Controller device strcuture\r
//\r
-#define EFI_SCSI_BUS_PROTOCOL_GUID \\r
- { \\r
- 0x5261213D, 0x3A3D, 0x441E, {0xB3, 0xAF, 0x21, 0xD3, 0xF7, 0xA4, 0xCA, 0x17} \\r
- }\r
\r
+//\r
+// The ScsiBusProtocol is just used to locate ScsiBusDev\r
+// structure in the SCSIBusDriverBindingStop(). Then we can\r
+// Close all opened protocols and release this structure.\r
+// ScsiBusProtocol is the private protocol.\r
+// gEfiCallerIdGuid will be used as its protocol guid.\r
+//\r
typedef struct _EFI_SCSI_BUS_PROTOCOL {\r
UINT64 Reserved;\r
} EFI_SCSI_BUS_PROTOCOL;\r
\r
#include "UsbBus.h"\r
\r
-//\r
-// USB_BUS_PROTOCOL is only used to locate USB_BUS\r
-//\r
-EFI_GUID mUsbBusProtocolGuid = EFI_USB_BUS_PROTOCOL_GUID;\r
-\r
EFI_USB_IO_PROTOCOL mUsbIoProtocol = {\r
UsbIoControlTransfer,\r
UsbIoBulkTransfer,\r
//\r
Status = gBS->InstallProtocolInterface (\r
&Controller,\r
- &mUsbBusProtocolGuid,\r
+ &gEfiCallerIdGuid,\r
EFI_NATIVE_INTERFACE,\r
&UsbBus->BusId\r
);\r
}\r
\r
UNINSTALL_USBBUS:\r
- gBS->UninstallProtocolInterface (Controller, &mUsbBusProtocolGuid, &UsbBus->BusId);\r
+ gBS->UninstallProtocolInterface (Controller, &gEfiCallerIdGuid, &UsbBus->BusId);\r
\r
CLOSE_HC:\r
if (UsbBus->Usb2Hc != NULL) {\r
//\r
Status = gBS->OpenProtocol (\r
Controller,\r
- &mUsbBusProtocolGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &UsbBusId,\r
This->DriverBindingHandle,\r
Controller,\r
//\r
Status = gBS->OpenProtocol (\r
Controller,\r
- &mUsbBusProtocolGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &UsbBusId,\r
This->DriverBindingHandle,\r
Controller,\r
//\r
Status = gBS->OpenProtocol (\r
Controller,\r
- &mUsbBusProtocolGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &BusId,\r
This->DriverBindingHandle,\r
Controller,\r
//\r
// Uninstall the bus identifier and close USB_HC/USB2_HC protocols\r
//\r
- gBS->UninstallProtocolInterface (Controller, &mUsbBusProtocolGuid, &Bus->BusId);\r
+ gBS->UninstallProtocolInterface (Controller, &gEfiCallerIdGuid, &Bus->BusId);\r
\r
if (Bus->Usb2Hc != NULL) {\r
gBS->CloseProtocol (\r
#define USB_BIT(a) ((UINTN)(1 << (a)))\r
#define USB_BIT_IS_SET(Data, Bit) ((BOOLEAN)(((Data) & (Bit)) == (Bit)))\r
\r
-#define EFI_USB_BUS_PROTOCOL_GUID \\r
- {0x2B2F68CC, 0x0CD2, 0x44cf, {0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75}}\r
-\r
#define USB_INTERFACE_FROM_USBIO(a) \\r
CR(a, USB_INTERFACE, UsbIo, USB_INTERFACE_SIGNATURE)\r
\r
\r
//\r
// Used to locate USB_BUS\r
+// UsbBusProtocol is the private protocol.\r
+// gEfiCallerIdGuid will be used as its protocol guid.\r
//\r
typedef struct _EFI_USB_BUS_PROTOCOL {\r
UINT64 Reserved;\r
#include <Protocol/DevicePath.h>\r
\r
#include <Guid/HiiKeyBoardLayout.h>\r
+#include <Guid/UsbKeyBoardLayout.h>\r
\r
#include <Library/DebugLib.h>\r
#include <Library/ReportStatusCodeLib.h>\r
\r
#include "KeyBoard.h"\r
\r
-EFI_GUID mUsbKeyboardLayoutPackageGuid = USB_KEYBOARD_LAYOUT_PACKAGE_GUID;\r
-EFI_GUID mUsbKeyboardLayoutKeyGuid = USB_KEYBOARD_LAYOUT_KEY_GUID;\r
-\r
USB_KEYBOARD_LAYOUT_PACK_BIN mUsbKeyboardLayoutBin = {\r
sizeof (USB_KEYBOARD_LAYOUT_PACK_BIN), // Binary size\r
\r
// Install Keyboard Layout package to HII database\r
//\r
HiiHandle = HiiAddPackages (\r
- &mUsbKeyboardLayoutPackageGuid,\r
+ &gUsbKeyboardLayoutPackageGuid,\r
UsbKeyboardDevice->ControllerHandle,\r
&mUsbKeyboardLayoutBin,\r
NULL\r
//\r
// Set current keyboard layout\r
//\r
- Status = HiiDatabase->SetKeyboardLayout (HiiDatabase, &mUsbKeyboardLayoutKeyGuid);\r
+ Status = HiiDatabase->SetKeyboardLayout (HiiDatabase, &gUsbKeyboardLayoutKeyGuid);\r
\r
return Status;\r
}\r
\r
#include "EfiKey.h"\r
\r
-#define USB_KEYBOARD_LAYOUT_PACKAGE_GUID \\r
- { \\r
- 0xc0f3b43, 0x44de, 0x4907, { 0xb4, 0x78, 0x22, 0x5f, 0x6f, 0x62, 0x89, 0xdc } \\r
- }\r
-\r
-#define USB_KEYBOARD_LAYOUT_KEY_GUID \\r
- { \\r
- 0x3a4d7a7c, 0x18a, 0x4b42, { 0x81, 0xb3, 0xdc, 0x10, 0xe3, 0xb5, 0x91, 0xbd } \\r
- }\r
-\r
#define USB_KEYBOARD_KEY_COUNT 104\r
\r
#define USB_KEYBOARD_LANGUAGE_STR_LEN 5 // RFC4646 Language Code: "en-US"\r
# which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().\r
#\r
gEfiHiiKeyBoardLayoutGuid ## SOMETIME_CONSUMES ## Event\r
+ gUsbKeyboardLayoutPackageGuid\r
+ gUsbKeyboardLayoutKeyGuid\r
\r
[Protocols]\r
gEfiUsbIoProtocolGuid ## TO_START\r
--- /dev/null
+/** @file\r
+ GUIDs used as HII FormSet and HII Package list GUID in Driver Sample driver. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __DRIVER_SAMPLE_HII_GUID_H__\r
+#define __DRIVER_SAMPLE_HII_GUID_H__\r
+\r
+#define DRIVER_SAMPLE_FORMSET_GUID \\r
+ { \\r
+ 0xA04A27f4, 0xDF00, 0x4D42, {0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D} \\r
+ }\r
+\r
+#define DRIVER_SAMPLE_INVENTORY_GUID \\r
+ { \\r
+ 0xb3f56470, 0x6141, 0x4621, {0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8} \\r
+ }\r
+\r
+#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \\r
+ { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }\r
+\r
+#define EFI_IFR_REFRESH_ID_OP_GUID \\r
+ { \\r
+ 0xF5E655D9, 0x02A6, 0x46f2, {0x9E, 0x76, 0xB8, 0xBE, 0x8E, 0x60, 0xAB, 0x22} \\r
+ }\r
+\r
+extern EFI_GUID gDriverSampleFormSetGuid;\r
+extern EFI_GUID gDriverSampleInventoryGuid;\r
+extern EFI_GUID gEfiUserInfoAccessSetupAdminGuid;\r
+extern EFI_GUID gEfiIfrRefreshIdOpGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ GUID used as HII FormSet GUID in HII Resource Sample driver. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __HII_RESOURCE_SAMPLE_HII_GUID_H__\r
+#define __HII_RESOURCE_SAMPLE_HII_GUID_H__\r
+\r
+#define HII_RESOURCE_SAMPLE_FORM_SET_GUID \\r
+ { 0x4f4ef7f0, 0xaa29, 0x4ce9, { 0xba, 0x41, 0x64, 0x3e, 0x1, 0x23, 0xa9, 0x9f }}\r
+\r
+extern EFI_GUID gHiiResourceSamleFormSetGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ GUIDs used as HII FormSet and HII Package list GUID in Ip4ConfigDxe driver. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __IP4_CONFIG_HII_GUID_H__\r
+#define __IP4_CONFIG_HII_GUID_H__\r
+\r
+#define EFI_NIC_IP4_CONFIG_NVDATA_GUID \\r
+ { \\r
+ 0x9d5b53f, 0xf4b0, 0x4f59, { 0xa0, 0xb1, 0x7b, 0x57, 0xd3, 0x5c, 0xe, 0x5 } \\r
+ }\r
+\r
+extern EFI_GUID gNicIp4ConfigNvDataGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ GUIDs used as HII FormSet and HII Package list GUID in IP4 IScsiDxe driver. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __IP4_ISCSI_CONFIG_HII_GUID_H__\r
+#define __IP4_ISCSI_CONFIG_HII_GUID_H__\r
+\r
+#define IP4_ISCSI_CONFIG_GUID \\r
+ { \\r
+ 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \\r
+ }\r
+\r
+#define ISCSI_CHAP_AUTH_INFO_GUID \\r
+ { \\r
+ 0x786ec0ac, 0x65ae, 0x4d1b, {0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97} \\r
+ }\r
+\r
+extern EFI_GUID gIp4IScsiConfigGuid;\r
+extern EFI_GUID gIScsiCHAPAuthInfoGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ GUID is for MTC variable. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __MTC_VENDOR_GUID_H__\r
+#define __MTC_VENDOR_GUID_H__\r
+\r
+//\r
+// Vendor GUID of the variable for the high part of monotonic counter (UINT32).\r
+//\r
+#define MTC_VENDOR_GUID \\r
+ { 0xeb704011, 0x1402, 0x11d3, { 0x8e, 0x77, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } }\r
+\r
+//\r
+// Name of the variable for the high part of monotonic counter\r
+//\r
+#define MTC_VARIABLE_NAME L"MTC"\r
+\r
+extern EFI_GUID gMtcVendorGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ GUIDs used as HII FormSet and HII Package list GUID in PlatDriOverride driver. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __PLATFORM_DRIVER_OVERRIDE_HII_GUID_H__\r
+#define __PLATFORM_DRIVER_OVERRIDE_HII_GUID_H__\r
+\r
+#define PLAT_OVER_MNGR_GUID \\r
+ { \\r
+ 0x8614567d, 0x35be, 0x4415, {0x8d, 0x88, 0xbd, 0x7d, 0xc, 0x9c, 0x70, 0xc0} \\r
+ }\r
+\r
+extern EFI_GUID gPlatformOverridesManagerGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ USB KeyBoard Layout GUIDs\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __USB_KEYBOARD_LAYOUT_GUID_H__\r
+#define __USB_KEYBOARD_LAYOUT_GUID_H__\r
+\r
+//\r
+// GUID for USB keyboard HII package list.\r
+//\r
+#define USB_KEYBOARD_LAYOUT_PACKAGE_GUID \\r
+ { \\r
+ 0xc0f3b43, 0x44de, 0x4907, { 0xb4, 0x78, 0x22, 0x5f, 0x6f, 0x62, 0x89, 0xdc } \\r
+ }\r
+\r
+//\r
+// GUID for USB keyboard layout\r
+//\r
+#define USB_KEYBOARD_LAYOUT_KEY_GUID \\r
+ { \\r
+ 0x3a4d7a7c, 0x18a, 0x4b42, { 0x81, 0xb3, 0xdc, 0x10, 0xe3, 0xb5, 0x91, 0xbd } \\r
+ }\r
+\r
+extern EFI_GUID gUsbKeyboardLayoutPackageGuid;\r
+extern EFI_GUID gUsbKeyboardLayoutKeyGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ GUIDs used as HII FormSet and HII Package list GUID in VlanConfig driver. \r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __VLAN_CONFIG_HII_GUID_H__\r
+#define __VLAN_CONFIG_HII_GUID_H__\r
+\r
+#define VLAN_CONFIG_FORM_SET_GUID \\r
+ { \\r
+ 0xd79df6b0, 0xef44, 0x43bd, {0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 } \\r
+ }\r
+\r
+extern EFI_GUID gVlanConfigFormSetGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ GUID has all zero values.\r
+ \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution. \r
+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 __ZERO_GUID_H__\r
+#define __ZERO_GUID_H__\r
+\r
+#define ZERO_GUID \\r
+ { \\r
+ 0x0, 0x0, 0x0, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} \\r
+ }\r
+\r
+extern EFI_GUID gZeroGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ EBC Simple Debugger protocol for debug EBC code.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions\r
+of the BSD License which accompanies this distribution. The\r
+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 _EBC_SIMPLE_DEBUGGER_PROTOCOL_H_\r
+#define _EBC_SIMPLE_DEBUGGER_PROTOCOL_H_\r
+\r
+#include <Protocol\DebugSupport.h>\r
+#include <Protocol\EbcVmTest.h>\r
+\r
+#define EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL_GUID \\r
+ { \\r
+ 0x2a72d11e, 0x7376, 0x40f6, { 0x9c, 0x68, 0x23, 0xfa, 0x2f, 0xe3, 0x63, 0xf1 } \\r
+ }\r
+\r
+//\r
+// Defines for a simple EBC debugger interface\r
+//\r
+typedef struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL;\r
+\r
+/**\r
+ Trig Exception on EBC VM.\r
+\r
+ @param[in] This A pointer to the EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL structure.\r
+ @param[in] VmPtr A pointer to a VM context.\r
+ @param[in] ExceptionType Exception to be trigged.\r
+\r
+ @retval EFI_UNSUPPORTED No support for it.\r
+ @retval EFI_SUCCESS Exception is trigged.\r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EBC_DEBUGGER_SIGNAL_EXCEPTION) (\r
+ IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL *This,\r
+ IN VM_CONTEXT *VmPtr,\r
+ IN EFI_EXCEPTION_TYPE ExceptionType\r
+ );\r
+\r
+/**\r
+ Given a pointer to a new VM context, debug one or more instructions.\r
+\r
+ @param[in] This A pointer to the EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL structure.\r
+ @param[in] VmPtr A pointer to a VM context.\r
+\r
+ @retval EFI_UNSUPPORTED No support for it.\r
+ @retval EFI_SUCCESS Debug one or more instructions.\r
+\r
+**/\r
+typedef\r
+VOID\r
+(EFIAPI *EBC_DEBUGGER_DEBUG) (\r
+ IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL *This,\r
+ IN VM_CONTEXT *VmPtr\r
+ );\r
+\r
+/**\r
+ Given a pointer to a new VM context, dump one or more instructions.\r
+\r
+ @param[in] This A pointer to the EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL structure.\r
+ @param[in] VmPtr A pointer to a VM context.\r
+ @param[in] DasmString Dump string buffer. \r
+ @param[in] DasmStringSize Dump string size.\r
+\r
+ @retval EFI_UNSUPPORTED No support for it.\r
+ @retval EFI_SUCCESS Dump one or more instructions.\r
+\r
+**/\r
+typedef\r
+UINT32\r
+(EFIAPI *EBC_DEBUGGER_DASM) (\r
+ IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL *This,\r
+ IN VM_CONTEXT *VmPtr,\r
+ IN UINT16 *DasmString OPTIONAL,\r
+ IN UINT32 DasmStringSize\r
+ );\r
+\r
+/**\r
+ This interface allows you to configure the EBC debug support\r
+ driver. For example, turn on or off saving and printing of\r
+ delta VM even if called. Or to even disable the entire interface,\r
+ in which case all functions become no-ops.\r
+\r
+ @param[in] This A pointer to the EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL structure.\r
+ @param[in] ConfigId ID to be configured.\r
+ @param[in] ConfigValue Value to be set.\r
+\r
+ @retval EFI_UNSUPPORTED No support for it.\r
+ @retval EFI_SUCCESS Configure EBC debug.\r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EBC_DEBUGGER_CONFIGURE) (\r
+ IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL *This,\r
+ IN UINT32 ConfigId,\r
+ IN UINTN ConfigValue\r
+ );\r
+\r
+//\r
+// Prototype for the actual EBC debug support protocol interface\r
+//\r
+struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL {\r
+ EBC_DEBUGGER_DEBUG Debugger;\r
+ EBC_DEBUGGER_SIGNAL_EXCEPTION SignalException;\r
+ EBC_DEBUGGER_DASM Dasm;\r
+ EBC_DEBUGGER_CONFIGURE Configure;\r
+};\r
+\r
+extern EFI_GUID gEfiEbcSimpleDebuggerProtocolGuid;\r
+\r
+#endif\r
--- /dev/null
+/** @file\r
+ EBC VM Test protocol for test purposes.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+\r
+This program and the accompanying materials\r
+are licensed and made available under the terms and conditions\r
+of the BSD License which accompanies this distribution. The\r
+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 _EBC_VM_TEST_PROTOCOL_H_\r
+#define _EBC_VM_TEST_PROTOCOL_H_\r
+\r
+//\r
+// Define a protocol for an EBC VM test interface.\r
+//\r
+#define EFI_EBC_VM_TEST_PROTOCOL_GUID \\r
+ { \\r
+ 0xAAEACCFD, 0xF27B, 0x4C17, { 0xB6, 0x10, 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } \\r
+ }\r
+\r
+//\r
+// Define for forward reference.\r
+//\r
+typedef struct _EFI_EBC_VM_TEST_PROTOCOL EFI_EBC_VM_TEST_PROTOCOL;\r
+\r
+///\r
+/// instruction pointer for the VM\r
+///\r
+typedef UINT8 *VMIP;\r
+\r
+typedef INT64 VM_REGISTER;\r
+typedef UINT32 EXCEPTION_FLAGS;\r
+\r
+typedef struct {\r
+ VM_REGISTER Gpr[8]; ///< General purpose registers.\r
+ ///< Flags register:\r
+ ///< 0 Set to 1 if the result of the last compare was true\r
+ ///< 1 Set to 1 if stepping\r
+ UINT64 Flags; ///< 2..63 Reserved.\r
+ VMIP Ip; ///< Instruction pointer.\r
+ UINTN LastException;\r
+ EXCEPTION_FLAGS ExceptionFlags; ///< to keep track of exceptions\r
+ UINT32 StopFlags;\r
+ UINT32 CompilerVersion; ///< via break(6)\r
+ UINTN HighStackBottom; ///< bottom of the upper stack\r
+ UINTN LowStackTop; ///< top of the lower stack\r
+ UINT64 StackRetAddr; ///< location of final return address on stack\r
+ UINTN *StackMagicPtr; ///< pointer to magic value on stack to detect corruption\r
+ EFI_HANDLE ImageHandle; ///< for this EBC driver\r
+ EFI_SYSTEM_TABLE *SystemTable; ///< for debugging only\r
+ UINTN LastAddrConverted; ///< for debug\r
+ UINTN LastAddrConvertedValue; ///< for debug\r
+ VOID *FramePtr;\r
+ VOID *EntryPoint; ///< entry point of EBC image\r
+ UINTN ImageBase;\r
+ VOID *StackPool;\r
+ VOID *StackTop;\r
+} VM_CONTEXT;\r
+\r
+/**\r
+ Given a pointer to a new VM context, execute one or more instructions. This\r
+ function is only used for test purposes.\r
+\r
+ @param[in] This A pointer to the EFI_EBC_VM_TEST_PROTOCOL structure.\r
+ @param[in] VmPtr A pointer to a VM context.\r
+ @param[in, out] InstructionCount A pointer to a UINTN value holding the number of\r
+ instructions to execute. If it holds value of 0,\r
+ then the instruction to be executed is 1.\r
+\r
+ @retval EFI_UNSUPPORTED At least one of the opcodes is not supported.\r
+ @retval EFI_SUCCESS All of the instructions are executed successfully.\r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EBC_VM_TEST_EXECUTE) (\r
+ IN EFI_EBC_VM_TEST_PROTOCOL *This,\r
+ IN VM_CONTEXT *VmPtr,\r
+ IN OUT UINTN *InstructionCount\r
+ );\r
+\r
+/**\r
+ Convert AsmText to the instruction. This function is only used for test purposes.\r
+\r
+ @param[in] This A pointer to the EFI_EBC_VM_TEST_PROTOCOL structure.\r
+ @param[in] AsmText A pointer to EBC ASM text code.\r
+ @param[out] Buffer Buffer to store the instruction.\r
+ @param[out] BufferLen Size of buffer that is requried to store data.\r
+\r
+ @retval EFI_UNSUPPORTED This functionality is unsupported.\r
+ @retval EFI_SUCCESS Successfully convert AsmText to the instruction. \r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EBC_VM_TEST_ASM) (\r
+ IN EFI_EBC_VM_TEST_PROTOCOL *This,\r
+ IN CHAR16 *AsmText,\r
+ IN OUT INT8 *Buffer,\r
+ IN OUT UINTN *BufferLen\r
+ );\r
+\r
+/**\r
+ Dump the executed instruction. This function is only used for test purposes.\r
+\r
+ @param[in] This A pointer to the EFI_EBC_VM_TEST_PROTOCOL structure.\r
+ @param[out] AsmText Contain the disasm text.\r
+ @param[out] Buffer Buffer to store the instruction.\r
+ @param[out] BufferLen Size of buffer that is requried to store data.\r
+\r
+ @retval EFI_UNSUPPORTED This functionality is unsupported.\r
+ @retval EFI_SUCCESS Successfully dump the executed instruction.\r
+\r
+**/\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *EBC_VM_TEST_DASM) (\r
+ IN EFI_EBC_VM_TEST_PROTOCOL *This,\r
+ IN OUT CHAR16 *AsmText,\r
+ IN OUT INT8 *Buffer,\r
+ IN OUT UINTN *Len\r
+ );\r
+\r
+//\r
+// Prototype for the actual EBC test protocol interface\r
+//\r
+struct _EFI_EBC_VM_TEST_PROTOCOL {\r
+ EBC_VM_TEST_EXECUTE Execute;\r
+ EBC_VM_TEST_ASM Assemble;\r
+ EBC_VM_TEST_DASM Disassemble;\r
+};\r
+\r
+extern EFI_GUID gEfiEbcVmTestProtocolGuid;\r
+\r
+#endif\r
gEfiBootScriptExecutorVariableGuid = { 0x3079818c, 0x46d4, 0x4a73, { 0xae, 0xf3, 0xe3, 0xe4, 0x6c, 0xf1, 0xee, 0xdb }}\r
gEfiBootScriptExecutorContextGuid = { 0x79cb58c4, 0xac51, 0x442f, { 0xaf, 0xd7, 0x98, 0xe4, 0x7d, 0x2e, 0x99, 0x8 }}\r
\r
+ ## Include/Guid/UsbKeyBoardLayout.h\r
+ gUsbKeyboardLayoutPackageGuid = { 0xc0f3b43, 0x44de, 0x4907, { 0xb4, 0x78, 0x22, 0x5f, 0x6f, 0x62, 0x89, 0xdc }}\r
+ gUsbKeyboardLayoutKeyGuid = { 0x3a4d7a7c, 0x18a, 0x4b42, { 0x81, 0xb3, 0xdc, 0x10, 0xe3, 0xb5, 0x91, 0xbd }}\r
+ \r
+ ## Include/Guid/HiiResourceSampleHii.h\r
+ gHiiResourceSamleFormSetGuid = { 0x4f4ef7f0, 0xaa29, 0x4ce9, { 0xba, 0x41, 0x64, 0x3e, 0x1, 0x23, 0xa9, 0x9f }}\r
+\r
+ ## Include/Guid/DriverSampleHii.h\r
+ gDriverSampleFormSetGuid = { 0xA04A27f4, 0xDF00, 0x4D42, { 0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D }}\r
+ gDriverSampleInventoryGuid = { 0xb3f56470, 0x6141, 0x4621, { 0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8 }}\r
+ gEfiUserInfoAccessSetupAdminGuid = { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee }}\r
+ gEfiIfrRefreshIdOpGuid = { 0xF5E655D9, 0x02A6, 0x46f2, { 0x9E, 0x76, 0xB8, 0xBE, 0x8E, 0x60, 0xAB, 0x22 }}\r
+\r
+ ## Include/Guid/PlatDriOverrideHii.h\r
+ gPlatformOverridesManagerGuid = { 0x8614567d, 0x35be, 0x4415, { 0x8d, 0x88, 0xbd, 0x7d, 0xc, 0x9c, 0x70, 0xc0 }}\r
+\r
+ ## Include/Guid/Ip4ConfigHii.h\r
+ gNicIp4ConfigNvDataGuid = { 0x9d5b53f, 0xf4b0, 0x4f59, { 0xa0, 0xb1, 0x7b, 0x57, 0xd3, 0x5c, 0xe, 0x5 }}\r
+\r
+ ## Include/Guid/VlanConfigHii.h\r
+ gVlanConfigFormSetGuid = { 0xd79df6b0, 0xef44, 0x43bd, { 0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 }}\r
+\r
+ ## Include/Guid/Ip4IScsiConfigHii.h\r
+ gIp4IScsiConfigGuid = { 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc }}\r
+ gIScsiCHAPAuthInfoGuid = { 0x786ec0ac, 0x65ae, 0x4d1b, { 0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97 }}\r
+\r
+ ## Include/Guid/ZeroGuid.h\r
+ gZeroGuid = { 0x0, 0x0, 0x0, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}}\r
+ \r
+ ## Include/Guid/MtcVendor.h\r
+ gMtcVendorGuid = { 0xeb704011, 0x1402, 0x11d3, { 0x8e, 0x77, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}\r
+\r
[Ppis]\r
## Include/Ppi/AtaController.h\r
gPeiAtaControllerPpiGuid = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}\r
## Include/Protocol/FormBrowserEx.h\r
gEfiFormBrowserExProtocolGuid = { 0x1f73b18d, 0x4630, 0x43c1, { 0xa1, 0xde, 0x6f, 0x80, 0x85, 0x5d, 0x7d, 0xa4 } }\r
\r
+ ## Include/Protocol/EbcVmTest.h\r
+ gEfiEbcVmTestProtocolGuid = { 0xAAEACCFD, 0xF27B, 0x4C17, { 0xB6, 0x10, 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } }\r
+\r
+ ## Include/Protocol/EbcSimpleDebugger.h\r
+ gEfiEbcSimpleDebuggerProtocolGuid = { 0x2a72d11e, 0x7376, 0x40f6, { 0x9c, 0x68, 0x23, 0xfa, 0x2f, 0xe3, 0x63, 0xf1 } }\r
[PcdsFeatureFlag]\r
## Indicate whether platform can support update capsule across a system reset\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE|BOOLEAN|0x0001001d\r
DSC_SPECIFICATION = 0x00010005\r
OUTPUT_DIRECTORY = Build/MdeModule\r
SUPPORTED_ARCHITECTURES = IA32|IPF|X64|EBC|ARM\r
- BUILD_TARGETS = DEBUG|RELEASE\r
+ BUILD_TARGETS = DEBUG|RELEASE|NOOPT\r
SKUID_IDENTIFIER = DEFAULT\r
\r
[LibraryClasses]\r
\r
#define DISPLAY_ONLY_MY_ITEM 0x0002\r
\r
-EFI_GUID mFormSetGuid = FORMSET_GUID;\r
-EFI_GUID mInventoryGuid = INVENTORY_GUID;\r
-EFI_GUID MyEventGroupGuid = EFI_IFR_REFRESH_ID_OP_GUID;\r
-\r
CHAR16 VariableName[] = L"MyIfrNVData";\r
CHAR16 MyEfiVar[] = L"MyEfiVar";\r
EFI_HANDLE DriverHandle[2] = {NULL, NULL};\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- //\r
- // {C153B68D-EBFC-488e-B110-662867745B87}\r
- //\r
- { 0xc153b68d, 0xebfc, 0x488e, { 0xb1, 0x10, 0x66, 0x28, 0x67, 0x74, 0x5b, 0x87 } }\r
+ DRIVER_SAMPLE_FORMSET_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- //\r
- // {06F37F07-0C48-40e9-8436-0A08A0BB76B0}\r
- //\r
- { 0x6f37f07, 0xc48, 0x40e9, { 0x84, 0x36, 0xa, 0x8, 0xa0, 0xbb, 0x76, 0xb0 } }\r
+ DRIVER_SAMPLE_INVENTORY_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
Status = gRT->GetVariable (\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
NULL,\r
&BufferSize,\r
&PrivateData->Configuration\r
BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
Status = gRT->GetVariable (\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
NULL,\r
&BufferSize,\r
&PrivateData->Configuration\r
//\r
Configuration = AllocateZeroPool (sizeof (DRIVER_SAMPLE_CONFIGURATION));\r
ASSERT (Configuration != NULL);\r
- if (HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
+ if (HiiGetBrowserData (&gDriverSampleFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
//\r
// Update password's clear text in the screen\r
//\r
// Update uncommitted data of Browser\r
//\r
HiiSetBrowserData (\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
VariableName,\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
(UINT8 *) Configuration,\r
EncodePassword (Password, StrLen (Password) * 2);\r
Status = gRT->SetVariable(\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
&PrivateData->Configuration\r
BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
Status = gRT->GetVariable (\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
NULL,\r
&BufferSize,\r
&PrivateData->Configuration\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
// Check routing data in <ConfigHdr>.\r
// Note: if only one Storage is used, then this checking could be skipped.\r
//\r
- if (!HiiIsConfigHdrMatch (Request, &mFormSetGuid, NULL)) {\r
+ if (!HiiIsConfigHdrMatch (Request, &gDriverSampleFormSetGuid, NULL)) {\r
return EFI_NOT_FOUND;\r
}\r
//\r
// Check whether request for EFI Varstore. EFI varstore get data\r
// through hii database, not support in this path.\r
//\r
- if (HiiIsConfigHdrMatch(Request, &mFormSetGuid, MyEfiVar)) {\r
+ if (HiiIsConfigHdrMatch(Request, &gDriverSampleFormSetGuid, MyEfiVar)) {\r
return EFI_UNSUPPORTED;\r
}\r
//\r
Progress\r
);\r
if (!EFI_ERROR (Status)) {\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, PrivateData->DriverHandle[0]);\r
AppendAltCfgString(Results, ConfigRequestHdr);\r
}\r
}\r
// Check routing data in <ConfigHdr>.\r
// Note: if only one Storage is used, then this checking could be skipped.\r
//\r
- if (!HiiIsConfigHdrMatch (Configuration, &mFormSetGuid, NULL)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gDriverSampleFormSetGuid, NULL)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// Check whether request for EFI Varstore. EFI varstore get data\r
// through hii database, not support in this path.\r
//\r
- if (HiiIsConfigHdrMatch(Configuration, &mFormSetGuid, MyEfiVar)) {\r
+ if (HiiIsConfigHdrMatch(Configuration, &gDriverSampleFormSetGuid, MyEfiVar)) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
Status = gRT->GetVariable (\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
NULL,\r
&BufferSize,\r
&PrivateData->Configuration\r
//\r
Status = gRT->SetVariable(\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
&PrivateData->Configuration\r
//\r
Status = gRT->SetVariable(\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
&PrivateData->Configuration\r
\r
HiiUpdateForm (\r
PrivateData->HiiHandle[0], // HII handle\r
- &mFormSetGuid, // Formset GUID\r
+ &gDriverSampleFormSetGuid, // Formset GUID\r
0x3, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
NULL // Insert data\r
PrivateData->Configuration.DynamicOneof = 2;\r
Status = gRT->SetVariable(\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
&PrivateData->Configuration\r
//\r
Configuration = AllocateZeroPool (sizeof (DRIVER_SAMPLE_CONFIGURATION));\r
ASSERT (Configuration != NULL);\r
- if (HiiGetBrowserData (&mFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
+ if (HiiGetBrowserData (&gDriverSampleFormSetGuid, VariableName, sizeof (DRIVER_SAMPLE_CONFIGURATION), (UINT8 *) Configuration)) {\r
Configuration->DynamicOneof = 2;\r
\r
//\r
// Update uncommitted data of Browser\r
//\r
HiiSetBrowserData (\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
VariableName,\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
(UINT8 *) Configuration,\r
\r
HiiUpdateForm (\r
PrivateData->HiiHandle[0], // HII handle\r
- &mFormSetGuid, // Formset GUID\r
+ &gDriverSampleFormSetGuid, // Formset GUID\r
0x1234, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
EndOpCodeHandle // Replace data\r
\r
HiiUpdateForm (\r
PrivateData->HiiHandle[0], // HII handle\r
- &mFormSetGuid, // Formset GUID\r
+ &gDriverSampleFormSetGuid, // Formset GUID\r
FormId, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
NULL // Insert data\r
//\r
Status = gRT->SetVariable(\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
&PrivateData->Configuration\r
//\r
EfiData = AllocateZeroPool (sizeof (MY_EFI_VARSTORE_DATA));\r
ASSERT (EfiData != NULL);\r
- if (HiiGetBrowserData (&mFormSetGuid, MyEfiVar, sizeof (MY_EFI_VARSTORE_DATA), (UINT8 *) EfiData)) {\r
+ if (HiiGetBrowserData (&gDriverSampleFormSetGuid, MyEfiVar, sizeof (MY_EFI_VARSTORE_DATA), (UINT8 *) EfiData)) {\r
EfiData->Field8 = 111;\r
HiiSetBrowserData (\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
MyEfiVar,\r
sizeof (MY_EFI_VARSTORE_DATA),\r
(UINT8 *) EfiData,\r
// Publish our HII data\r
//\r
HiiHandle[0] = HiiAddPackages (\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
DriverHandle[0],\r
DriverSampleStrings,\r
VfrBin,\r
PrivateData->DriverHandle[1] = DriverHandle[1];\r
\r
HiiHandle[1] = HiiAddPackages (\r
- &mInventoryGuid,\r
+ &gDriverSampleInventoryGuid,\r
DriverHandle[1],\r
DriverSampleStrings,\r
InventoryBin,\r
//\r
// Try to read NV config EFI variable first\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, VariableName, DriverHandle[0]);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, DriverHandle[0]);\r
ASSERT (ConfigRequestHdr != NULL);\r
\r
BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
- Status = gRT->GetVariable (VariableName, &mFormSetGuid, NULL, &BufferSize, Configuration);\r
+ Status = gRT->GetVariable (VariableName, &gDriverSampleFormSetGuid, NULL, &BufferSize, Configuration);\r
if (EFI_ERROR (Status)) {\r
//\r
// Store zero data Buffer Storage to EFI variable\r
//\r
Status = gRT->SetVariable(\r
VariableName,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
Configuration\r
VarStoreConfig = &PrivateData->VarStoreConfig;\r
ZeroMem (VarStoreConfig, sizeof (MY_EFI_VARSTORE_DATA));\r
\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mFormSetGuid, MyEfiVar, DriverHandle[0]);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, MyEfiVar, DriverHandle[0]);\r
ASSERT (ConfigRequestHdr != NULL);\r
\r
BufferSize = sizeof (MY_EFI_VARSTORE_DATA);\r
- Status = gRT->GetVariable (MyEfiVar, &mFormSetGuid, NULL, &BufferSize, VarStoreConfig);\r
+ Status = gRT->GetVariable (MyEfiVar, &gDriverSampleFormSetGuid, NULL, &BufferSize, VarStoreConfig);\r
if (EFI_ERROR (Status)) {\r
//\r
// Store zero data to EFI variable Storage.\r
//\r
Status = gRT->SetVariable(\r
MyEfiVar,\r
- &mFormSetGuid,\r
+ &gDriverSampleFormSetGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
sizeof (MY_EFI_VARSTORE_DATA),\r
VarStoreConfig\r
TPL_NOTIFY,\r
DriverSampleInternalEmptyFunction,\r
NULL,\r
- &MyEventGroupGuid,\r
+ &gEfiIfrRefreshIdOpGuid,\r
&mEvent\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
[Guids]\r
gEfiIfrTianoGuid ## CONSUMES ## Guid\r
+ gDriverSampleFormSetGuid ## PRODUCES ## Guid\r
+ gDriverSampleInventoryGuid ## PRODUCES ## Guid\r
+ gEfiIfrRefreshIdOpGuid ## SOMETIMES_PRODUCES ## EventGuid\r
\r
[Protocols]\r
gEfiHiiStringProtocolGuid ## CONSUMES\r
//\r
// Sample Inventory Data\r
//\r
-// Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
// 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
//\r
//**/\r
\r
-#define INVENTORY_GUID { 0xb3f56470, 0x6141, 0x4621, 0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8 }\r
+#include "NVDataStruc.h"\r
\r
formset\r
- guid = INVENTORY_GUID,\r
+ guid = DRIVER_SAMPLE_INVENTORY_GUID,\r
title = STRING_TOKEN(STR_INV_FORM_SET_TITLE),\r
help = STRING_TOKEN(STR_INV_FORM_SET_HELP),\r
class = 0x04,\r
/** @file\r
\r
-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
\r
#include <Guid/HiiPlatformSetupFormset.h>\r
#include <Guid/HiiFormMapMethodGuid.h>\r
-\r
-#define FORMSET_GUID \\r
- { \\r
- 0xA04A27f4, 0xDF00, 0x4D42, {0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D} \\r
- }\r
-\r
-#define INVENTORY_GUID \\r
- { \\r
- 0xb3f56470, 0x6141, 0x4621, {0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8} \\r
- }\r
-\r
-#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \\r
- { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }\r
-\r
-#define EFI_IFR_REFRESH_ID_OP_GUID \\r
- { \\r
- 0xF5E655D9, 0x02A6, 0x46f2, {0x9E, 0x76, 0xB8, 0xBE, 0x8E, 0x60, 0xAB, 0x22} \\r
- }\r
-\r
-#define ZERO_GUID \\r
- { \\r
- 0x0, 0x0, 0x0, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} \\r
- } \r
+#include <Guid/DriverSampleHii.h>\r
+#include <Guid/ZeroGuid.h>\r
\r
#define CONFIGURATION_VARSTORE_ID 0x1234\r
\r
#define LABEL_UPDATE_BBS 0x2222\r
\r
formset\r
- guid = FORMSET_GUID,\r
+ guid = DRIVER_SAMPLE_FORMSET_GUID,\r
title = STRING_TOKEN(STR_FORM_SET_TITLE),\r
help = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),\r
classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,\r
varstore DRIVER_SAMPLE_CONFIGURATION, // This is the data structure type\r
varid = CONFIGURATION_VARSTORE_ID, // Optional VarStore ID\r
name = MyIfrNVData, // Define referenced name in vfr\r
- guid = FORMSET_GUID; // GUID of this buffer storage\r
+ guid = DRIVER_SAMPLE_FORMSET_GUID; // GUID of this buffer storage\r
\r
//\r
// Define a EFI variable Storage (EFI_IFR_VARSTORE_EFI)\r
efivarstore MY_EFI_VARSTORE_DATA,\r
attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE, // EFI variable attribures \r
name = MyEfiVar,\r
- guid = FORMSET_GUID;\r
+ guid = DRIVER_SAMPLE_FORMSET_GUID;\r
\r
//\r
// Define a Name/Value Storage (EFI_IFR_VARSTORE_NAME_VALUE)\r
name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME0), // Define Name list of this storage, refer it by MyNameValueVar[0]\r
name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME1), // Define Name list of this storage, refer it by MyNameValueVar[1]\r
name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME2), // Define Name list of this storage, refer it by MyNameValueVar[2]\r
- guid = FORMSET_GUID; // GUID of this Name/Value storage\r
+ guid = DRIVER_SAMPLE_FORMSET_GUID; // GUID of this Name/Value storage\r
\r
defaultstore MyStandardDefault,\r
prompt = STRING_TOKEN(STR_STANDARD_DEFAULT_PROMPT),\r
help = STRING_TOKEN(STR_GOTO_HELP);\r
\r
guidop \r
- guid = FORMSET_GUID,\r
+ guid = DRIVER_SAMPLE_FORMSET_GUID,\r
datatype = MY_EFI_VARSTORE_DATA,\r
data.Field8 = 0x21, \r
data.Field16 = 0x2121,\r
\r
formmap formid = 4, \r
maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD); \r
- mapguid = FORMSET_GUID;\r
+ mapguid = DRIVER_SAMPLE_FORMSET_GUID;\r
maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD); \r
mapguid = EFI_HII_STANDARD_FORM_GUID;\r
\r
# platform and processor-independent mechanisms for loading and executing EFI\r
# device drivers.\r
#\r
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
# 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
\r
[Packages]\r
MdePkg/MdePkg.dec\r
-\r
+ MdeModulePkg/MdeModulePkg.dec\r
\r
[LibraryClasses]\r
MemoryAllocationLib\r
[Protocols]\r
gEfiDebugSupportProtocolGuid ## PRODUCES\r
gEfiEbcProtocolGuid ## PRODUCES\r
+ gEfiEbcVmTestProtocolGuid ## SOMETIMES_PRODUCES\r
+ gEfiEbcSimpleDebuggerProtocolGuid ## SOMETIMES_CONSUMES\r
\r
[Depex]\r
TRUE\r
/** @file\r
Contains code that implements the virtual machine.\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
//\r
CONST UINT8 mJMPLen[] = { 2, 2, 6, 10 };\r
\r
-//\r
-// Simple Debugger Protocol GUID\r
-//\r
-EFI_GUID mEbcSimpleDebuggerProtocolGuid = EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL_GUID;\r
-\r
-\r
/**\r
Given a pointer to a new VM context, execute one or more instructions. This\r
function is only used for test purposes via the EBC VM test protocol.\r
\r
**/\r
EFI_STATUS\r
+EFIAPI\r
EbcExecuteInstructions (\r
IN EFI_EBC_VM_TEST_PROTOCOL *This,\r
IN VM_CONTEXT *VmPtr,\r
//\r
DEBUG_CODE_BEGIN ();\r
Status = gBS->LocateProtocol (\r
- &mEbcSimpleDebuggerProtocolGuid,\r
+ &gEfiEbcSimpleDebuggerProtocolGuid,\r
NULL,\r
(VOID **) &EbcSimpleDebugger\r
);\r
be of use to a disassembler for the most part. Also provides function\r
prototypes for VM functions.\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
IN UINT64 Data\r
);\r
\r
-//\r
-// Define a protocol for an EBC VM test interface.\r
-//\r
-#define EFI_EBC_VM_TEST_PROTOCOL_GUID \\r
- { \\r
- 0xAAEACCFDL, 0xF27B, 0x4C17, { 0xB6, 0x10, 0x75, 0xCA, 0x1F, 0x2D, 0xFB, 0x52 } \\r
- }\r
-\r
-//\r
-// Define for forward reference.\r
-//\r
-typedef struct _EFI_EBC_VM_TEST_PROTOCOL EFI_EBC_VM_TEST_PROTOCOL;\r
-\r
-typedef\r
-EFI_STATUS\r
-(*EBC_VM_TEST_EXECUTE) (\r
- IN EFI_EBC_VM_TEST_PROTOCOL * This,\r
- IN VM_CONTEXT * VmPtr,\r
- IN OUT UINTN *InstructionCount\r
- );\r
-\r
-typedef\r
-EFI_STATUS\r
-(*EBC_VM_TEST_ASM) (\r
- IN EFI_EBC_VM_TEST_PROTOCOL * This,\r
- IN CHAR16 *AsmText,\r
- IN OUT INT8 *Buffer,\r
- IN OUT UINTN *BufferLen\r
- );\r
-\r
-typedef\r
-EFI_STATUS\r
-(*EBC_VM_TEST_DASM) (\r
- IN EFI_EBC_VM_TEST_PROTOCOL * This,\r
- IN OUT CHAR16 *AsmText,\r
- IN OUT INT8 *Buffer,\r
- IN OUT UINTN *Len\r
- );\r
-\r
-//\r
-// Prototype for the actual EBC test protocol interface\r
-//\r
-struct _EFI_EBC_VM_TEST_PROTOCOL {\r
- EBC_VM_TEST_EXECUTE Execute;\r
- EBC_VM_TEST_ASM Assemble;\r
- EBC_VM_TEST_DASM Disassemble;\r
-};\r
-\r
/**\r
Given a pointer to a new VM context, execute one or more instructions. This\r
function is only used for test purposes via the EBC VM test protocol.\r
\r
**/\r
EFI_STATUS\r
+EFIAPI\r
EbcExecuteInstructions (\r
IN EFI_EBC_VM_TEST_PROTOCOL *This,\r
IN VM_CONTEXT *VmPtr,\r
Provides auxiliary support routines for the VM. That is, routines\r
that are not particularly related to VM execution of EBC instructions.\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
\r
**/\r
EFI_STATUS\r
+EFIAPI\r
EbcVmTestUnsupported (\r
VOID\r
);\r
//\r
EFI_PERIODIC_CALLBACK mDebugPeriodicCallback = NULL;\r
EFI_EXCEPTION_CALLBACK mDebugExceptionCallback[MAX_EBC_EXCEPTION + 1] = {NULL};\r
-EFI_GUID mEfiEbcVmTestProtocolGuid = EFI_EBC_VM_TEST_PROTOCOL_GUID;\r
\r
VOID *mStackBuffer[MAX_STACK_NUM];\r
EFI_HANDLE mStackBufferIndex[MAX_STACK_NUM];\r
// Publish the protocol\r
//\r
Handle = NULL;\r
- Status = gBS->InstallProtocolInterface (&Handle, &mEfiEbcVmTestProtocolGuid, EFI_NATIVE_INTERFACE, EbcVmTestProtocol);\r
+ Status = gBS->InstallProtocolInterface (&Handle, &gEfiEbcVmTestProtocolGuid, EFI_NATIVE_INTERFACE, EbcVmTestProtocol);\r
if (EFI_ERROR (Status)) {\r
FreePool (EbcVmTestProtocol);\r
}\r
\r
**/\r
EFI_STATUS\r
+EFIAPI\r
EbcVmTestUnsupported (\r
VOID\r
)\r
Main routines for the EBC interpreter. Includes the initialization and\r
main interpreter routines.\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
\r
#include <Protocol/DebugSupport.h>\r
#include <Protocol/Ebc.h>\r
+#include <Protocol/EbcVmTest.h>\r
+#include <Protocol/EbcSimpleDebugger.h>\r
\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
\r
-typedef INT64 VM_REGISTER;\r
-typedef UINT8 *VMIP; // instruction pointer for the VM\r
-typedef UINT32 EXCEPTION_FLAGS;\r
-\r
-typedef struct {\r
- VM_REGISTER Gpr[8]; // General purpose registers.\r
- UINT64 Flags; // Flags register:\r
- // 0 Set to 1 if the result of the last compare was true\r
- // 1 Set to 1 if stepping\r
- // 2..63 Reserved.\r
- VMIP Ip; // Instruction pointer.\r
- UINTN LastException; //\r
- EXCEPTION_FLAGS ExceptionFlags; // to keep track of exceptions\r
- UINT32 StopFlags;\r
- UINT32 CompilerVersion; // via break(6)\r
- UINTN HighStackBottom; // bottom of the upper stack\r
- UINTN LowStackTop; // top of the lower stack\r
- UINT64 StackRetAddr; // location of final return address on stack\r
- UINTN *StackMagicPtr; // pointer to magic value on stack to detect corruption\r
- EFI_HANDLE ImageHandle; // for this EBC driver\r
- EFI_SYSTEM_TABLE *SystemTable; // for debugging only\r
- UINTN LastAddrConverted; // for debug\r
- UINTN LastAddrConvertedValue; // for debug\r
- VOID *FramePtr;\r
- VOID *EntryPoint; // entry point of EBC image\r
- UINTN ImageBase;\r
- VOID *StackPool;\r
- VOID *StackTop;\r
-} VM_CONTEXT;\r
-\r
extern VM_CONTEXT *mVmPtr;\r
\r
//\r
IN EFI_HANDLE Handle\r
);\r
\r
-\r
-//\r
-// Defines for a simple EBC debugger interface\r
-//\r
-typedef struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL;\r
-\r
-#define EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL_GUID \\r
- { \\r
- 0x2a72d11e, 0x7376, 0x40f6, { 0x9c, 0x68, 0x23, 0xfa, 0x2f, 0xe3, 0x63, 0xf1 } \\r
- }\r
-\r
-typedef\r
-EFI_STATUS\r
-(*EBC_DEBUGGER_SIGNAL_EXCEPTION) (\r
- IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL *This,\r
- IN VM_CONTEXT *VmPtr,\r
- IN EFI_EXCEPTION_TYPE ExceptionType\r
- );\r
-\r
-typedef\r
-VOID\r
-(*EBC_DEBUGGER_DEBUG) (\r
- IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL *This,\r
- IN VM_CONTEXT *VmPtr\r
- );\r
-\r
-typedef\r
-UINT32\r
-(*EBC_DEBUGGER_DASM) (\r
- IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL *This,\r
- IN VM_CONTEXT *VmPtr,\r
- IN UINT16 *DasmString OPTIONAL,\r
- IN UINT32 DasmStringSize\r
- );\r
-\r
-//\r
-// This interface allows you to configure the EBC debug support\r
-// driver. For example, turn on or off saving and printing of\r
-// delta VM even if called. Or to even disable the entire interface,\r
-// in which case all functions become no-ops.\r
-//\r
-typedef\r
-EFI_STATUS\r
-(*EBC_DEBUGGER_CONFIGURE) (\r
- IN EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL *This,\r
- IN UINT32 ConfigId,\r
- IN UINTN ConfigValue\r
- );\r
-\r
-//\r
-// Prototype for the actual EBC debug support protocol interface\r
-//\r
-struct _EFI_EBC_SIMPLE_DEBUGGER_PROTOCOL {\r
- EBC_DEBUGGER_DEBUG Debugger;\r
- EBC_DEBUGGER_SIGNAL_EXCEPTION SignalException;\r
- EBC_DEBUGGER_DASM Dasm;\r
- EBC_DEBUGGER_CONFIGURE Configure;\r
-};\r
-\r
typedef struct {\r
EFI_EBC_PROTOCOL *This;\r
VOID *EntryPoint;\r
\r
#include "HiiDatabase.h"\r
\r
-//\r
-// Global variables\r
-//\r
-EFI_GUID mHiiDatabaseNotifyGuid = HII_DATABASE_NOTIFY_GUID;\r
-\r
-\r
/**\r
This function generates a HII_DATABASE_RECORD node and adds into hii database.\r
This is a internal function.\r
//\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&Notify->NotifyHandle,\r
- &mHiiDatabaseNotifyGuid,\r
+ &gEfiCallerIdGuid,\r
NULL,\r
NULL\r
);\r
\r
Status = gBS->OpenProtocol (\r
NotificationHandle,\r
- &mHiiDatabaseNotifyGuid,\r
+ &gEfiCallerIdGuid,\r
NULL,\r
NULL,\r
NULL,\r
RemoveEntryList (&Notify->DatabaseNotifyEntry);\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
Notify->NotifyHandle,\r
- &mHiiDatabaseNotifyGuid,\r
+ &gEfiCallerIdGuid,\r
NULL,\r
NULL\r
);\r
#include <Library/UefiRuntimeServicesTableLib.h>\r
#include <Library/PrintLib.h>\r
\r
-\r
-#define HII_DATABASE_NOTIFY_GUID \\r
- { \\r
- 0xc1c76, 0xd79e, 0x42fe, {0x86, 0xb, 0x8b, 0xe8, 0x7b, 0x3e, 0x7a, 0x78} \\r
- }\r
-\r
#define MAX_STRING_LENGTH 1024\r
#define MAX_FONT_NAME_LEN 256\r
#define NARROW_BASELINE 15\r
This is an example of how a driver retrieve HII data using HII Package List\r
Protocol, and how to publish the HII data.\r
\r
-Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
**/\r
\r
#include <Uefi.h>\r
+#include <Guid/HiiResourceSampleHii.h>\r
#include <Protocol/HiiPackageList.h>\r
#include <Library/DevicePathLib.h>\r
#include <Library/UefiDriverEntryPoint.h>\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- //\r
- // {D49D2EB0-44D5-4621-9FD6-1A92C9109B99}\r
- //\r
- { 0xD49D2EB0, 0x44D5, 0x4621, { 0x9F, 0xD6, 0x1A, 0x92, 0xC9, 0x10, 0x9B, 0x99 } }\r
+ HII_RESOURCE_SAMPLE_FORM_SET_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
// *++\r
//\r
-// Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
// 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
//\r
// --*/\r
\r
-#define SAMPLE_GUID { 0x4f4ef7f0, 0xaa29, 0x4ce9, 0xba, 0x41, 0x64, 0x3e, 0x1, 0x23, 0xa9, 0x9f }\r
-\r
+#include <Guid/HiiResourceSampleHii.h>\r
\r
formset\r
- guid = SAMPLE_GUID,\r
+ guid = HII_RESOURCE_SAMPLE_FORM_SET_GUID,\r
title = STRING_TOKEN(STR_SAMPLE_FORM_SET_TITLE),\r
help = STRING_TOKEN(STR_SAMPLE_FORM_SET_HELP),\r
\r
Produce the UEFI boot service GetNextMonotonicCount() and runtime service\r
GetNextHighMonotonicCount().\r
\r
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
#include <Uefi.h>\r
\r
#include <Protocol/MonotonicCounter.h>\r
+#include <Guid/MtcVendor.h>\r
\r
#include <Library/BaseLib.h>\r
#include <Library/UefiDriverEntryPoint.h>\r
//\r
EFI_EVENT mEfiMtcEvent;\r
\r
-//\r
-// Name of the variable for the high part of monotonic counter\r
-//\r
-CHAR16 *mEfiMtcName = (CHAR16 *) L"MTC";\r
-\r
-//\r
-// Vendor GUID of the variable for the high part of monotonic counter\r
-//\r
-EFI_GUID mEfiMtcGuid = { 0xeb704011, 0x1402, 0x11d3, { 0x8e, 0x77, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } };\r
-\r
/**\r
Returns a monotonically increasing count for the platform.\r
\r
// Update the NV variable to match the new high part\r
//\r
return EfiSetVariable (\r
- mEfiMtcName,\r
- &mEfiMtcGuid,\r
+ MTC_VARIABLE_NAME,\r
+ &gMtcVendorGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
sizeof (UINT32),\r
HighCount\r
//\r
BufferSize = sizeof (UINT32);\r
Status = EfiGetVariable (\r
- mEfiMtcName,\r
- &mEfiMtcGuid,\r
+ MTC_VARIABLE_NAME,\r
+ &gMtcVendorGuid,\r
NULL,\r
&BufferSize,\r
&HighCount\r
# This module produces the UEFI boot service GetNextMonotonicCount()\r
# and runtime service GetNextHighMonotonicCount().\r
#\r
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
\r
[Packages]\r
MdePkg/MdePkg.dec\r
-\r
+ MdeModulePkg/MdeModulePkg.dec\r
\r
[LibraryClasses]\r
UefiRuntimeServicesTableLib\r
UefiDriverEntryPoint\r
BaseLib\r
\r
+[Guids]\r
+ gMtcVendorGuid\r
\r
[Protocols]\r
gEfiMonotonicCounterArchProtocolGuid ## PRODUCES\r
/** @file\r
This file is for Challenge-Handshake Authentication Protocol (CHAP) Configuration.\r
\r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
#include "IScsiImpl.h"\r
#include "Md5.h"\r
\r
-EFI_GUID mIScsiCHAPAuthInfoGuid = ISCSI_CHAP_AUTH_INFO_GUID;\r
-\r
/**\r
Initator caculates its own expected hash value.\r
\r
/** @file\r
The header file of CHAP configuration.\r
\r
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
#ifndef _ISCSI_CHAP_H_\r
#define _ISCSI_CHAP_H_\r
\r
-#define ISCSI_CHAP_AUTH_INFO_GUID \\r
- { \\r
- 0x786ec0ac, 0x65ae, 0x4d1b, {0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97} \\r
- }\r
-\r
-extern EFI_GUID mIScsiCHAPAuthInfoGuid;\r
-\r
#define ISCSI_AUTH_METHOD_CHAP "CHAP"\r
\r
#define ISCSI_KEY_CHAP_ALGORITHM "CHAP_A"\r
\r
#include "IScsiImpl.h"\r
\r
-EFI_GUID mVendorGuid = ISCSI_CONFIG_GUID;\r
CHAR16 mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";\r
BOOLEAN mIScsiDeviceListUpdated = FALSE;\r
UINTN mNumberOfIScsiDevices = 0;\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- //\r
- // {49D7B73E-143D-4716-977B-C45F1CB038CC}\r
- //\r
- { 0x49d7b73e, 0x143d, 0x4716, { 0x97, 0x7b, 0xc4, 0x5f, 0x1c, 0xb0, 0x38, 0xcc } }\r
+ IP4_ISCSI_CONFIG_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
DataSize = 0;\r
Status = gRT->GetVariable (\r
L"iSCSIDeviceList",\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
NULL,\r
&DataSize,\r
NULL\r
\r
gRT->GetVariable (\r
L"iSCSIDeviceList",\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
NULL,\r
&DataSize,\r
DeviceList\r
CurMacInfo = &DeviceList->MacInfo[Index];\r
IScsiMacAddrToStr (&CurMacInfo->Mac, CurMacInfo->Len, CurMacInfo->VlanId, MacString);\r
gRT->SetVariable (MacString, &gEfiIScsiInitiatorNameProtocolGuid, 0, 0, NULL);\r
- gRT->SetVariable (MacString, &mIScsiCHAPAuthInfoGuid, 0, 0, NULL);\r
+ gRT->SetVariable (MacString, &gIScsiCHAPAuthInfoGuid, 0, 0, NULL);\r
}\r
\r
FreePool (DeviceList);\r
\r
gRT->SetVariable (\r
L"iSCSIDeviceList",\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
ISCSI_CONFIG_VAR_ATTR,\r
DeviceListSize,\r
DeviceList\r
}\r
\r
*Progress = Request;\r
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVendorGuid, mVendorStorageName)) {\r
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gIp4IScsiConfigGuid, mVendorStorageName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mVendorGuid, mVendorStorageName, Private->DriverHandle);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gIp4IScsiConfigGuid, mVendorStorageName, Private->DriverHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
// Check routing data in <ConfigHdr>.\r
// Note: if only one Storage is used, then this checking could be skipped.\r
//\r
- if (!HiiIsConfigHdrMatch (Configuration, &mVendorGuid, mVendorStorageName)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gIp4IScsiConfigGuid, mVendorStorageName)) {\r
*Progress = Configuration;\r
return EFI_NOT_FOUND;\r
}\r
//\r
IfrNvData = AllocateZeroPool (sizeof (ISCSI_CONFIG_IFR_NVDATA));\r
ASSERT (IfrNvData != NULL);\r
- if (!HiiGetBrowserData (&mVendorGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData)) {\r
+ if (!HiiGetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData)) {\r
FreePool (IfrNvData);\r
return EFI_NOT_FOUND;\r
}\r
BufferSize = sizeof (Private->Current->AuthConfigData);\r
gRT->SetVariable (\r
Private->Current->MacString,\r
- &mIScsiCHAPAuthInfoGuid,\r
+ &gIScsiCHAPAuthInfoGuid,\r
ISCSI_CONFIG_VAR_ATTR,\r
BufferSize,\r
&Private->Current->AuthConfigData\r
//\r
// Pass changed uncommitted data back to Form Browser\r
//\r
- HiiSetBrowserData (&mVendorGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);\r
+ HiiSetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);\r
}\r
\r
FreePool (IfrNvData);\r
BufferSize = sizeof (ConfigFormEntry->AuthConfigData);\r
Status = gRT->GetVariable (\r
ConfigFormEntry->MacString,\r
- &mIScsiCHAPAuthInfoGuid,\r
+ &gIScsiCHAPAuthInfoGuid,\r
NULL,\r
&BufferSize,\r
&ConfigFormEntry->AuthConfigData\r
\r
HiiUpdateForm (\r
mCallbackInfo->RegisteredHandle,\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
FORMID_MAIN_FORM,\r
StartOpCodeHandle, // Label DEVICE_ENTRY_LABEL\r
EndOpCodeHandle // LABEL_END\r
// Publish our HII data\r
//\r
CallbackInfo->RegisteredHandle = HiiAddPackages (\r
- &mVendorGuid,\r
+ &gIp4IScsiConfigGuid,\r
CallbackInfo->DriverHandle,\r
IScsiDxeStrings,\r
IScsiConfigDxeBin,\r
#define EFI_NETWORK_DEVICE_CLASS 0x04\r
\r
formset \r
- guid = ISCSI_CONFIG_GUID,\r
+ guid = IP4_ISCSI_CONFIG_GUID,\r
title = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),\r
help = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),\r
class = EFI_NETWORK_DEVICE_CLASS,\r
\r
varstore ISCSI_CONFIG_IFR_NVDATA,\r
name = ISCSI_CONFIG_IFR_NVDATA,\r
- guid = ISCSI_CONFIG_GUID;\r
+ guid = IP4_ISCSI_CONFIG_GUID;\r
form formid = FORMID_MAIN_FORM,\r
title = STRING_TOKEN(STR_ISCSI_MAIN_FORM_TITLE);\r
\r
#ifndef _ISCSI_NVDATASTRUC_H_\r
#define _ISCSI_NVDATASTRUC_H_\r
\r
-#define ISCSI_CONFIG_GUID \\r
- { \\r
- 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \\r
- }\r
+#include <Guid/Ip4IScsiConfigHii.h>\r
\r
#define VAR_EQ_TEST_NAME 0x100\r
\r
/** @file\r
The entry point of IScsi driver.\r
\r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
NULL\r
};\r
\r
-EFI_GUID gIScsiPrivateGuid = ISCSI_PRIVATE_GUID;\r
-\r
-\r
/**\r
Tests to see if this driver supports a given controller. If a child device is provided, \r
it further tests to see if this driver supports creating a handle for the specified child device.\r
\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
- &gIScsiPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
NULL,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
//\r
Status = gBS->InstallProtocolInterface (\r
&ControllerHandle,\r
- &gIScsiPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
EFI_NATIVE_INTERFACE,\r
&Private->IScsiIdentifier\r
);\r
\r
Status = gBS->OpenProtocol (\r
IScsiController,\r
- &gIScsiPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **)&IScsiIdentifier,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
//\r
gBS->UninstallProtocolInterface (\r
IScsiController,\r
- &gIScsiPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
&Private->IScsiIdentifier\r
);\r
\r
/** @file\r
The header file of IScsiDriver.c.\r
\r
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
#include <Protocol/DriverBinding.h>\r
#include <Protocol/ScsiPassThruExt.h>\r
\r
-#define ISCSI_PRIVATE_GUID \\r
- { 0xfa3cde4c, 0x87c2, 0x427d, {0xae, 0xde, 0x7d, 0xd0, 0x96, 0xc8, 0x8c, 0x58} }\r
-\r
#define ISCSI_INITIATOR_NAME_VAR_NAME L"I_NAME"\r
\r
-extern EFI_GUID gIScsiPrivateGuid;\r
-\r
typedef struct _ISCSI_PRIVATE_PROTOCOL {\r
UINT32 Reserved;\r
} ISCSI_PRIVATE_PROTOCOL;\r
## @file\r
# Component description file for IScsi module.\r
#\r
-# Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
# 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
gEfiIfrTianoGuid ## CONSUMES ## GUID\r
gEfiAcpiTableGuid ## CONSUMES ## GUID\r
gEfiAcpi10TableGuid ## CONSUMES ## GUID\r
- gEfiAcpi20TableGuid ## CONSUMES ## GUID
\ No newline at end of file
+ gEfiAcpi20TableGuid ## CONSUMES ## GUID\r
+ gIp4IScsiConfigGuid ## PRODUCES ## GUID\r
+ gIScsiCHAPAuthInfoGuid
\ No newline at end of file
/** @file\r
Implementation for iSCSI Boot Firmware Table publication.\r
\r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
//\r
// Get the identifier from the handle.\r
//\r
- Status = gBS->HandleProtocol (Handle, &gIScsiPrivateGuid, (VOID **) &IScsiIdentifier);\r
+ Status = gBS->HandleProtocol (Handle, &gEfiCallerIdGuid, (VOID **) &IScsiIdentifier);\r
if (EFI_ERROR (Status)) {\r
ASSERT (FALSE);\r
return ;\r
SectionOffset = &Control->NIC0Offset;\r
\r
for (Index = 0; Index < HandleCount; Index++) {\r
- Status = gBS->HandleProtocol (Handles[Index], &gIScsiPrivateGuid, (VOID **)&IScsiIdentifier);\r
+ Status = gBS->HandleProtocol (Handles[Index], &gEfiCallerIdGuid, (VOID **)&IScsiIdentifier);\r
if (EFI_ERROR (Status)) {\r
ASSERT (FALSE);\r
return ;\r
//\r
Status = gBS->LocateHandleBuffer (\r
ByProtocol,\r
- &gIScsiPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
NULL,\r
&HandleCount,\r
&HandleBuffer\r
/** @file\r
Miscellaneous routines for iSCSI driver.\r
\r
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
BufferSize = sizeof (Session->AuthData.AuthConfig);\r
Status = gRT->GetVariable (\r
MacString,\r
- &mIScsiCHAPAuthInfoGuid,\r
+ &gIScsiCHAPAuthInfoGuid,\r
NULL,\r
&BufferSize,\r
&Session->AuthData.AuthConfig\r
## @file\r
# Component name for module Ip4Config\r
#\r
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
\r
[Guids]\r
gEfiNicIp4ConfigVariableGuid ## CONSUMES ## Guid\r
-\r
+ gNicIp4ConfigNvDataGuid ## PRODUCES ## Guid\r
#include "Ip4ConfigNv.h"\r
#include "NicIp4Variable.h"\r
\r
-EFI_GUID mNicIp4ConfigNvDataGuid = EFI_NIC_IP4_CONFIG_NVDATA_GUID;\r
-\r
-\r
/**\r
Calculate the prefix length of the IPv4 subnet mask.\r
\r
}\r
}\r
\r
- if ((Request == NULL) || HiiIsConfigHdrMatch (Request, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
+ if ((Request == NULL) || HiiIsConfigHdrMatch (Request, &gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
\r
IfrFormNvData = AllocateZeroPool (sizeof (IP4_CONFIG_IFR_NVDATA));\r
if (IfrFormNvData == NULL) {\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, Ip4ConfigInstance->ChildHandle);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, Ip4ConfigInstance->ChildHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
FreePool (FormResult);\r
} else if (HiiIsConfigHdrMatch (Request, &gEfiNicIp4ConfigVariableGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
*Results = DeviceResult;\r
- } else if (HiiIsConfigHdrMatch (Request, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
+ } else if (HiiIsConfigHdrMatch (Request, &gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
*Results = FormResult;\r
} else {\r
return EFI_NOT_FOUND;\r
//\r
// Check Routing data in <ConfigHdr>.\r
//\r
- if (HiiIsConfigHdrMatch (Configuration, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
+ if (HiiIsConfigHdrMatch (Configuration, &gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {\r
//\r
// Convert buffer data to <ConfigResp> by helper function BlockToConfig()\r
//\r
//\r
// Retrive uncommitted data from Browser\r
//\r
- if (!HiiGetBrowserData (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, sizeof (IP4_CONFIG_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {\r
+ if (!HiiGetBrowserData (&gNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, sizeof (IP4_CONFIG_IFR_NVDATA), (UINT8 *) IfrFormNvData)) {\r
FreePool (IfrFormNvData);\r
return EFI_NOT_FOUND;\r
}\r
// Publish our HII data\r
//\r
Instance->RegisteredHandle = HiiAddPackages (\r
- &mNicIp4ConfigNvDataGuid,\r
+ &gNicIp4ConfigNvDataGuid,\r
Instance->ChildHandle,\r
Ip4ConfigDxeStrings,\r
Ip4ConfigDxeBin,\r
/** @file\r
Routines used to operate the Ip4 configure variable.\r
\r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
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<BR>\r
#ifndef _NIC_IP4_NV_DATA_H_\r
#define _NIC_IP4_NV_DATA_H_\r
\r
-#define EFI_NIC_IP4_CONFIG_NVDATA_GUID \\r
- { \\r
- 0x9d5b53f, 0xf4b0, 0x4f59, { 0xa0, 0xb1, 0x7b, 0x57, 0xd3, 0x5c, 0xe, 0x5 } \\r
- }\r
+#include <Guid/Ip4ConfigHii.h>\r
\r
#define FORMID_MAIN_FORM 1\r
#define FORMID_DEVICE_FORM 2\r
#include "VlanConfigNvData.h"\r
\r
formset\r
- guid = VLAN_CONFIG_PRIVATE_GUID,\r
+ guid = VLAN_CONFIG_FORM_SET_GUID,\r
title = STRING_TOKEN(STR_VLAN_FORM_SET_TITLE),\r
help = STRING_TOKEN(STR_VLAN_FORM_SET_TITLE_HELP),\r
classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,\r
varstore VLAN_CONFIGURATION,\r
varid = VLAN_CONFIGURATION_VARSTORE_ID,\r
name = VlanNvData,\r
- guid = VLAN_CONFIG_PRIVATE_GUID;\r
+ guid = VLAN_CONFIG_FORM_SET_GUID;\r
\r
form formid = VLAN_HEAD_FORM_ID,\r
title = STRING_TOKEN(STR_VLAN_FORM_TITLE);\r
\r
#include "VlanConfigImpl.h"\r
\r
-EFI_GUID gVlanConfigPrivateGuid = VLAN_CONFIG_PRIVATE_GUID;\r
-\r
EFI_DRIVER_BINDING_PROTOCOL gVlanConfigDriverBinding = {\r
VlanConfigDriverBindingSupported,\r
VlanConfigDriverBindingStart,\r
//\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
- &gVlanConfigPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &PrivateData,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
//\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&ControllerHandle,\r
- &gVlanConfigPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
PrivateData,\r
NULL\r
);\r
//\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
- &gVlanConfigPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
(VOID **) &PrivateData,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
//\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
ControllerHandle,\r
- &gVlanConfigPrivateGuid,\r
+ &gEfiCallerIdGuid,\r
PrivateData,\r
NULL\r
);\r
\r
[Guids]\r
gEfiIfrTianoGuid\r
+ gVlanConfigFormSetGuid\r
\r
[Protocols]\r
gEfiHiiConfigAccessProtocolGuid ## PRODUCES\r
\r
#include "VlanConfigImpl.h"\r
\r
-EFI_GUID mVlanFormSetGuid = VLAN_CONFIG_PRIVATE_GUID;\r
CHAR16 mVlanStorageName[] = L"VlanNvData";\r
EFI_HII_CONFIG_ROUTING_PROTOCOL *mHiiConfigRouting = NULL;\r
\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- VLAN_CONFIG_PRIVATE_GUID\r
+ VLAN_CONFIG_FORM_SET_GUID\r
};\r
\r
/**\r
}\r
\r
*Progress = Request;\r
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVlanFormSetGuid, mVlanStorageName)) {\r
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gVlanConfigFormSetGuid, mVlanStorageName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mVlanFormSetGuid, mVlanStorageName, PrivateData->DriverHandle);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gVlanConfigFormSetGuid, mVlanStorageName, PrivateData->DriverHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
}\r
\r
*Progress = Configuration;\r
- if (!HiiIsConfigHdrMatch (Configuration, &mVlanFormSetGuid, mVlanStorageName)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gVlanConfigFormSetGuid, mVlanStorageName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
//\r
Configuration = AllocateZeroPool (sizeof (VLAN_CONFIGURATION));\r
ASSERT (Configuration != NULL);\r
- HiiGetBrowserData (&mVlanFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration);\r
+ HiiGetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration);\r
\r
VlanConfig = PrivateData->VlanConfig;\r
\r
break;\r
}\r
\r
- HiiSetBrowserData (&mVlanFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);\r
+ HiiSetBrowserData (&gVlanConfigFormSetGuid, mVlanStorageName, sizeof (VLAN_CONFIGURATION), (UINT8 *) Configuration, NULL);\r
FreePool (Configuration);\r
return EFI_SUCCESS;\r
}\r
\r
HiiUpdateForm (\r
PrivateData->HiiHandle, // HII handle\r
- &mVlanFormSetGuid, // Formset GUID\r
+ &gVlanConfigFormSetGuid, // Formset GUID\r
VLAN_CONFIGURATION_FORM_ID, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
EndOpCodeHandle // Replace data\r
// Publish the HII package list\r
//\r
HiiHandle = HiiAddPackages (\r
- &mVlanFormSetGuid,\r
+ &gVlanConfigFormSetGuid,\r
DriverHandle,\r
VlanConfigDxeStrings,\r
VlanConfigBin,\r
#define __VLAN_CONFIG_NV_DATA_H__\r
\r
#include <Guid/HiiPlatformSetupFormset.h>\r
-\r
-\r
-#define VLAN_CONFIG_PRIVATE_GUID \\r
- { \\r
- 0xd79df6b0, 0xef44, 0x43bd, {0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 } \\r
- }\r
+#include <Guid/VlanConfigHii.h>\r
\r
#define VLAN_CONFIGURATION_VARSTORE_ID 0x0001\r
#define VLAN_CONFIGURATION_FORM_ID 0x0001\r
//\r
// module global data\r
//\r
-EFI_GUID mPlatformOverridesManagerGuid = PLAT_OVER_MNGR_GUID;\r
CHAR16 mVariableName[] = L"Data";\r
LIST_ENTRY mMappingDataBase = INITIALIZE_LIST_HEAD_VARIABLE (mMappingDataBase);\r
BOOLEAN mEnvironmentVariableRead = FALSE;\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- EFI_CALLER_ID_GUID\r
+ PLAT_OVER_MNGR_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_DEVICE,\r
StartOpCodeHandle, // Label FORM_ID_DEVICE\r
EndOpCodeHandle // LABEL_END\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_DEVICE,\r
StartOpCodeHandle, // Label FORM_ID_DEVICE\r
EndOpCodeHandle // LABEL_END\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_DRIVER,\r
StartOpCodeHandle,\r
EndOpCodeHandle\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_DRIVER,\r
StartOpCodeHandle, // Label FORM_ID_DRIVER\r
EndOpCodeHandle // LABEL_END\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_ORDER,\r
StartOpCodeHandle,\r
EndOpCodeHandle\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_ORDER,\r
StartOpCodeHandle, // Label FORM_ID_ORDER\r
EndOpCodeHandle // LABEL_END\r
}\r
\r
*Progress = Request;\r
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mPlatformOverridesManagerGuid, mVariableName)) {\r
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gPlatformOverridesManagerGuid, mVariableName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mPlatformOverridesManagerGuid, mVariableName, Private->DriverHandle);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gPlatformOverridesManagerGuid, mVariableName, Private->DriverHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
}\r
*Progress = Configuration;\r
\r
- if (!HiiIsConfigHdrMatch (Configuration, &mPlatformOverridesManagerGuid, mVariableName)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gPlatformOverridesManagerGuid, mVariableName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
*Progress = Configuration + StrLen (Configuration);\r
Private = EFI_CALLBACK_INFO_FROM_THIS (This);\r
FakeNvData = &Private->FakeNvData;\r
- if (!HiiGetBrowserData (&mPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData)) {\r
+ if (!HiiGetBrowserData (&gPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData)) {\r
//\r
// FakeNvData can't be got from SetupBrowser, which doesn't need to be set.\r
//\r
if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
Private = EFI_CALLBACK_INFO_FROM_THIS (This);\r
FakeNvData = &Private->FakeNvData;\r
- if (!HiiGetBrowserData (&mPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData)) {\r
+ if (!HiiGetBrowserData (&gPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
//\r
// Pass changed uncommitted data back to Form Browser\r
//\r
- HiiSetBrowserData (&mPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData, NULL);\r
+ HiiSetBrowserData (&gPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData, NULL);\r
\r
return EFI_SUCCESS;\r
} \r
// Publish our HII data\r
//\r
mCallbackInfo->RegisteredHandle = HiiAddPackages (\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
mCallbackInfo->DriverHandle,\r
VfrBin,\r
PlatDriOverrideDxeStrings,\r
The defintions are required both by Source code and Vfr file.\r
The PLAT_OVER_MNGR_DATA structure, form guid and Ifr question ID are defined. \r
\r
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
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
#ifndef _PLAT_OVER_MNGR_H_\r
#define _PLAT_OVER_MNGR_H_\r
\r
-#define PLAT_OVER_MNGR_GUID \\r
- { \\r
- 0x8614567d, 0x35be, 0x4415, {0x8d, 0x88, 0xbd, 0x7d, 0xc, 0x9c, 0x70, 0xc0} \\r
- }\r
+#include <Guid/PlatDriOverrideHii.h>\r
\r
//\r
// The max number of the supported driver list.\r
# 4. It save all the mapping info in NV variables for the following boot, \r
# which will be consumed by GetDriver API of the produced the platform override protocol.\r
#\r
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
#\r
# gEfiCallerIdGuid ## Private ## Variable:L"PlatDriOver"\r
gEfiIfrTianoGuid ## CONSUMES ## Guid\r
+ gPlatformOverridesManagerGuid ## PRODUCES ## Guid\r
\r
[Protocols]\r
gEfiComponentName2ProtocolGuid ## SOMETIMES_CONSUMED (Get Driver Name if ComponentName2Protocol exists)\r
projects / mirror_edk2.git / commitdiff