Clean up to update the reference of the these macros:

[mirror_edk2.git] / MdeModulePkg / Universal / BdsDxe / BootMaint / BootMaint.h

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index 70335a6f9acdc7b707129ee3bf80cd93ba5c5247..03b61afdb97a0b8c691b4c0e31df6d7faa1c7e55 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -82,7 +82,7 @@ extern UINT8    FEBin[];
 //\r
 // Callback function helper\r
 //\r
-#define BMM_CALLBACK_DATA_SIGNATURE     EFI_SIGNATURE_32 ('C', 'b', 'c', 'k')\r
+#define BMM_CALLBACK_DATA_SIGNATURE     SIGNATURE_32 ('C', 'b', 'c', 'k')\r
 #define BMM_CALLBACK_DATA_FROM_THIS(a)  CR (a, BMM_CALLBACK_DATA, BmmConfigAccess, BMM_CALLBACK_DATA_SIGNATURE)\r
 \r
 #define FE_CALLBACK_DATA_FROM_THIS(a)   CR (a, BMM_CALLBACK_DATA, FeConfigAccess, BMM_CALLBACK_DATA_SIGNATURE)\r
@@ -144,13 +144,13 @@ typedef enum {
 //\r
 // All of the signatures that will be used in list structure\r
 //\r
-#define BM_MENU_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('m', 'e', 'n', 'u')\r
-#define BM_LOAD_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('l', 'o', 'a', 'd')\r
-#define BM_CONSOLE_OPTION_SIGNATURE   EFI_SIGNATURE_32 ('c', 'n', 's', 'l')\r
-#define BM_FILE_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('f', 'i', 'l', 'e')\r
-#define BM_HANDLE_OPTION_SIGNATURE    EFI_SIGNATURE_32 ('h', 'n', 'd', 'l')\r
-#define BM_TERMINAL_OPTION_SIGNATURE  EFI_SIGNATURE_32 ('t', 'r', 'm', 'l')\r
-#define BM_MENU_ENTRY_SIGNATURE       EFI_SIGNATURE_32 ('e', 'n', 't', 'r')\r
+#define BM_MENU_OPTION_SIGNATURE      SIGNATURE_32 ('m', 'e', 'n', 'u')\r
+#define BM_LOAD_OPTION_SIGNATURE      SIGNATURE_32 ('l', 'o', 'a', 'd')\r
+#define BM_CONSOLE_OPTION_SIGNATURE   SIGNATURE_32 ('c', 'n', 's', 'l')\r
+#define BM_FILE_OPTION_SIGNATURE      SIGNATURE_32 ('f', 'i', 'l', 'e')\r
+#define BM_HANDLE_OPTION_SIGNATURE    SIGNATURE_32 ('h', 'n', 'd', 'l')\r
+#define BM_TERMINAL_OPTION_SIGNATURE  SIGNATURE_32 ('t', 'r', 'm', 'l')\r
+#define BM_MENU_ENTRY_SIGNATURE       SIGNATURE_32 ('e', 'n', 't', 'r')\r
 \r
 #define BM_LOAD_CONTEXT_SELECT        0x0\r
 #define BM_CONSOLE_CONTEXT_SELECT     0x1\r
@@ -366,7 +366,7 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL          *DevicePath;\r
   EFI_FILE_HANDLE                   FHandle;\r
   UINT16                            *FileName;\r
-  EFI_FILE_SYSTEM_VOLUME_LABEL_INFO *Info;\r
+  EFI_FILE_SYSTEM_VOLUME_LABEL      *Info;\r
 \r
   BOOLEAN                           IsRoot;\r
   BOOLEAN                           IsDir;\r
@@ -467,8 +467,7 @@ typedef struct _STRING_DEPOSITORY {
 EFI_STATUS\r
 BOpt_FindFileSystem (\r
   IN BMM_CALLBACK_DATA          *CallbackData\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Find files under current directory\r
@@ -486,8 +485,7 @@ EFI_STATUS
 BOpt_FindFiles (\r
   IN BMM_CALLBACK_DATA          *CallbackData,\r
   IN BM_MENU_ENTRY              *MenuEntry\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
 \r
@@ -503,8 +501,7 @@ BOpt_FindFiles (
 EFI_STATUS\r
 BOpt_FindDrivers (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
 \r
@@ -776,8 +773,7 @@ FreeAllConsoles (
 VOID\r
 ChangeVariableDevicePath (\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Update the multi-instance device path of Terminal Device based on\r
@@ -1285,7 +1281,7 @@ EfiLibOpenRoot (
   @retval                NULL is returned if failed to get Vaolume Label Info.\r
 \r
 **/\r
-EFI_FILE_SYSTEM_VOLUME_LABEL_INFO *\r
+EFI_FILE_SYSTEM_VOLUME_LABEL *\r
 EfiLibFileSystemVolumeLabelInfo (\r
   IN EFI_FILE_HANDLE      FHand\r
   );\r