Changed the alignment related member and method to conform to FFS spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1220 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
index 1500fdff6657ee0783f30f2af55683ac3699e797..8e0fb4ab7260a6de2c0b3eb416e0c6a08f52efa8 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
@@ -85,11 +85,11 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
     ///\r
     boolean ffsAttribRecovery        = false;\r
     ///\r
     ///\r
     boolean ffsAttribRecovery        = false;\r
     ///\r

-    /// ffsAligenment value is used to set the corresponding bit in the output \r
+    /// ffsAttribDataAlignment value is used to set the corresponding bit in the output \r

     /// FFS file header.The specified FFS alignment must be a value between 0 \r
     /// and 7 inclusive\r
     ///\r
     /// FFS file header.The specified FFS alignment must be a value between 0 \r
     /// and 7 inclusive\r
     ///\r

-    int     ffsAlignment       = 0;\r
+    int     ffsAttribDataAlignment       = 0;\r

     ///\r
     /// ffsAttribChecksum value is used to set the corresponding bit in the \r
     /// output FFS file header\r
     ///\r
     /// ffsAttribChecksum value is used to set the corresponding bit in the \r
     /// output FFS file header\r


@@ -490,8 +490,8 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
       This function is to get the ffsAligment\r
       @return  The value of ffsAligment.\r
     **/\r
       This function is to get the ffsAligment\r
       @return  The value of ffsAligment.\r
     **/\r

-    public int getFfsAlignment() {\r
-        return this.ffsAlignment;\r
+    public int getFfsAttribDataAlignment() {\r
+        return this.ffsAttribDataAlignment;\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r


@@ -500,12 +500,12 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
       This function is to set ffsAligment \r
       @param  ffsAligment     The value of ffsAligment.\r
     **/\r
       This function is to set ffsAligment \r
       @param  ffsAligment     The value of ffsAligment.\r
     **/\r

-    public void setFfsAlignment(int ffsAligment) {\r
-        this.ffsAlignment = ffsAligment;\r
-        if (this.ffsAlignment > 7) {\r
+    public void setFfsAttribDataAlignment(int ffsAligment) {\r
+        this.ffsAttribDataAlignment = ffsAligment;\r
+        if (this.ffsAttribDataAlignment > 7) {\r

             throw new BuildException ("FFS_ALIGMENT Scope is 0-7");\r
         } else {\r
             throw new BuildException ("FFS_ALIGMENT Scope is 0-7");\r
         } else {\r

-            attributes |= (((byte)this.ffsAlignment) << 3);\r
+            attributes |= (((byte)this.ffsAttribDataAlignment) << 3);\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r