From 1ccdbf2a3e61fe9494fcd39432107ba0eb74f584 Mon Sep 17 00:00:00 2001 From: rsun3 Date: Tue, 19 Jan 2010 06:42:21 +0000 Subject: Improve coding style in MdeModulePkg. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9793 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 11 +++++++---- MdeModulePkg/Universal/SetupBrowserDxe/Ui.h | 9 +++++---- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'MdeModulePkg/Universal/SetupBrowserDxe') diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index cf0dd00cc5..77c6ff984f 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -316,6 +316,12 @@ typedef struct { #define QUESTION_OPTION_FROM_LINK(a) CR (a, QUESTION_OPTION, Link, QUESTION_OPTION_SIGNATURE) #define FORM_BROWSER_STATEMENT_SIGNATURE SIGNATURE_32 ('F', 'S', 'T', 'A') + +typedef union { + EFI_STRING_ID VarName; + UINT16 VarOffset; +} VAR_STORE_INFO; + typedef struct { UINTN Signature; LIST_ENTRY Link; @@ -335,10 +341,7 @@ typedef struct { EFI_QUESTION_ID QuestionId; // The value of zero is reserved EFI_VARSTORE_ID VarStoreId; // A value of zero indicates no variable storage FORMSET_STORAGE *Storage; - union { - EFI_STRING_ID VarName; - UINT16 VarOffset; - } VarStoreInfo; + VAR_STORE_INFO VarStoreInfo; UINT16 StorageWidth; UINT8 QuestionFlags; CHAR16 *VariableName; // Name/Value or EFI Variable name diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h index bd75714f7f..6fb3d9369a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h @@ -1,7 +1,7 @@ /** @file Private structure, MACRO and function definitions for User Interface related functionalities. -Copyright (c) 2004 - 2009, Intel Corporation +Copyright (c) 2004 - 2010, 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 @@ -168,14 +168,15 @@ struct _UI_MENU_LIST { #define UI_MENU_LIST_FROM_LINK(a) CR (a, UI_MENU_LIST, Link, UI_MENU_LIST_SIGNATURE) -typedef struct _MENU_REFRESH_ENTRY { - struct _MENU_REFRESH_ENTRY *Next; +typedef struct _MENU_REFRESH_ENTRY MENU_REFRESH_ENTRY; +struct _MENU_REFRESH_ENTRY { + MENU_REFRESH_ENTRY *Next; UI_MENU_OPTION *MenuOption; // Describes the entry needing an update UI_MENU_SELECTION *Selection; UINTN CurrentColumn; UINTN CurrentRow; UINTN CurrentAttribute; -} MENU_REFRESH_ENTRY; +}; typedef struct { UINT16 ScanCode; -- cgit v1.2.3