\r
**/\r
\r
-#ifndef _DRIVER_SAMPLE_H\r
-#define _DRIVER_SAMPLE_H\r
+#ifndef _DRIVER_SAMPLE_H_\r
+#define _DRIVER_SAMPLE_H_\r
\r
#include <Uefi.h>\r
\r
#include <Protocol/HiiDatabase.h>\r
#include <Protocol/HiiString.h>\r
\r
+#include <Guid/MdeModuleHii.h>\r
#include <Library/DebugLib.h>\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/UefiRuntimeServicesTableLib.h>\r
#include <Library/HiiLib.h>\r
#include <Library/ExtendedHiiLib.h>\r
\r
-#include <MdeModuleHii.h>\r
-\r
-\r
#include "NVDataStruc.h"\r
\r
//\r
//\r
extern UINT8 DriverSampleStrings[];\r
\r
-#define VAR_OFFSET(Field) \\r
- ((UINT16) ((UINTN) &(((DRIVER_SAMPLE_CONFIGURATION *) 0)->Field)))\r
-\r
-#define DYNAMIC_ONE_OF_VAR_OFFSET VAR_OFFSET (DynamicOneof)\r
-#define DYNAMIC_ORDERED_LIST_VAR_OFFSET VAR_OFFSET (DynamicOrderedList)\r
+#define DYNAMIC_ONE_OF_VAR_OFFSET OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, DynamicOneof)\r
+#define DYNAMIC_ORDERED_LIST_VAR_OFFSET OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, DynamicOrderedList)\r
\r
-#define DRIVER_SAMPLE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('D', 'S', 'p', 's')\r
+#define DRIVER_SAMPLE_PRIVATE_SIGNATURE SIGNATURE_32 ('D', 'S', 'p', 's')\r
\r
typedef struct {\r
UINTN Signature;\r