BaseTools/GenFds: factor out Region.PadBuffer() method

The same logic is used in five places; factor it out to a common method.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index 6015e24e25a52b3262b0b407b559d30e775f3aa3..6769b39ba7e83ee976a21a54449771c307bd2fb7 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -39,6 +39,25 @@ class Region(RegionClassObject):
         RegionClassObject.__init__(self)\r
 \r
 \r
+    ## PadBuffer()\r
+    #\r
+    #   Add padding bytes to the Buffer\r
+    #\r
+    #   @param Buffer         The buffer the generated region data will be put\r
+    #                         in\r
+    #   @param ErasePolarity  Flash erase polarity\r
+    #   @param Size           Number of padding bytes requested\r
+    #\r
+\r
+    def PadBuffer(self, Buffer, ErasePolarity, Size):\r
+        if Size > 0:\r
+            if (ErasePolarity == '1') :\r
+                PadData = 0xFF\r
+            else:\r
+                PadData = 0\r
+            for i in range(0, Size):\r
+                Buffer.write(pack('B', PadData))\r
+\r
     ## AddToBuffer()\r
     #\r
     #   Add region data to the Buffer\r
@@ -135,13 +154,7 @@ class Region(RegionClassObject):
             #\r
             # Pad the left buffer\r
             #\r
-            if Size > 0:\r
-                if (ErasePolarity == '1') :\r
-                    PadData = 0xFF\r
-                else :\r
-                    PadData = 0\r
-                for i in range(0, Size):\r
-                    Buffer.write(pack('B', PadData))\r
+            self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
         if self.RegionType == 'CAPSULE':\r
             #\r
@@ -194,13 +207,7 @@ class Region(RegionClassObject):
             #\r
             # Pad the left buffer\r
             #\r
-            if Size > 0:\r
-                if (ErasePolarity == '1') :\r
-                    PadData = 0xFF\r
-                else :\r
-                    PadData = 0\r
-                for i in range(0, Size):\r
-                    Buffer.write(pack('B', PadData))\r
+            self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
         if self.RegionType in ('FILE', 'INF'):\r
             for RegionData in self.RegionDataList:\r
@@ -232,13 +239,7 @@ class Region(RegionClassObject):
             #\r
             # Pad the left buffer\r
             #\r
-            if Size > 0:\r
-                if (ErasePolarity == '1') :\r
-                    PadData = 0xFF\r
-                else :\r
-                    PadData = 0\r
-                for i in range(0, Size):\r
-                    Buffer.write(pack('B', PadData))\r
+            self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
         if self.RegionType == 'DATA' :\r
             GenFdsGlobalVariable.InfLogger('   Region Name = DATA')\r
@@ -255,22 +256,11 @@ class Region(RegionClassObject):
             #\r
             # Pad the left buffer\r
             #\r
-            if Size > 0:\r
-                if (ErasePolarity == '1') :\r
-                    PadData = 0xFF\r
-                else :\r
-                    PadData = 0\r
-                for i in range(0, Size):\r
-                    Buffer.write(pack('B', PadData))\r
+            self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
         if self.RegionType == None:\r
             GenFdsGlobalVariable.InfLogger('   Region Name = None')\r
-            if (ErasePolarity == '1') :\r
-                PadData = 0xFF\r
-            else :\r
-                PadData = 0\r
-            for i in range(0, Size):\r
-                Buffer.write(pack('B', PadData))\r
+            self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
     def GetFvAlignValue(self, Str):\r
         AlignValue = 1\r