1. Fix EDKT273 "Externs are not being grouped together in MSA Files"

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / common / EnumerationData.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
index 99f40384a3e0cfb2b9a49fd3ca902ebb166f16af..680bd65c50439e10237b0b8936ba776b638d1762 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
@@ -24,19 +24,23 @@ public class EnumerationData {
     \r
     public final static String EXTERNS_SPECIFICATION = "Specification";\r
     \r
+    public final static String EXTERNS_IMAGE = "Image";\r
     public final static String EXTERNS_MODULE_ENTRY_POINT = "ModuleEntryPoint";\r
     public final static String EXTERNS_MODULE_UNLOAD_IMAGE = "ModuleUnloadImage";\r
     \r
+    public final static String EXTERNS_LIBRARY = "Library";\r
     public final static String EXTERNS_CONSTRUCTOR = "Constructor";\r
     public final static String EXTERNS_DESTRUCTOR = "Destructor";\r
     \r
+    public final static String EXTERNS_DRIVER = "Driver";\r
     public final static String EXTERNS_DRIVER_BINDING = "DriverBinding";\r
     public final static String EXTERNS_COMPONENT_NAME = "ComponentName";\r
     public final static String EXTERNS_DRIVER_CONFIG = "DriverConfig";\r
     public final static String EXTERNS_DRIVER_DIAG = "DriverDiag";\r
     \r
-    public final static String EXTERNS_SET_VIRTUAL_ADDRESS_MAP_CALL_BACK = "SetVirtualAddressMapCallBack";\r
-    public final static String EXTERNS_EXIT_BOOT_SERVICES_CALL_BACK = "ExitBootServicesCallBack";\r
+    public final static String EXTERNS_CALL_BACK = "Call Back";\r
+    public final static String EXTERNS_VIRTUAL_ADDRESS_MAP_CALL_BACK = "VirtualAddressMap";\r
+    public final static String EXTERNS_EXIT_BOOT_SERVICES_CALL_BACK = "ExitBootServices";\r
     \r
     //\r
     // Common data\r
@@ -669,28 +673,33 @@ public class EnumerationData {
     private void initExternTypes() {\r
         vExternTypes.removeAllElements();\r
         \r
-        vExternTypes.addElement(EnumerationData.EXTERNS_PCD_IS_DRIVER);\r
-\r
         vExternTypes.addElement(EnumerationData.EXTERNS_SPECIFICATION);\r
+        vExternTypes.addElement(EnumerationData.EXTERNS_IMAGE);\r
+        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER);\r
+        vExternTypes.addElement(EnumerationData.EXTERNS_LIBRARY);\r
+        vExternTypes.addElement(EnumerationData.EXTERNS_CALL_BACK);\r
         \r
-        vExternTypes.addElement(EnumerationData.EXTERNS_MODULE_ENTRY_POINT);\r
-        vExternTypes.addElement(EnumerationData.EXTERNS_MODULE_UNLOAD_IMAGE);\r
-        \r
-        vExternTypes.addElement(EnumerationData.EXTERNS_CONSTRUCTOR);\r
-        vExternTypes.addElement(EnumerationData.EXTERNS_DESTRUCTOR);\r
-        \r
-        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_BINDING);\r
-        vExternTypes.addElement(EnumerationData.EXTERNS_COMPONENT_NAME);\r
-        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_CONFIG);\r
-        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_DIAG);\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_PCD_IS_DRIVER);\r
+//\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_SPECIFICATION);\r
+//        \r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_MODULE_ENTRY_POINT);\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_MODULE_UNLOAD_IMAGE);\r
+//        \r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_CONSTRUCTOR);\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_DESTRUCTOR);\r
         \r
-        vExternTypes.addElement(EnumerationData.EXTERNS_SET_VIRTUAL_ADDRESS_MAP_CALL_BACK);\r
-        vExternTypes.addElement(EnumerationData.EXTERNS_EXIT_BOOT_SERVICES_CALL_BACK);\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_BINDING);\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_COMPONENT_NAME);\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_CONFIG);\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_DIAG);\r
+//        \r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_SET_VIRTUAL_ADDRESS_MAP_CALL_BACK);\r
+//        vExternTypes.addElement(EnumerationData.EXTERNS_EXIT_BOOT_SERVICES_CALL_BACK);\r
     }\r
     \r
     private void initPcdDriverTypes() {\r
-        vPcdDriverTypes.removeAllElements();\r
-        vPcdDriverTypes.addElement(DataType.EMPTY_SELECT_ITEM);\r
+        vPcdDriverTypes.removeAllElements();        \r
         vPcdDriverTypes.addElement("PEI_PCD_DRIVER");\r
         vPcdDriverTypes.addElement("DXE_PCD_DRIVER");\r
     }\r