X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fautogen%2FAutoGen.java;h=7953f5ce1218516fd9903b33dacc61c5ddca191d;hp=98737ba2bf778b4eeee76a5e06a10325f0903e66;hb=a30ae9faeaafd760cc4a41a2abffcfd2b28742c1;hpb=149127db682552971634ad1017c522808367acc3

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 98737ba2bf..7953f5ce12 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -120,6 +120,7 @@ public class AutoGen {
     private List<String> exitBootServiceList = new ArrayList<String>();
 
     private StringBuffer functionDeclarations = new StringBuffer(10240);
+    private StringBuffer globalDeclarations = new StringBuffer(10240);
 
     //
     // flag of PcdComponentNameDisable, PcdDriverDiagnosticDisable 
@@ -384,6 +385,7 @@ public class AutoGen {
             fileBuffer.append(this.myPcdAutogen.getHAutoGenString());
         }
 
+        fileBuffer.append(globalDeclarations);
         fileBuffer.append(functionDeclarations);
         //
         // Append the #endif at AutoGen.h
@@ -1105,8 +1107,7 @@ public class AutoGen {
                     fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");
                     fileBuffer.append("    ProcessLibraryDestructorList (gImageHandle, gST);\r\n");
                     fileBuffer.append("  }\r\n");
-                    fileBuffer
-                    .append("  gBS->Exit (gImageHandle, Status, 0, NULL);\r\n");
+                    fileBuffer.append("  gBS->Exit (gImageHandle, Status, 0, NULL);\r\n");
                 } else {
                     fileBuffer.append("  if (!EFI_ERROR (Status) || EFI_ERROR (mDriverEntryPointStatus)) {\r\n");
                     fileBuffer.append("    mDriverEntryPointStatus = Status;\r\n");
@@ -1589,8 +1590,7 @@ public class AutoGen {
         case CommonDefinition.ModuleTypePeiCore:
         case CommonDefinition.ModuleTypePeim:
             fileBuffer.append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");
-            fileBuffer
-            .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");
+            fileBuffer.append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");
             break;
 
         case CommonDefinition.ModuleTypeDxeCore:
@@ -1798,9 +1798,9 @@ public class AutoGen {
         //
         for (int i = 0; i < driverBindingGroup.length; i++) {
             if (driverBindingGroup[i][0] != null) {
-                fileBuffer.append("extern EFI_DRIVER_BINDING_PROTOCOL ");
-                fileBuffer.append(driverBindingGroup[i][0]);
-                fileBuffer.append(";\r\n");
+                globalDeclarations.append("extern EFI_DRIVER_BINDING_PROTOCOL ");
+                globalDeclarations.append(driverBindingGroup[i][0]);
+                globalDeclarations.append(";\r\n");
             }
         }
 
@@ -1812,9 +1812,9 @@ public class AutoGen {
                 if (driverBindingGroup[i][1]!= null) {
                     if (driverBindingGroup[i][0] != null) {
                         BitMask |= 0x01;
-                        fileBuffer.append("extern EFI_COMPONENT_NAME_PROTOCOL ");
-                        fileBuffer.append(driverBindingGroup[i][1]);
-                        fileBuffer.append(";\r\n");
+                        globalDeclarations.append("extern EFI_COMPONENT_NAME_PROTOCOL ");
+                        globalDeclarations.append(driverBindingGroup[i][1]);
+                        globalDeclarations.append(";\r\n");
                     } else {
                         throw new AutoGenException("DriverBinding can't be empty!!");
                     }
@@ -1829,9 +1829,9 @@ public class AutoGen {
             if (driverBindingGroup[i][2] != null) {
                 if (driverBindingGroup[i][0] != null) {
                     BitMask |= 0x02;
-                    fileBuffer.append("extern EFI_DRIVER_CONFIGURATION_PROTOCOL ");
-                    fileBuffer.append(driverBindingGroup[i][2]);
-                    fileBuffer.append(";\r\n");
+                    globalDeclarations.append("extern EFI_DRIVER_CONFIGURATION_PROTOCOL ");
+                    globalDeclarations.append(driverBindingGroup[i][2]);
+                    globalDeclarations.append(";\r\n");
                 } else {
                     throw new AutoGenException("DriverBinding can't be empty!!");
                 }
@@ -1846,9 +1846,9 @@ public class AutoGen {
                 if (driverBindingGroup[i][3] != null) {
                     if (driverBindingGroup[i][0] != null) {
                         BitMask |= 0x04;
-                        fileBuffer.append("extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL ");
-                        fileBuffer.append(driverBindingGroup[i][3]);
-                        fileBuffer.append(";\r\n");
+                        globalDeclarations.append("extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL ");
+                        globalDeclarations.append(driverBindingGroup[i][3]);
+                        globalDeclarations.append(";\r\n");
                     } else {
                         throw new AutoGenException("DriverBinding can't be empty!!");
                     }