From a2733a33abc5f2b518cf21eace46059cf4a98570 Mon Sep 17 00:00:00 2001
From: qouyang <qouyang@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 10 Aug 2006 06:09:10 +0000
Subject: [PATCH] Fix EDKT186. Fix EDKT148.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1230 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../org/tianocore/build/autogen/AutoGen.java  | 21 +++++++++++++++++++
 Tools/Source/TianoTools/FlashMap/FlashMap.c   |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 31a09dd3d2..2d7bb0901c 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -1772,6 +1772,27 @@ public class AutoGen {
 	 */
 	void ExternCallBackToAutoGenC(StringBuffer fileBuffer)
 			throws BuildException {
+		//
+		// Collect module's <SetVirtualAddressMapCallBack> and 
+		// <ExitBootServiceCallBack> and add to setVirtualAddList 
+		//  exitBootServiceList.
+		// 
+        String[] setVirtuals = SurfaceAreaQuery.getSetVirtualAddressMapCallBackArray();
+        String[] exitBoots = SurfaceAreaQuery.getExitBootServicesCallBackArray();
+        if (setVirtuals != null) {
+            for (int j = 0; j < setVirtuals.length; j++) {
+			    this.setVirtalAddList.add(setVirtuals[j]);
+			}
+		}
+		if (exitBoots != null) {
+		    for (int k = 0; k < exitBoots.length; k++) {
+			    this.exitBootServiceList.add(exitBoots[k]);
+			}
+		}
+		//
+		//  Add c code in autogen.c which relate to <SetVirtualAddressMapCallBack>
+		//  and <ExitBootServicesCallBack> 
+		// 
 		String moduleType = this.moduleId.getModuleType();
 		boolean UefiOrDxeModule = false;
 		int Count = 0;
diff --git a/Tools/Source/TianoTools/FlashMap/FlashMap.c b/Tools/Source/TianoTools/FlashMap/FlashMap.c
index 110ebc4931..88f5003d2d 100644
--- a/Tools/Source/TianoTools/FlashMap/FlashMap.c
+++ b/Tools/Source/TianoTools/FlashMap/FlashMap.c
@@ -764,6 +764,6 @@ NormalizePath (
     Visitor++;
   }
   
-  return Visitor;
+  return OldPathName;
 }
 
-- 
2.39.2