]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Fix issue with fixing tabs.
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 2 Feb 2011 23:19:30 +0000 (23:19 +0000)
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 2 Feb 2011 23:19:30 +0000 (23:19 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11297 6f19259b-4bc3-4df7-8a09-765794883524

73 files changed:
ArmPkg/Drivers/CpuDxe/CpuDxe.h
ArmPkg/Drivers/CpuDxe/Mmu.c
ArmPkg/Drivers/PL34xDmc/PL341Dmc.c
ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c
ArmPkg/Drivers/PL390Gic/PL390GicSec.c
ArmPkg/Include/Drivers/PL341Dmc.h
ArmPkg/Include/Library/L2X0CacheLib.h
ArmPkg/Include/Protocol/VirtualUncachedPages.h
ArmPkg/Library/ArmLib/Arm9/Arm9Support.S
ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm
ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.asm
ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreHelper.S
ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreHelper.asm
ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBox.c
ArmPkg/Library/ArmTrustZoneLib/ArmTrustZone.c
ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.asm
ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.asm
ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.asm
ArmPkg/Library/BdsLib/BdsFilePathFs.c
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm
ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm
ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
ArmPkg/Universal/MmcDxe/Mmc.h
UnixPkg/Include/Common/UnixInclude.h
UnixPkg/Include/Protocol/UnixThunk.h
UnixPkg/Include/Protocol/UnixUgaIo.h
UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c
UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c
UnixPkg/Sec/Gasket.c
UnixPkg/Sec/Ia32/Gasket.S
UnixPkg/Sec/SecMain.c
UnixPkg/Sec/UgaX11.c
UnixPkg/Sec/X64/MangleGasket.S
UnixPkg/Sec/X64/SwitchStack.S
UnixPkg/TimerDxe/Timer.c
UnixPkg/UnixBlockIoDxe/DriverDiagnostics.c
UnixPkg/UnixBlockIoDxe/UnixBlockIo.c
UnixPkg/UnixBusDriverDxe/UnixBusDriver.c
UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.c
UnixPkg/UnixSnpDxe/UnixSnp.c
UnixPkg/UnixSnpDxe/UnixSnp.h

index e11d5d6bf46bfb000d609f08e86c2fb72e2e8887..70f77ca059a4be95fde2ec9784b0767e177a58b0 100644 (file)
@@ -111,8 +111,8 @@ CpuSetMemoryAttributes (
 \r
 EFI_STATUS\r
 InitializeExceptions (\r
-\s\sIN EFI_CPU_ARCH_PROTOCOL    *Cpu\r
-\s\s);\r
+  IN EFI_CPU_ARCH_PROTOCOL    *Cpu\r
+  );\r
 \r
 EFI_STATUS\r
 SyncCacheConfig (\r
index 0b86b8bc981ea50118f453b1fee16e0b8da1b887..9ba5c8344883258cccf20811226ecdd890a9a34a 100644 (file)
@@ -338,11 +338,11 @@ UpdatePageEntries (
       // modify cacheability attributes\r
       EntryMask |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK;\r
       if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) {\r
-\s\s\s\s    // map to strongly ordered\r
-\s\s\s\s    EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0\r
+        // map to strongly ordered\r
+        EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0\r
       } else {\r
-    \s\s  // map to normal non-cachable\r
-    \s\s  EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0\r
+        // map to normal non-cachable\r
+        EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0\r
       }\r
       break;\r
 \r
@@ -486,11 +486,11 @@ UpdateSectionEntries (
       // modify cacheability attributes\r
       EntryMask |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK;\r
       if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) {\r
-\s\s\s\s    // map to strongly ordered\r
-\s\s\s\s    EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0\r
+        // map to strongly ordered\r
+        EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0\r
       } else {\r
-    \s\s  // map to normal non-cachable\r
-    \s\s  EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0\r
+        // map to normal non-cachable\r
+        EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0\r
       }\r
       break;\r
 \r
index 6ba82e12706e45c07154902e2682e05c10639bb4..4a1e1fc87c6a1fedbb108c6c962cf17b13bc6c61 100644 (file)
@@ -64,7 +64,7 @@
 #define DMC_DIRECT_CMD_MEMCMD_NOP               (0x3 << 18)\r
 #define DMC_DIRECT_CMD_MEMCMD_DPD               (0x1 << 22)\r
 #define DMC_DIRECT_CMD_BANKADDR(n)              ((n & 0x3) << 16)\r
-#define DMC_DIRECT_CMD_CHIP_ADDR(n)\s\s\s\s((n & 0x3) << 20)\r
+#define DMC_DIRECT_CMD_CHIP_ADDR(n)    ((n & 0x3) << 20)\r
 \r
 \r
 //\r
@@ -163,25 +163,25 @@ VOID PL341DmcInit(struct pl341_dmc_config *config) {
     //\r
 \r
     if (config->has_qos) {\r
-\s\s// CLCD AXIID = 000\r
-\s\sDmcWriteReg(DMC_ID_0_CFG_REG, DMC_ID_CFG_QOS_ENABLE | DMC_ID_CFG_QOS_MIN);\r
-\r
-\s\s// Default disable QoS\r
-\s\sDmcWriteReg(DMC_ID_1_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_2_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_3_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_4_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_5_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_6_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_7_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_8_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_9_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_10_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_11_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_12_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_13_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_14_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
-\s\sDmcWriteReg(DMC_ID_15_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  // CLCD AXIID = 000\r
+  DmcWriteReg(DMC_ID_0_CFG_REG, DMC_ID_CFG_QOS_ENABLE | DMC_ID_CFG_QOS_MIN);\r
+\r
+  // Default disable QoS\r
+  DmcWriteReg(DMC_ID_1_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_2_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_3_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_4_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_5_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_6_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_7_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_8_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_9_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_10_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_11_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_12_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_13_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_14_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
+  DmcWriteReg(DMC_ID_15_CFG_REG, DMC_ID_CFG_QOS_DISABLE);\r
     }\r
 \r
     //\r
@@ -231,104 +231,104 @@ VOID PL341DmcInit(struct pl341_dmc_config *config) {
     // |======================================\r
     DmcWriteReg(DMC_MEMORY_CFG3_REG, config->memory_cfg3);\r
 \r
-\s\s// |========================================================\r
-\s\s// |Set Test Chip PHY Registers via PL341 User Config Reg\r
-\s\s// |Note that user_cfgX registers are Write Only\r
-\s\s// |\r
-\s\s// |DLL Freq set = 250MHz - 266MHz\r
-\s\s// |======================================================== \r
-\s\sDmcWriteReg(DMC_USER_0_CFG_REG, 0x7C924924);\r
+  // |========================================================\r
+  // |Set Test Chip PHY Registers via PL341 User Config Reg\r
+  // |Note that user_cfgX registers are Write Only\r
+  // |\r
+  // |DLL Freq set = 250MHz - 266MHz\r
+  // |======================================================== \r
+  DmcWriteReg(DMC_USER_0_CFG_REG, 0x7C924924);\r
  \r
-\s\s// user_config2\r
-\s\s// ------------\r
-\s\s// Set defaults before calibrating the DDR2 buffer impendence\r
-\s\s// -Disable ODT\r
-\s\s// -Default drive strengths\r
-\s\sDmcWriteReg(DMC_USER_2_CFG_REG, 0x40000198);\r
+  // user_config2\r
+  // ------------\r
+  // Set defaults before calibrating the DDR2 buffer impendence\r
+  // -Disable ODT\r
+  // -Default drive strengths\r
+  DmcWriteReg(DMC_USER_2_CFG_REG, 0x40000198);\r
  \r
-\s\s// |=======================================================\r
-\s\s// |Auto calibrate the DDR2 buffers impendence \r
-\s\s// |=======================================================\r
-\s\sval32 = DmcReadReg(DMC_USER_STATUS_REG);\r
-\s\swhile (!(val32 & 0x100)) {\r
-\s\s    val32 = DmcReadReg(DMC_USER_STATUS_REG);\r
-\s\s}\r
-\r
-\s\s// Set the output driven strength\r
-\s\sDmcWriteReg(DMC_USER_2_CFG_REG, 0x40800000 | \r
-\s\s\s\s    (TC_UIOLHXC_VALUE << TC_UIOLHNC_SHIFT) | \r
-\s\s\s\s    (TC_UIOLHXC_VALUE << TC_UIOLHPC_SHIFT) |\r
-\s\s\s\s    (0x1 << TC_UIOHOCT_SHIFT) | \r
-\s\s\s\s    (0x1 << TC_UIOHSTOP_SHIFT));\r
-\r
-\s\s// |======================================\r
-\s\s// | Set PL341 Feature Control Register \r
-\s\s// |======================================\r
-\s\s// | Disable early BRESP - use to optimise CLCD performance\r
-\s\sDmcWriteReg(DMC_FEATURE_CRTL_REG, 0x00000001);\r
+  // |=======================================================\r
+  // |Auto calibrate the DDR2 buffers impendence \r
+  // |=======================================================\r
+  val32 = DmcReadReg(DMC_USER_STATUS_REG);\r
+  while (!(val32 & 0x100)) {\r
+      val32 = DmcReadReg(DMC_USER_STATUS_REG);\r
+  }\r
+\r
+  // Set the output driven strength\r
+  DmcWriteReg(DMC_USER_2_CFG_REG, 0x40800000 | \r
+        (TC_UIOLHXC_VALUE << TC_UIOLHNC_SHIFT) | \r
+        (TC_UIOLHXC_VALUE << TC_UIOLHPC_SHIFT) |\r
+        (0x1 << TC_UIOHOCT_SHIFT) | \r
+        (0x1 << TC_UIOHSTOP_SHIFT));\r
+\r
+  // |======================================\r
+  // | Set PL341 Feature Control Register \r
+  // |======================================\r
+  // | Disable early BRESP - use to optimise CLCD performance\r
+  DmcWriteReg(DMC_FEATURE_CRTL_REG, 0x00000001);\r
  \r
     //=================\r
     // Config memories\r
     //=================\r
 \r
     for (chip = 0; chip <= config-> max_chip; chip++) {\r
-\s\s// send nop\r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_NOP);\r
-\s\s// pre-charge all\r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL);\r
-\r
-\s\s// delay\r
-\s\sfor (i = 0; i < 10; i++) {\r
-\s\s    val32 = DmcReadReg(DMC_STATUS_REG);\r
-\s\s}\r
-\r
-\s\s// set (EMR2) extended mode register 2\r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, \r
-\s\s\s\s    DMC_DIRECT_CMD_CHIP_ADDR(chip) | \r
-\s\s\s\s    DMC_DIRECT_CMD_BANKADDR(2) | \r
-\s\s\s\s    DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);\r
-\s\s// set (EMR3) extended mode register 3\r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, \r
-\s\s\s\s    DMC_DIRECT_CMD_CHIP_ADDR(chip) | \r
-\s\s\s\s    DMC_DIRECT_CMD_BANKADDR(3) | \r
-\s\s\s\s    DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);\r
-\r
-\s\s// =================================\r
-\s\s//  set (EMR) Extended Mode Register\r
-\s\s// ==================================\r
-\s\s// Put into OCD default state\r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, \r
-\s\s\s\s    DMC_DIRECT_CMD_CHIP_ADDR(chip) | \r
-\s\s\s\s    DMC_DIRECT_CMD_BANKADDR(1) | \r
-\s\s\s\s    DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);\r
-\r
-\s\s// ===========================================================        \r
-\s\s// set (MR) mode register - With DLL reset\r
-\s\s// ===========================================================\r
-\s\s// Burst Length = 4 (010)\r
-\s\s// Burst Type   = Seq (0)\r
-\s\s// Latency      = 4 (100)\r
-\s\s// Test mode    = Off (0)\r
-\s\s// DLL reset    = Yes (1)\r
-\s\s// Wr Recovery  = 4  (011)      \r
-\s\s// PD           = Normal (0)\r
+  // send nop\r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_NOP);\r
+  // pre-charge all\r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL);\r
+\r
+  // delay\r
+  for (i = 0; i < 10; i++) {\r
+      val32 = DmcReadReg(DMC_STATUS_REG);\r
+  }\r
+\r
+  // set (EMR2) extended mode register 2\r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, \r
+        DMC_DIRECT_CMD_CHIP_ADDR(chip) | \r
+        DMC_DIRECT_CMD_BANKADDR(2) | \r
+        DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);\r
+  // set (EMR3) extended mode register 3\r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, \r
+        DMC_DIRECT_CMD_CHIP_ADDR(chip) | \r
+        DMC_DIRECT_CMD_BANKADDR(3) | \r
+        DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);\r
+\r
+  // =================================\r
+  //  set (EMR) Extended Mode Register\r
+  // ==================================\r
+  // Put into OCD default state\r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, \r
+        DMC_DIRECT_CMD_CHIP_ADDR(chip) | \r
+        DMC_DIRECT_CMD_BANKADDR(1) | \r
+        DMC_DIRECT_CMD_MEMCMD_EXTMODEREG);\r
+\r
+  // ===========================================================        \r
+  // set (MR) mode register - With DLL reset\r
+  // ===========================================================\r
+  // Burst Length = 4 (010)\r
+  // Burst Type   = Seq (0)\r
+  // Latency      = 4 (100)\r
+  // Test mode    = Off (0)\r
+  // DLL reset    = Yes (1)\r
+  // Wr Recovery  = 4  (011)      \r
+  // PD           = Normal (0)\r
   DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00080742);\r
         \r
-\s\s// pre-charge all \r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL);\r
-\s\s// auto-refresh \r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH);\r
-\s\s// auto-refresh \r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH);\r
-\r
-\s\s// delay\r
-\s\sfor (i = 0; i < 10; i++) {\r
-\s\s    val32 = DmcReadReg(DMC_STATUS_REG);\r
-\s\s}\r
-\r
-\s\s// ===========================================================        \r
-\s\s// set (MR) mode register - Without DLL reset\r
-\s\s// ===========================================================\r
+  // pre-charge all \r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL);\r
+  // auto-refresh \r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH);\r
+  // auto-refresh \r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH);\r
+\r
+  // delay\r
+  for (i = 0; i < 10; i++) {\r
+      val32 = DmcReadReg(DMC_STATUS_REG);\r
+  }\r
+\r
+  // ===========================================================        \r
+  // set (MR) mode register - Without DLL reset\r
+  // ===========================================================\r
   // auto-refresh\r
   DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH);\r
   DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00080642);\r
@@ -338,26 +338,26 @@ VOID PL341DmcInit(struct pl341_dmc_config *config) {
     val32 = DmcReadReg(DMC_STATUS_REG);\r
   }\r
 \r
-\s\s// ======================================================        \r
-\s\s// set (EMR) extended mode register - Enable OCD defaults\r
-\s\s// ====================================================== \r
-\s\sval32 = 0; //NOP\r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00090000 |\r
-\s\s\s\s    (DDR_EMR_OCD_DEFAULT << DDR_EMR_OCD_SHIFT) | \r
-\s\s\s\s    DDR_EMR_RTT_75R | \r
-\s\s\s\s    (DDR_EMR_ODS_VAL << DDR_EMR_ODS_MASK));\r
-\r
-\s\s// delay\r
-\s\sfor (i = 0; i < 10; i++) {\r
-\s\s    val32 = DmcReadReg(DMC_STATUS_REG);\r
-\s\s}\r
-\r
-\s\s// Set (EMR) extended mode register - OCD Exit\r
-\s\sval32 = 0; //NOP\r
-\s\sDmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00090000 | \r
-\s\s\s\s    (DDR_EMR_OCD_NS << DDR_EMR_OCD_SHIFT) | \r
-\s\s\s\s    DDR_EMR_RTT_75R |\r
-\s\s\s\s    (DDR_EMR_ODS_VAL << DDR_EMR_ODS_MASK));\r
+  // ======================================================        \r
+  // set (EMR) extended mode register - Enable OCD defaults\r
+  // ====================================================== \r
+  val32 = 0; //NOP\r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00090000 |\r
+        (DDR_EMR_OCD_DEFAULT << DDR_EMR_OCD_SHIFT) | \r
+        DDR_EMR_RTT_75R | \r
+        (DDR_EMR_ODS_VAL << DDR_EMR_ODS_MASK));\r
+\r
+  // delay\r
+  for (i = 0; i < 10; i++) {\r
+      val32 = DmcReadReg(DMC_STATUS_REG);\r
+  }\r
+\r
+  // Set (EMR) extended mode register - OCD Exit\r
+  val32 = 0; //NOP\r
+  DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(chip) | 0x00090000 | \r
+        (DDR_EMR_OCD_NS << DDR_EMR_OCD_SHIFT) | \r
+        DDR_EMR_RTT_75R |\r
+        (DDR_EMR_ODS_VAL << DDR_EMR_ODS_MASK));\r
 \r
     }\r
 \r
index 9a9006f0a39511e86ec790d3cbcfa4847f0b8cee..526af02d3ee23caa829f99545eff9beeea7dbf05 100644 (file)
@@ -21,11 +21,11 @@ EFIAPI
 PL390GicEnableInterruptInterface (\r
   IN  INTN          GicInterruptInterfaceBase\r
   )\r
-{\s\s\r
-\s\s/*\r
-\s\s * Enable the CPU interface in Non-Secure world\r
-\s\s * Note: The ICCICR register is banked when Security extensions are implemented\s\s \r
-\s\s */\r
+{  \r
+  /*\r
+   * Enable the CPU interface in Non-Secure world\r
+   * Note: The ICCICR register is banked when Security extensions are implemented   \r
+   */\r
     MmioWrite32(GicInterruptInterfaceBase + GIC_ICCICR,0x00000001);\r
 }\r
 \r
@@ -50,7 +50,7 @@ PL390GicSendSgiTo (
   IN  INTN          CPUTargetList\r
   )\r
 {\r
-\s\sMmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));\r
+  MmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));\r
 }\r
 \r
 UINT32\r
@@ -65,9 +65,9 @@ PL390GicAcknowledgeSgiFrom (
     InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);\r
 \r
     //Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID\r
-\s\sif (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {\r
-\s\s    //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
-\s\s\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
+  if (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {\r
+      //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
+    MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
         return 1;\r
     } else {\r
         return 0;\r
@@ -87,9 +87,9 @@ PL390GicAcknowledgeSgi2From (
     InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);\r
 \r
     //Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID\r
-\s\sif((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {\r
-\s\s    //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
-\s\s\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
+  if((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {\r
+      //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
+    MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
         return 1;\r
     } else {\r
         return 0;\r
index 7bb0f3dd6f37e92f4cb637a1a27aaaacc36cd613..156e0601e8770e9ef08a37fc3d76f6ddf47e18fd 100644 (file)
@@ -34,11 +34,11 @@ PL390GicSetupNonSecure (
    //Check if there are any pending interrupts\r
    while(0 != (MmioRead32(GicDistributorBase + GIC_ICDICPR) & 0xF))\r
    {\r
-\s\s   //Some of the SGI's are still pending, read Ack register and send End of Interrupt Signal\r
-\s\s   UINTN InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);\r
+     //Some of the SGI's are still pending, read Ack register and send End of Interrupt Signal\r
+     UINTN InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);\r
 \r
-\s\s   //Write to End of interrupt signal\r
-\s\s   MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
+     //Write to End of interrupt signal\r
+     MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
    }\r
 \r
   // Ensure all GIC interrupts are Non-Secure\r
@@ -56,19 +56,19 @@ PL390GicEnableInterruptInterface (
   IN  INTN          GicInterruptInterfaceBase\r
   )\r
 {\r
-\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCPMR, 0x000000FF);  /* Set Priority Mask to allow interrupts */\r
+  MmioWrite32(GicInterruptInterfaceBase + GIC_ICCPMR, 0x000000FF);  /* Set Priority Mask to allow interrupts */\r
 \r
-\s\s/*\r
-\s\s * Enable CPU interface in Secure world\r
+  /*\r
+   * Enable CPU interface in Secure world\r
      * Enable CPU inteface in Non-secure World\r
-\s\s * Signal Secure Interrupts to CPU using FIQ line *\r
-\s\s */\r
+   * Signal Secure Interrupts to CPU using FIQ line *\r
+   */\r
     MmioWrite32(GicInterruptInterfaceBase + GIC_ICCICR,\r
-    \s\s\s\sGIC_ICCICR_ENABLE_SECURE(1) |\r
-    \s\s\s\sGIC_ICCICR_ENABLE_NS(1) |\r
-    \s\s\s\sGIC_ICCICR_ACK_CTL(0) |\r
-    \s\s\s\sGIC_ICCICR_SIGNAL_SECURE_TO_FIQ(1) |\r
-    \s\s\s\sGIC_ICCICR_USE_SBPR(0));\r
+        GIC_ICCICR_ENABLE_SECURE(1) |\r
+        GIC_ICCICR_ENABLE_NS(1) |\r
+        GIC_ICCICR_ACK_CTL(0) |\r
+        GIC_ICCICR_SIGNAL_SECURE_TO_FIQ(1) |\r
+        GIC_ICCICR_USE_SBPR(0));\r
 }\r
 \r
 VOID\r
@@ -88,7 +88,7 @@ PL390GicSendSgiTo (
   IN  INTN          CPUTargetList\r
   )\r
 {\r
-\s\sMmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));\r
+  MmioWrite32(GicDistributorBase + GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16));\r
 }\r
 \r
 UINT32\r
@@ -103,9 +103,9 @@ PL390GicAcknowledgeSgiFrom (
     InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);\r
 \r
     //Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID\r
-\s\sif (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {\r
-\s\s    //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
-\s\s\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
+  if (((CoreId & 0x7) << 10) == (InterruptId & 0x1C00)) {\r
+      //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
+    MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
         return 1;\r
     } else {\r
         return 0;\r
@@ -125,9 +125,9 @@ PL390GicAcknowledgeSgi2From (
     InterruptId = MmioRead32(GicInterruptInterfaceBase + GIC_ICCIAR);\r
 \r
     //Check if the Interrupt ID is valid, The read from Interrupt Ack register returns CPU ID and Interrupt ID\r
-\s\sif((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {\r
-\s\s    //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
-\s\s\s\sMmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
+  if((((CoreId & 0x7) << 10) | (SgiId & 0x3FF)) == (InterruptId & 0x1FFF)) {\r
+      //Got SGI number 0 hence signal End of Interrupt by writing to ICCEOIR\r
+    MmioWrite32(GicInterruptInterfaceBase + GIC_ICCEIOR, InterruptId);\r
         return 1;\r
     } else {\r
         return 0;\r
index 38ac70d17d50f542ef1af4829f563c91a365e4d9..6ccc8482b583c5958af78b3e8dcd8eb52a656718 100644 (file)
 
 
 struct pl341_dmc_config {
-    UINTN\s\sbase;           // base address for the controller
-    UINTN\s\shas_qos;        // has QoS registers
-    UINTN\s\smax_chip;       // number of memory chips accessible
-    UINT32\s\srefresh_prd;
-    UINT32\s\scas_latency;
-    UINT32\s\swrite_latency;
-    UINT32\s\st_mrd;
-    UINT32\s\st_ras;
-    UINT32\s\st_rc;
-    UINT32\s\st_rcd;
-    UINT32\s\st_rfc;
-    UINT32\s\st_rp;
-    UINT32\s\st_rrd;
-    UINT32\s\st_wr;
-    UINT32\s\st_wtr;
-    UINT32\s\st_xp;
-    UINT32\s\st_xsr;
-    UINT32\s\st_esr;
-    UINT32\s\smemory_cfg;
-    UINT32\s\smemory_cfg2;
-    UINT32\s\smemory_cfg3;
-    UINT32\s\schip_cfg0;
-    UINT32\s\schip_cfg1;
-    UINT32\s\schip_cfg2;
-    UINT32\s\schip_cfg3;
-    UINT32\s\st_faw;
+    UINTN  base;           // base address for the controller
+    UINTN  has_qos;        // has QoS registers
+    UINTN  max_chip;       // number of memory chips accessible
+    UINT32  refresh_prd;
+    UINT32  cas_latency;
+    UINT32  write_latency;
+    UINT32  t_mrd;
+    UINT32  t_ras;
+    UINT32  t_rc;
+    UINT32  t_rcd;
+    UINT32  t_rfc;
+    UINT32  t_rp;
+    UINT32  t_rrd;
+    UINT32  t_wr;
+    UINT32  t_wtr;
+    UINT32  t_xp;
+    UINT32  t_xsr;
+    UINT32  t_esr;
+    UINT32  memory_cfg;
+    UINT32  memory_cfg2;
+    UINT32  memory_cfg3;
+    UINT32  chip_cfg0;
+    UINT32  chip_cfg1;
+    UINT32  chip_cfg2;
+    UINT32  chip_cfg3;
+    UINT32  t_faw;
 };
 
 /* Memory config bit fields */
@@ -60,21 +60,21 @@ struct pl341_dmc_config {
 #define DMC_MEMORY_CONFIG_BURST_4               (0x2 << 15)
 #define DMC_MEMORY_CONFIG_BURST_8               (0x3 << 15)
 #define DMC_MEMORY_CONFIG_BURST_16              (0x4 << 15)
-#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_1\s\s\s\s(0x0 << 21)
-#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_2\s\s\s\s(0x1 << 21)
-#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_3\s\s\s\s(0x2 << 21)
-#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_4\s\s\s\s(0x3 << 21)
+#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_1    (0x0 << 21)
+#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_2    (0x1 << 21)
+#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_3    (0x2 << 21)
+#define DMC_MEMORY_CONFIG_ACTIVE_CHIP_4    (0x3 << 21)
 
-#define DMC_MEMORY_CFG2_CLK_ASYNC\s\s\s\s(0x0 << 0)
-#define DMC_MEMORY_CFG2_CLK_SYNC\s\s\s\s(0x1 << 0)
-#define DMC_MEMORY_CFG2_DQM_INIT\s\s\s\s(0x1 << 2)
-#define DMC_MEMORY_CFG2_CKE_INIT\s\s\s\s(0x1 << 3)
-#define DMC_MEMORY_CFG2_BANK_BITS_2\s\s\s\s(0x0 << 4)
-#define DMC_MEMORY_CFG2_BANK_BITS_3\s\s\s\s(0x3 << 4)
-#define DMC_MEMORY_CFG2_MEM_WIDTH_16\s\s\s\s(0x0 << 6)
-#define DMC_MEMORY_CFG2_MEM_WIDTH_32\s\s\s\s(0x1 << 6)
-#define DMC_MEMORY_CFG2_MEM_WIDTH_64\s\s\s\s(0x2 << 6)
-#define DMC_MEMORY_CFG2_MEM_WIDTH_RESERVED\s\s(0x3 << 6)
+#define DMC_MEMORY_CFG2_CLK_ASYNC    (0x0 << 0)
+#define DMC_MEMORY_CFG2_CLK_SYNC    (0x1 << 0)
+#define DMC_MEMORY_CFG2_DQM_INIT    (0x1 << 2)
+#define DMC_MEMORY_CFG2_CKE_INIT    (0x1 << 3)
+#define DMC_MEMORY_CFG2_BANK_BITS_2    (0x0 << 4)
+#define DMC_MEMORY_CFG2_BANK_BITS_3    (0x3 << 4)
+#define DMC_MEMORY_CFG2_MEM_WIDTH_16    (0x0 << 6)
+#define DMC_MEMORY_CFG2_MEM_WIDTH_32    (0x1 << 6)
+#define DMC_MEMORY_CFG2_MEM_WIDTH_64    (0x2 << 6)
+#define DMC_MEMORY_CFG2_MEM_WIDTH_RESERVED  (0x3 << 6)
 
 
 
index e2c4ea29d118ef918fe60e116081c20418a034bd..69754e4fbb065adde18bdc6304f741a254b4b4e9 100644 (file)
@@ -29,7 +29,7 @@
 #define L230_TAG_LATENCY        0x108\r
 #define L230_DATA_LATENCY       0x10C\r
 #define L2X0_INTCLEAR           0x220\r
-#define L2X0_CACHE_SYNC\s\s\s\s\s\s0x730\r
+#define L2X0_CACHE_SYNC      0x730\r
 #define L2X0_INVWAY             0x77C\r
 #define L2X0_CLEAN_WAY          0x7BC\r
 #define L2X0_PFCTRL             0xF60\r
index 866263faf12ad4ac66daa948380de6f44b16e794..cf987b0438032ea505db13b8c440d77ebd817a3a 100644 (file)
@@ -57,4 +57,4 @@ struct _VIRTUAL_UNCACHED_PAGES_PROTOCOL {
 \r
 extern EFI_GUID gVirtualUncachedPagesProtocolGuid;\r
 \r
-#endif\s\s\r
+#endif  \r
index badec4a72fabef23ae5dd549b1aaa80e7230820b..49e266dd38bdc012590f9e0c9945fae253dbba3c 100644 (file)
@@ -58,18 +58,18 @@ ASM_PFX(ArmEnableInstructionCache):
   orr    r0,r0,r1             @Set I bit
   mcr    p15,0,r0,c1,c0,0     @Write control register configuration data
   bx     LR
-\s\s
+  
 ASM_PFX(ArmDisableInstructionCache):
   ldr    r1,=IC_ON
   mrc    p15,0,r0,c1,c0,0     @Read control register configuration data
   bic    r0,r0,r1             @Clear I bit.
   mcr    p15,0,r0,c1,c0,0     @Write control register configuration data
   bx     LR
-\s\s
+  
 ASM_PFX(ArmInvalidateInstructionCache):
   mov     r0,#0
   mcr     p15,0,r0,c7,c5,0     @Invalidate entire Instruction cache. 
-\s\s                       @Also flushes the branch target cache.
+                         @Also flushes the branch target cache.
   mov     r0,#0
   mcr     p15,0,r0,c7,c10,4    @Data write buffer
   bx      LR
@@ -99,7 +99,7 @@ ASM_PFX(ArmEnableDataCache):
   orr     R0,R0,R1              @Set C bit
   mcr     p15,0,r0,c1,c0,0      @Write control register configuration data
   bx      LR
-\s\s
+  
 ASM_PFX(ArmDisableDataCache):
   ldr     R1,=DC_ON
   mrc     p15,0,R0,c1,c0,0      @Read control register configuration data
@@ -111,7 +111,7 @@ ASM_PFX(ArmCleanDataCache):
   mrc     p15,0,r15,c7,c10,3
   bne     ASM_PFX(ArmCleanDataCache)
   mov     R0,#0
-  mcr     p15,0,R0,c7,c10,4\s\s@Drain write buffer
+  mcr     p15,0,R0,c7,c10,4  @Drain write buffer
   bx      LR
     
 ASM_PFX(ArmInvalidateDataCache):
@@ -125,7 +125,7 @@ ASM_PFX(ArmCleanInvalidateDataCache):
   mrc     p15,0,r15,c7,c14,3
   bne     ASM_PFX(ArmCleanInvalidateDataCache)
   mov     R0,#0
-  mcr     p15,0,R0,c7,c10,4\s\s      @Drain write buffer
+  mcr     p15,0,R0,c7,c10,4        @Drain write buffer
   bx      LR
 
 ASM_PFX(ArmEnableBranchPrediction):
index 2a147eff3a1dafdd784489b9078775bfbdf0188b..dfee136b2baf04f3b87d355d04656e8ea9746202 100644 (file)
@@ -112,7 +112,7 @@ ArmCleanDataCache
   MRC     p15,0,r15,c7,c10,3
   BNE     ArmCleanDataCache
   MOV     R0,#0
-  MCR     p15,0,R0,c7,c10,4\s\s    ;Drain write buffer
+  MCR     p15,0,R0,c7,c10,4      ;Drain write buffer
   BX      LR
 
 ArmInvalidateDataCache
@@ -126,7 +126,7 @@ ArmCleanInvalidateDataCache
   MRC     p15,0,r15,c7,c14,3
   BNE     ArmCleanInvalidateDataCache
   MOV     R0,#0
-  MCR     p15,0,R0,c7,c10,4\s\s    ;Drain write buffer
+  MCR     p15,0,R0,c7,c10,4      ;Drain write buffer
   BX      LR
 
 ArmEnableBranchPrediction
index 831532f4d21731ef4b6580e5d1888dcb1393068a..19f489f3c02eacb37497039a0ab435290fcfbd6d 100644 (file)
@@ -70,17 +70,17 @@ ArmDisableAsynchronousAbort
 ArmEnableIrq
   cpsie   i
   isb
-\s\sbx      LR
+  bx      LR
 
 ArmDisableIrq
   cpsid   i
   isb
-\s\sbx      LR
+  bx      LR
 
 ArmEnableFiq
   cpsie   f
   isb
-\s\sbx      LR
+  bx      LR
 
 ArmDisableFiq
   cpsid   f
@@ -99,17 +99,17 @@ ArmDisableInterrupts
 
 ArmGetInterruptState
   mrs     R0,CPSR
-  tst     R0,#0x80\s\s    ;Check if IRQ is enabled.
+  tst     R0,#0x80      ;Check if IRQ is enabled.
   moveq   R0,#1
   movne   R0,#0
-\s\sbx      LR
+  bx      LR
 
 ArmGetFiqState
-\s\smrs     R0,CPSR
-\s\stst     R0,#0x40\s\s    ;Check if FIQ is enabled.
-\s\smoveq   R0,#1
-\s\smovne   R0,#0
-\s\sbx      LR
+  mrs     R0,CPSR
+  tst     R0,#0x40      ;Check if FIQ is enabled.
+  moveq   R0,#1
+  movne   R0,#0
+  bx      LR
   
 ArmInvalidateTlb
   mov     r0,#0
@@ -126,7 +126,7 @@ ArmSetTTBR0
 
 ArmGetTTBR0BaseAddress
   mrc     p15,0,r0,c2,c0,0
-  ldr\s\s  r1, = 0xFFFFC000
+  ldr    r1, = 0xFFFFC000
   and     r0, r0, r1
   isb
   bx      lr
index 9d7b31efdc5608fe4a29987fcc1680b767d0321c..da35a09b1d73956190db13a0d59be3d50355e5fd 100644 (file)
@@ -31,7 +31,7 @@ ASM_PFX(ArmGetScuBaseAddress):
   # the Configuration BAR as a stack is not necessary setup. The SCU is at the\r
   # offset 0x0000 from the Private Memory Region.\r
   mrc   p15, 4, r0, c15, c0, 0\r
-  bx\s\slr\r
+  bx  lr\r
 \r
 # IN  None\r
 # OUT r1 = SCU enabled (boolean)\r
index e87d231356ae6b79c0e6ed057db6d8f42da07dda..6cc17c4c6a5cfe0be966c46b23880656cc594a8c 100644 (file)
@@ -31,7 +31,7 @@ ArmGetScuBaseAddress
   // the Configuration BAR as a stack is not necessary setup. The SCU is at the\r
   // offset 0x0000 from the Private Memory Region.\r
   mrc   p15, 4, r0, c15, c0, 0\r
-  bx\s\slr\r
+  bx  lr\r
 \r
 // IN  None\r
 // OUT r1 = SCU enabled (boolean)\r
index 00704164f9db1305fa671cd10673867310230842..7dbbaf7d0fbb4e340bcbe95f6ede5321b4e4e171 100644 (file)
@@ -80,21 +80,21 @@ ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA):
 
 
 ASM_PFX(ArmInvalidateDataCacheEntryBySetWay):
-  mcr     p15, 0, r0, c7, c6, 2        @ Invalidate this line\s\s\s\s
+  mcr     p15, 0, r0, c7, c6, 2        @ Invalidate this line    
   dsb
   isb
   bx      lr
 
 
 ASM_PFX(ArmCleanInvalidateDataCacheEntryBySetWay):
-  mcr     p15, 0, r0, c7, c14, 2       @ Clean and Invalidate this line\s\s\s\s
+  mcr     p15, 0, r0, c7, c14, 2       @ Clean and Invalidate this line    
   dsb
   isb
   bx      lr
 
 
 ASM_PFX(ArmCleanDataCacheEntryBySetWay):
-  mcr     p15, 0, r0, c7, c10, 2       @ Clean this line\s\s\s\s
+  mcr     p15, 0, r0, c7, c10, 2       @ Clean this line    
   dsb
   isb
   bx      lr
@@ -119,7 +119,7 @@ ASM_PFX(ArmDisableMmu):
   bic     R0,R0,#1
   mcr     p15,0,R0,c1,c0,0      @Disable MMU
 
-\s\smcr \s\s\s\sp15,0,R0,c8,c7,0      @Invalidate TLB
+  mcr     p15,0,R0,c8,c7,0      @Invalidate TLB
   mcr     p15,0,R0,c7,c5,6      @Invalidate Branch predictor array
   dsb
   isb
@@ -309,7 +309,7 @@ ASM_PFX(ArmCallWFI):
 
 //Note: Return 0 in Uniprocessor implementation
 ASM_PFX(ArmReadCbar):
-  mrc     p15, 4, r0, c15, c0, 0\s\s//Read Configuration Base Address Register
+  mrc     p15, 4, r0, c15, c0, 0  //Read Configuration Base Address Register
   bx      lr
 
 ASM_PFX(ArmInvalidateInstructionAndDataTlb):
@@ -318,7 +318,7 @@ ASM_PFX(ArmInvalidateInstructionAndDataTlb):
   bx lr
 
 ASM_PFX(ArmReadMpidr):
-  mrc     p15, 0, r0, c0, c0, 5\s\s     @ read MPIDR
+  mrc     p15, 0, r0, c0, c0, 5       @ read MPIDR
   bx      lr
 
 ASM_FUNCTION_REMOVE_IF_UNREFERENCED
index 4cd78d8a238678b04d72ab3c1ccbd9bb08d1746f..4c78c54674e1655053f9472ded168f68a6b09aea 100644 (file)
@@ -82,21 +82,21 @@ ArmCleanInvalidateDataCacheEntryByMVA
 
 
 ArmInvalidateDataCacheEntryBySetWay
-  mcr     p15, 0, r0, c7, c6, 2        ; Invalidate this line\s\s\s\s
+  mcr     p15, 0, r0, c7, c6, 2        ; Invalidate this line    
   dsb
   isb
   bx      lr
 
 
 ArmCleanInvalidateDataCacheEntryBySetWay
-  mcr     p15, 0, r0, c7, c14, 2       ; Clean and Invalidate this line\s\s\s\s
+  mcr     p15, 0, r0, c7, c14, 2       ; Clean and Invalidate this line    
   dsb
   isb
   bx      lr
 
 
 ArmCleanDataCacheEntryBySetWay
-  mcr     p15, 0, r0, c7, c10, 2       ; Clean this line\s\s\s\s
+  mcr     p15, 0, r0, c7, c10, 2       ; Clean this line    
   dsb
   isb
   bx      lr
@@ -125,7 +125,7 @@ ArmDisableMmu
   bic     R0,R0,#1              ; Clear SCTLR.M bit : Disable MMU
   mcr     p15,0,R0,c1,c0,0      ; Write R0 into SCTLR (Write control register configuration data)
 
-  mcr \s\s  p15,0,R0,c8,c7,0      ; TLBIALL : Invalidate unified TLB
+  mcr     p15,0,R0,c8,c7,0      ; TLBIALL : Invalidate unified TLB
   mcr     p15,0,R0,c7,c5,6      ; BPIALL  : Invalidate entire branch predictor array
   dsb
   isb
@@ -307,7 +307,7 @@ ArmCallWFI
 
 //Note: Return 0 in Uniprocessor implementation
 ArmReadCbar
-  mrc     p15, 4, r0, c15, c0, 0\s\s//Read Configuration Base Address Register
+  mrc     p15, 4, r0, c15, c0, 0  //Read Configuration Base Address Register
   bx      lr
 
 ArmInvalidateInstructionAndDataTlb
@@ -316,7 +316,7 @@ ArmInvalidateInstructionAndDataTlb
   bx lr
 
 ArmReadMpidr
-  mrc     p15, 0, r0, c0, c0, 5\s\s\s\s; read MPIDR
+  mrc     p15, 0, r0, c0, c0, 5    ; read MPIDR
   bx      lr
 
   END
index 94b11a5d7764dad7d6c74edcdf73dfc579b84653..29ccf6dcebba6dfcb5eeac509319ae89fa745960 100644 (file)
@@ -42,48 +42,48 @@ ASM_PFX(Cp15CacheInfo):
   bx      LR
 
 ASM_PFX(ArmEnableInterrupts):
-\s\smrs     R0,CPSR
-\s\sbic     R0,R0,#0x80\s\s\s\s@Enable IRQ interrupts
-\s\smsr     CPSR_c,R0
-\s\sbx      LR
+  mrs     R0,CPSR
+  bic     R0,R0,#0x80    @Enable IRQ interrupts
+  msr     CPSR_c,R0
+  bx      LR
 
 ASM_PFX(ArmDisableInterrupts):
-\s\smrs     R0,CPSR
-\s\sorr     R1,R0,#0x80\s\s\s\s@Disable IRQ interrupts
-\s\smsr     CPSR_c,R1
+  mrs     R0,CPSR
+  orr     R1,R0,#0x80    @Disable IRQ interrupts
+  msr     CPSR_c,R1
   tst     R0,#0x80
   moveq   R0,#1
   movne   R0,#0
-\s\sbx      LR
+  bx      LR
 
 ASM_PFX(ArmGetInterruptState):
-\s\smrs     R0,CPSR
-\s\stst     R0,#0x80\s\s    @Check if IRQ is enabled.
-\s\smoveq   R0,#1
-\s\smovne   R0,#0
-\s\sbx      LR
+  mrs     R0,CPSR
+  tst     R0,#0x80      @Check if IRQ is enabled.
+  moveq   R0,#1
+  movne   R0,#0
+  bx      LR
 
 ASM_PFX(ArmEnableFiq):
-\s\smrs     R0,CPSR
-\s\sbic     R0,R0,#0x40\s\s\s\s@Enable FIQ interrupts
-\s\smsr     CPSR_c,R0
-\s\sbx      LR
+  mrs     R0,CPSR
+  bic     R0,R0,#0x40    @Enable FIQ interrupts
+  msr     CPSR_c,R0
+  bx      LR
 
 ASM_PFX(ArmDisableFiq):
-\s\smrs     R0,CPSR
-\s\sorr     R1,R0,#0x40\s\s\s\s@Disable FIQ interrupts
-\s\smsr     CPSR_c,R1
+  mrs     R0,CPSR
+  orr     R1,R0,#0x40    @Disable FIQ interrupts
+  msr     CPSR_c,R1
   tst     R0,#0x80
   moveq   R0,#1
   movne   R0,#0
-\s\sbx      LR
+  bx      LR
 
 ASM_PFX(ArmGetFiqState):
-\s\smrs     R0,CPSR
-\s\stst     R0,#0x80\s\s    @Check if FIQ is enabled.
-\s\smoveq   R0,#1
-\s\smovne   R0,#0
-\s\sbx      LR
+  mrs     R0,CPSR
+  tst     R0,#0x80      @Check if FIQ is enabled.
+  moveq   R0,#1
+  movne   R0,#0
+  bx      LR
 
 ASM_PFX(ArmInvalidateTlb):
   mov     r0,#0
index 0b023fed42826ea824ee545014dbe02beb5e4da4..4d6c253cd211b72f9b10770ac137ca3460e3d0df 100644 (file)
@@ -48,48 +48,48 @@ ArmIsMPCore
   bx      LR
 
 ArmEnableInterrupts
-\s\smrs     R0,CPSR
-\s\sbic     R0,R0,#0x80\s\s\s\s;Enable IRQ interrupts
-\s\smsr     CPSR_c,R0
-\s\sbx      LR
+  mrs     R0,CPSR
+  bic     R0,R0,#0x80    ;Enable IRQ interrupts
+  msr     CPSR_c,R0
+  bx      LR
 
 ArmDisableInterrupts
-\s\smrs     R0,CPSR
-\s\sorr     R1,R0,#0x80\s\s\s\s;Disable IRQ interrupts
-\s\smsr     CPSR_c,R1
+  mrs     R0,CPSR
+  orr     R1,R0,#0x80    ;Disable IRQ interrupts
+  msr     CPSR_c,R1
   tst     R0,#0x80
   moveq   R0,#1
   movne   R0,#0
-\s\sbx      LR
+  bx      LR
 
 ArmGetInterruptState
-\s\smrs     R0,CPSR
-\s\stst     R0,#0x80\s\s    ;Check if IRQ is enabled.
-\s\smoveq   R0,#1
-\s\smovne   R0,#0
-\s\sbx      LR
+  mrs     R0,CPSR
+  tst     R0,#0x80      ;Check if IRQ is enabled.
+  moveq   R0,#1
+  movne   R0,#0
+  bx      LR
 
 ArmEnableFiq
-\s\smrs     R0,CPSR
-\s\sbic     R0,R0,#0x40\s\s\s\s;Enable IRQ interrupts
-\s\smsr     CPSR_c,R0
-\s\sbx      LR
+  mrs     R0,CPSR
+  bic     R0,R0,#0x40    ;Enable IRQ interrupts
+  msr     CPSR_c,R0
+  bx      LR
 
 ArmDisableFiq
-\s\smrs     R0,CPSR
-\s\sorr     R1,R0,#0x40\s\s\s\s;Disable IRQ interrupts
-\s\smsr     CPSR_c,R1
+  mrs     R0,CPSR
+  orr     R1,R0,#0x40    ;Disable IRQ interrupts
+  msr     CPSR_c,R1
   tst     R0,#0x40
   moveq   R0,#1
   movne   R0,#0
-\s\sbx      LR
+  bx      LR
 
 ArmGetFiqState
-\s\smrs     R0,CPSR
-\s\stst     R0,#0x40\s\s    ;Check if IRQ is enabled.
-\s\smoveq   R0,#1
-\s\smovne   R0,#0
-\s\sbx      LR
+  mrs     R0,CPSR
+  tst     R0,#0x40      ;Check if IRQ is enabled.
+  moveq   R0,#1
+  movne   R0,#0
+  bx      LR
   
 ArmInvalidateTlb
   mov     r0,#0
index 98a5b6c6061921cd1263e69324f1d14fa31c0198..c7a9341e86ce108234c65aee1ab86e5627f9fc3b 100644 (file)
@@ -17,7 +17,7 @@
 #include <Library/IoLib.h>\r
 \r
 VOID ArmClearMPCoreMailbox() {\r
-\s\sMmioWrite32(PcdGet32(PcdMPCoreMailboxClearAddress),PcdGet32(PcdMPCoreMailboxClearValue));\r
+  MmioWrite32(PcdGet32(PcdMPCoreMailboxClearAddress),PcdGet32(PcdMPCoreMailboxClearValue));\r
 }\r
 \r
 UINTN ArmGetMPCoreMailbox() {\r
index 1e4809bc8118723c658da6c132fa0e5837d87613..56d1311f843a5340439da36c355cf29b924d3fa9 100644 (file)
@@ -72,8 +72,8 @@ EFI_STATUS TZASCSetRegion(UINTN TzascBase, UINTN RegionId, UINTN Enabled, UINTN
     Region = (UINT32*)((UINTN)TzascBase + TZASC_REGIONS_REG + (RegionId * 0x10));\r
 \r
     MmioWrite32((UINTN)(Region), LowAddress&0xFFFF8000);\r
-\s\sMmioWrite32((UINTN)(Region+1), HighAddress);\r
-\s\sMmioWrite32((UINTN)(Region+2), ((Security & 0xF) <<28) | ((Size & 0x3F) << 1) | (Enabled & 0x1));\r
+  MmioWrite32((UINTN)(Region+1), HighAddress);\r
+  MmioWrite32((UINTN)(Region+2), ((Security & 0xF) <<28) | ((Size & 0x3F) << 1) | (Enabled & 0x1));\r
 \r
     return EFI_SUCCESS;\r
 }\r
index fcd7199d4bafd24e8c7cb196dff5d91406096241..1298f94e8dd3695c7a0b26e6099aed1bced7c2b4 100755 (executable)
@@ -42,71 +42,71 @@ InternalMemCopyMem (
 GCC_ASM_EXPORT(InternalMemCopyMem)\r
 \r
 ASM_PFX(InternalMemCopyMem):\r
-\s\sstmfd\s\ssp!, {r4-r11, lr}\r
-\s\stst\s\sr0, #3\r
-\s\smov\s\sr11, r0\r
-\s\smov\s\sr10, r0\r
-\s\smov\s\sip, r2\r
-\s\smov\s\slr, r1\r
-\s\smovne\s\sr0, #0\r
-\s\sbne\s\sL4\r
-\s\stst\s\sr1, #3\r
-\s\smovne\s\sr3, #0\r
-\s\smoveq\s\sr3, #1\r
-\s\scmp\s\sr2, #31\r
-\s\smovls\s\sr0, #0\r
-\s\sandhi\s\sr0, r3, #1\r
+  stmfd  sp!, {r4-r11, lr}\r
+  tst  r0, #3\r
+  mov  r11, r0\r
+  mov  r10, r0\r
+  mov  ip, r2\r
+  mov  lr, r1\r
+  movne  r0, #0\r
+  bne  L4\r
+  tst  r1, #3\r
+  movne  r3, #0\r
+  moveq  r3, #1\r
+  cmp  r2, #31\r
+  movls  r0, #0\r
+  andhi  r0, r3, #1\r
 L4:\r
-\s\scmp\s\sr11, r1\r
-\s\sbcc\s\sL26\r
-\s\sbls\s\sL7\r
-\s\srsb\s\sr3, r1, r11\r
-\s\scmp\s\sip, r3\r
-\s\sbcc\s\sL26\r
-\s\scmp\s\sip, #0\r
-\s\sbeq\s\sL7\r
-\s\sadd\s\sr10, r11, ip\r
-\s\sadd\s\slr, ip, r1\r
-\s\sb\s\sL16\r
+  cmp  r11, r1\r
+  bcc  L26\r
+  bls  L7\r
+  rsb  r3, r1, r11\r
+  cmp  ip, r3\r
+  bcc  L26\r
+  cmp  ip, #0\r
+  beq  L7\r
+  add  r10, r11, ip\r
+  add  lr, ip, r1\r
+  b  L16\r
 L29:\r
-\s\ssub\s\sip, ip, #8\r
-\s\scmp\s\sip, #7\r
-\s\sldrd\s\sr2, [lr, #-8]!\r
-\s\smovls\s\sr0, #0\r
-\s\scmp\s\sip, #0\r
-\s\sstrd\s\sr2, [r10, #-8]!\r
-\s\sbeq\s\sL7\r
+  sub  ip, ip, #8\r
+  cmp  ip, #7\r
+  ldrd  r2, [lr, #-8]!\r
+  movls  r0, #0\r
+  cmp  ip, #0\r
+  strd  r2, [r10, #-8]!\r
+  beq  L7\r
 L16:\r
-\s\scmp\s\sr0, #0\r
-\s\sbne\s\sL29\r
-\s\ssub\s\sr3, lr, #1\r
-\s\ssub\s\sip, ip, #1\r
-\s\sldrb\s\sr3, [r3, #0]\s\s\r
-\s\ssub\s\sr2, r10, #1\r
-\s\scmp\s\sip, #0\r
-\s\ssub\s\sr10, r10, #1\r
-\s\ssub\s\slr, lr, #1\r
-\s\sstrb\s\sr3, [r2, #0]\r
-\s\sbne\s\sL16\r
-\s\sb   L7\r
+  cmp  r0, #0\r
+  bne  L29\r
+  sub  r3, lr, #1\r
+  sub  ip, ip, #1\r
+  ldrb  r3, [r3, #0]  \r
+  sub  r2, r10, #1\r
+  cmp  ip, #0\r
+  sub  r10, r10, #1\r
+  sub  lr, lr, #1\r
+  strb  r3, [r2, #0]\r
+  bne  L16\r
+  b   L7\r
 L11:\r
-\s\sldrb\s\sr3, [lr], #1\s\s\r
-\s\ssub\s\sip, ip, #1\r
-\s\sstrb\s\sr3, [r10], #1\r
+  ldrb  r3, [lr], #1  \r
+  sub  ip, ip, #1\r
+  strb  r3, [r10], #1\r
 L26:\r
-\s\scmp\s\sip, #0\r
-\s\sbeq\s\sL7\r
+  cmp  ip, #0\r
+  beq  L7\r
 L30:\r
-\s\scmp\s\sr0, #0\r
-\s\sbeq\s\sL11\r
-\s\ssub\s\sip, ip, #32\r
-\s\scmp\s\sip, #31\r
-\s\sldmia\s\slr!, {r2-r9}\r
-\s\smovls\s\sr0, #0\r
-\s\scmp\s\sip, #0\r
-\s\sstmia\s\sr10!, {r2-r9}\r
-\s\sbne\s\sL30\r
+  cmp  r0, #0\r
+  beq  L11\r
+  sub  ip, ip, #32\r
+  cmp  ip, #31\r
+  ldmia  lr!, {r2-r9}\r
+  movls  r0, #0\r
+  cmp  ip, #0\r
+  stmia  r10!, {r2-r9}\r
+  bne  L30\r
 L7:\r
-  mov\s\sr0, r11\r
-\s\sldmfd\s\ssp!, {r4-r11, pc}\r
+  mov  r0, r11\r
+  ldmfd  sp!, {r4-r11, pc}\r
   \r
index afb74072a0476b74adcbcd4ed5955469312c3e66..1a5e18e120b4b7f8a0bd6581edb580e376479e79 100755 (executable)
@@ -37,78 +37,78 @@ InternalMemCopyMem (
   IN      UINTN                     Length\r
   )\r
 **/\r
-\s\sEXPORT InternalMemCopyMem\r
+  EXPORT InternalMemCopyMem\r
 
-\s\sAREA AsmMemStuff, CODE, READONLY
+  AREA AsmMemStuff, CODE, READONLY
 \r
 InternalMemCopyMem\r
-\s\sstmfd\s\ssp!, {r4-r11, lr}
-\s\stst\s\sr0, #3
-\s\smov\s\sr11, r0
-\s\smov\s\sr10, r0
-\s\smov\s\sip, r2
-\s\smov\s\slr, r1
-\s\smovne\s\sr0, #0
-\s\sbne\s\sL4
-\s\stst\s\sr1, #3
-\s\smovne\s\sr3, #0
-\s\smoveq\s\sr3, #1
-\s\scmp\s\sr2, #31
-\s\smovls\s\sr0, #0
-\s\sandhi\s\sr0, r3, #1
+  stmfd  sp!, {r4-r11, lr}
+  tst  r0, #3
+  mov  r11, r0
+  mov  r10, r0
+  mov  ip, r2
+  mov  lr, r1
+  movne  r0, #0
+  bne  L4
+  tst  r1, #3
+  movne  r3, #0
+  moveq  r3, #1
+  cmp  r2, #31
+  movls  r0, #0
+  andhi  r0, r3, #1
 L4
-\s\scmp\s\sr11, r1
-\s\sbcc\s\sL26
-\s\sbls\s\sL7
-\s\srsb\s\sr3, r1, r11
-\s\scmp\s\sip, r3
-\s\sbcc\s\sL26
-\s\scmp\s\sip, #0
-\s\sbeq\s\sL7
-\s\sadd\s\sr10, r11, ip
-\s\sadd\s\slr, ip, r1
-\s\sb\s\sL16
+  cmp  r11, r1
+  bcc  L26
+  bls  L7
+  rsb  r3, r1, r11
+  cmp  ip, r3
+  bcc  L26
+  cmp  ip, #0
+  beq  L7
+  add  r10, r11, ip
+  add  lr, ip, r1
+  b  L16
 L29
-\s\ssub\s\sip, ip, #8
-\s\scmp\s\sip, #7
-\s\sldrd\s\sr2, [lr, #-8]!
-\s\smovls\s\sr0, #0
-\s\scmp\s\sip, #0
-\s\sstrd\s\sr2, [r10, #-8]!
-\s\sbeq\s\sL7
+  sub  ip, ip, #8
+  cmp  ip, #7
+  ldrd  r2, [lr, #-8]!
+  movls  r0, #0
+  cmp  ip, #0
+  strd  r2, [r10, #-8]!
+  beq  L7
 L16
-\s\scmp\s\sr0, #0
-\s\sbne\s\sL29
-\s\ssub\s\sr3, lr, #1
-\s\ssub\s\sip, ip, #1
-\s\sldrb\s\sr3, [r3, #0]\s\s
-\s\ssub\s\sr2, r10, #1
-\s\scmp\s\sip, #0
-\s\ssub\s\sr10, r10, #1
-\s\ssub\s\slr, lr, #1
-\s\sstrb\s\sr3, [r2, #0]
-\s\sbne\s\sL16
-\s\sb   L7
+  cmp  r0, #0
+  bne  L29
+  sub  r3, lr, #1
+  sub  ip, ip, #1
+  ldrb  r3, [r3, #0]  
+  sub  r2, r10, #1
+  cmp  ip, #0
+  sub  r10, r10, #1
+  sub  lr, lr, #1
+  strb  r3, [r2, #0]
+  bne  L16
+  b   L7
 L11
-\s\sldrb\s\sr3, [lr], #1\s\s
-\s\ssub\s\sip, ip, #1
-\s\sstrb\s\sr3, [r10], #1
+  ldrb  r3, [lr], #1  
+  sub  ip, ip, #1
+  strb  r3, [r10], #1
 L26
-\s\scmp\s\sip, #0
-\s\sbeq\s\sL7
+  cmp  ip, #0
+  beq  L7
 L30
-\s\scmp\s\sr0, #0
-\s\sbeq\s\sL11
-\s\ssub\s\sip, ip, #32
-\s\scmp\s\sip, #31
-\s\sldmia\s\slr!, {r2-r9}
-\s\smovls\s\sr0, #0
-\s\scmp\s\sip, #0
-\s\sstmia\s\sr10!, {r2-r9}
-\s\sbne\s\sL30
+  cmp  r0, #0
+  beq  L11
+  sub  ip, ip, #32
+  cmp  ip, #31
+  ldmia  lr!, {r2-r9}
+  movls  r0, #0
+  cmp  ip, #0
+  stmia  r10!, {r2-r9}
+  bne  L30
 L7
-  mov\s\sr0, r11
-\s\sldmfd\s\ssp!, {r4-r11, pc}\r
-\s\s\r
+  mov  r0, r11
+  ldmfd  sp!, {r4-r11, pc}\r
+  \r
   END\r
   \r
index db37cb47d44122c39563b6a7d09949e2eacb984a..8a61a6b44ea8d5c73aa71a9ff3f4e1d635e8f47a 100755 (executable)
@@ -34,49 +34,49 @@ InternalMemSetMem (
   IN      UINT8                     Value\r
   )\r
 **/\r
-\s\s\r
+  \r
 .text\r
 .align 2\r
 GCC_ASM_EXPORT(InternalMemSetMem)\r
 \r
 ASM_PFX(InternalMemSetMem):\r
-\s\sstmfd\s\ssp!, {r4-r11, lr}\r
-\s\stst\s\s  r0, #3\r
-\s\smovne\s\sr3, #0\r
-\s\smoveq\s\sr3, #1\r
-\s\scmp\s\s  r1, #31\r
-\s\smovls lr, #0\r
-\s\sandhi\s\slr, r3, #1\r
-\s\scmp\s\s  lr, #0\r
-\s\smov\s\s  r12, r0\r
-\s\sbne\s\s  L31\r
+  stmfd  sp!, {r4-r11, lr}\r
+  tst    r0, #3\r
+  movne  r3, #0\r
+  moveq  r3, #1\r
+  cmp    r1, #31\r
+  movls lr, #0\r
+  andhi  lr, r3, #1\r
+  cmp    lr, #0\r
+  mov    r12, r0\r
+  bne    L31\r
 L32:\r
-\s\smov\s\s  r3, #0\r
-\s\sb\s\s    L43\r
+  mov    r3, #0\r
+  b      L43\r
 L31:\r
   and   r4, r2, #0xff\r
   orr   r4, r4, r4, LSL #8\r
   orr   r4, r4, r4, LSL #16  \r
-\s\smov   r5, r4\r
-\s\smov   r5, r4\r
-\s\smov   r6, r4\r
-\s\smov   r7, r4 \r
-\s\smov   r8, r4 \r
-\s\smov   r9, r4 \r
-\s\smov   r10, r4 \r
-\s\smov   r11, r4 \r
-\s\sb\s\s    L32\r
+  mov   r5, r4\r
+  mov   r5, r4\r
+  mov   r6, r4\r
+  mov   r7, r4 \r
+  mov   r8, r4 \r
+  mov   r9, r4 \r
+  mov   r10, r4 \r
+  mov   r11, r4 \r
+  b      L32\r
 L34:\r
-\s\scmp\s\s    lr, #0\r
-\s\sstreqb\s\sr2, [r12], #1\r
-\s\ssubeq\s\s  r1, r1, #1\r
-\s\sbeq\s\s    L43\r
-\s\ssub\s\s    r1, r1, #32\r
-\s\scmp\s\s    r1, #31\r
-\s\smovls\s\s  lr, r3\r
-\s\sstmia\s\s  r12!, {r4-r11}\r
+  cmp      lr, #0\r
+  streqb  r2, [r12], #1\r
+  subeq    r1, r1, #1\r
+  beq      L43\r
+  sub      r1, r1, #32\r
+  cmp      r1, #31\r
+  movls    lr, r3\r
+  stmia    r12!, {r4-r11}\r
 L43:\r
-\s\scmp\s\s    r1, #0\r
-\s\sbne\s\s    L34\r
-\s\sldmfd\s\s  sp!, {r4-r11, pc}\r
-\s\s
\ No newline at end of file
+  cmp      r1, #0\r
+  bne      L34\r
+  ldmfd    sp!, {r4-r11, pc}\r
+  
\ No newline at end of file
index 4a4d2380b0b3164c886225959731cf83b9f1f788..7222cf9b7fdddb029a227a3675b6694cb84136fa 100755 (executable)
@@ -33,51 +33,51 @@ InternalMemSetMem (
   IN      UINT8                     Value\r
   )\r
 **/\r
-\s\s\r
-\s\sEXPORT InternalMemSetMem\r
-\s\s\r
-\s\sAREA AsmMemStuff, CODE, READONLY\r
+  \r
+  EXPORT InternalMemSetMem\r
+  \r
+  AREA AsmMemStuff, CODE, READONLY\r
 \r
 InternalMemSetMem\r
-\s\sstmfd\s\ssp!, {r4-r11, lr}\r
-\s\stst\s\s  r0, #3\r
-\s\smovne\s\sr3, #0\r
-\s\smoveq\s\sr3, #1\r
-\s\scmp\s\s  r1, #31\r
-\s\smovls lr, #0\r
-\s\sandhi\s\slr, r3, #1\r
-\s\scmp\s\s  lr, #0\r
-\s\smov\s\s  r12, r0\r
-\s\sbne\s\s  L31\r
+  stmfd  sp!, {r4-r11, lr}\r
+  tst    r0, #3\r
+  movne  r3, #0\r
+  moveq  r3, #1\r
+  cmp    r1, #31\r
+  movls lr, #0\r
+  andhi  lr, r3, #1\r
+  cmp    lr, #0\r
+  mov    r12, r0\r
+  bne    L31\r
 L32\r
-\s\smov\s\s  r3, #0\r
-\s\sb\s\s    L43\r
+  mov    r3, #0\r
+  b      L43\r
 L31\r
   and   r4, r2, #0xff\r
   orr   r4, r4, r4, LSL #8\r
   orr   r4, r4, r4, LSL #16  \r
-\s\smov   r5, r4\r
-\s\smov   r5, r4\r
-\s\smov   r6, r4\r
-\s\smov   r7, r4 \r
-\s\smov   r8, r4 \r
-\s\smov   r9, r4 \r
-\s\smov   r10, r4 \r
-\s\smov   r11, r4 \r
-\s\sb\s\s    L32\r
+  mov   r5, r4\r
+  mov   r5, r4\r
+  mov   r6, r4\r
+  mov   r7, r4 \r
+  mov   r8, r4 \r
+  mov   r9, r4 \r
+  mov   r10, r4 \r
+  mov   r11, r4 \r
+  b      L32\r
 L34\r
-\s\scmp\s\s    lr, #0\r
-\s\sstreqb\s\sr2, [r12], #1\r
-\s\ssubeq\s\s  r1, r1, #1\r
-\s\sbeq\s\s    L43\r
-\s\ssub\s\s    r1, r1, #32\r
-\s\scmp\s\s    r1, #31\r
-\s\smovls\s\s  lr, r3\r
-\s\sstmia\s\s  r12!, {r4-r11}\r
+  cmp      lr, #0\r
+  streqb  r2, [r12], #1\r
+  subeq    r1, r1, #1\r
+  beq      L43\r
+  sub      r1, r1, #32\r
+  cmp      r1, #31\r
+  movls    lr, r3\r
+  stmia    r12!, {r4-r11}\r
 L43\r
-\s\scmp\s\s    r1, #0\r
-\s\sbne\s\s    L34\r
-\s\sldmfd\s\s  sp!, {r4-r11, pc}\r
-\s\s\r
+  cmp      r1, #0\r
+  bne      L34\r
+  ldmfd    sp!, {r4-r11, pc}\r
+  \r
   END\r
   
\ No newline at end of file
index 2e389b045f2a02e5e15085967f071dc9eeae7a10..8cfd9a9c50f5335b4de62a9223d0262ebf05fc83 100755 (executable)
@@ -42,73 +42,73 @@ InternalMemCopyMem (
 GCC_ASM_EXPORT(InternalMemCopyMem)\r
 \r
 ASM_PFX(InternalMemCopyMem):\r
-\s\sstmfd\s\ssp!, {r4, r9, lr}\r
-\s\stst\s\sr0, #3\r
-\s\smov\s\sr4, r0\r
-\s\smov\s\sr9, r0\r
-\s\smov\s\sip, r2\r
-\s\smov\s\slr, r1\r
-\s\smovne\s\sr0, #0\r
-\s\sbne\s\sL4\r
-\s\stst\s\sr1, #3\r
-\s\smovne\s\sr3, #0\r
-\s\smoveq\s\sr3, #1\r
-\s\scmp\s\sr2, #127\r
-\s\smovls\s\sr0, #0\r
-\s\sandhi\s\sr0, r3, #1\r
+  stmfd  sp!, {r4, r9, lr}\r
+  tst  r0, #3\r
+  mov  r4, r0\r
+  mov  r9, r0\r
+  mov  ip, r2\r
+  mov  lr, r1\r
+  movne  r0, #0\r
+  bne  L4\r
+  tst  r1, #3\r
+  movne  r3, #0\r
+  moveq  r3, #1\r
+  cmp  r2, #127\r
+  movls  r0, #0\r
+  andhi  r0, r3, #1\r
 L4:\r
-\s\scmp\s\sr4, r1\r
-\s\sbcc\s\sL26\r
-\s\sbls\s\sL7\r
-\s\srsb\s\sr3, r1, r4\r
-\s\scmp\s\sip, r3\r
-\s\sbcc\s\sL26\r
-\s\scmp\s\sip, #0\r
-\s\sbeq\s\sL7\r
-\s\sadd\s\sr9, r4, ip\r
-\s\sadd\s\slr, ip, r1\r
-\s\sb\s\sL16\r
+  cmp  r4, r1\r
+  bcc  L26\r
+  bls  L7\r
+  rsb  r3, r1, r4\r
+  cmp  ip, r3\r
+  bcc  L26\r
+  cmp  ip, #0\r
+  beq  L7\r
+  add  r9, r4, ip\r
+  add  lr, ip, r1\r
+  b  L16\r
 L29:\r
-\s\ssub\s\sip, ip, #8\r
-\s\scmp\s\sip, #7\r
-\s\sldrd\s\sr2, [lr, #-8]!\r
-\s\smovls\s\sr0, #0\r
-\s\scmp\s\sip, #0\r
-\s\sstrd\s\sr2, [r9, #-8]!\r
-\s\sbeq\s\sL7\r
+  sub  ip, ip, #8\r
+  cmp  ip, #7\r
+  ldrd  r2, [lr, #-8]!\r
+  movls  r0, #0\r
+  cmp  ip, #0\r
+  strd  r2, [r9, #-8]!\r
+  beq  L7\r
 L16:\r
-\s\scmp\s\sr0, #0\r
-\s\sbne\s\sL29\r
-\s\ssub\s\sr3, lr, #1\r
-\s\ssub\s\sip, ip, #1\r
-\s\sldrb\s\sr3, [r3, #0]\s\s\r
-\s\ssub\s\sr2, r9, #1\r
-\s\scmp\s\sip, #0\r
-\s\ssub\s\sr9, r9, #1\r
-\s\ssub\s\slr, lr, #1\r
-\s\sstrb\s\sr3, [r2, #0]\r
-\s\sbne\s\sL16\r
-\s\sb   L7\r
+  cmp  r0, #0\r
+  bne  L29\r
+  sub  r3, lr, #1\r
+  sub  ip, ip, #1\r
+  ldrb  r3, [r3, #0]  \r
+  sub  r2, r9, #1\r
+  cmp  ip, #0\r
+  sub  r9, r9, #1\r
+  sub  lr, lr, #1\r
+  strb  r3, [r2, #0]\r
+  bne  L16\r
+  b   L7\r
 L11:\r
-\s\sldrb\s\sr3, [lr], #1\s\s\r
-\s\ssub\s\sip, ip, #1\r
-\s\sstrb\s\sr3, [r9], #1\r
+  ldrb  r3, [lr], #1  \r
+  sub  ip, ip, #1\r
+  strb  r3, [r9], #1\r
 L26:\r
-\s\scmp\s\sip, #0\r
-\s\sbeq\s\sL7\r
+  cmp  ip, #0\r
+  beq  L7\r
 L30:\r
-\s\scmp\s\sr0, #0\r
-\s\sbeq\s\sL11\r
-\s\ssub\s\sip, ip, #128          // 32\r
-\s\scmp\s\sip, #127              // 31\r
-\s\svldm     lr!, {d0-d15}\r
-\s\smovls\s\sr0, #0\r
-\s\scmp\s\sip, #0\r
-\s\svstm  r9!, {d0-d15}\r
-\s\sbne\s\sL30\r
+  cmp  r0, #0\r
+  beq  L11\r
+  sub  ip, ip, #128          // 32\r
+  cmp  ip, #127              // 31\r
+  vldm     lr!, {d0-d15}\r
+  movls  r0, #0\r
+  cmp  ip, #0\r
+  vstm  r9!, {d0-d15}\r
+  bne  L30\r
 L7:\r
   dsb\r
-  mov\s\sr0, r4\r
-\s\sldmfd\s\ssp!, {r4, r9, pc}\r
+  mov  r0, r4\r
+  ldmfd  sp!, {r4, r9, pc}\r
 \r
   \r
index a0b7596a9fa850955dbadfe56fd8ef7bea1b51f4..e7cbdf1ed0ba82cba85e54daec3828365883d7e0 100755 (executable)
@@ -37,79 +37,79 @@ InternalMemCopyMem (
   IN      UINTN                     Length\r
   )\r
 **/\r
-\s\sEXPORT InternalMemCopyMem\r
+  EXPORT InternalMemCopyMem\r
 
-\s\sAREA AsmMemStuff, CODE, READONLY
+  AREA AsmMemStuff, CODE, READONLY
 \r
 InternalMemCopyMem\r
-\s\sstmfd\s\ssp!, {r4, r9, lr}
-\s\stst\s\sr0, #3
-\s\smov\s\sr4, r0
-\s\smov\s\sr9, r0
-\s\smov\s\sip, r2
-\s\smov\s\slr, r1
-\s\smovne\s\sr0, #0
-\s\sbne\s\sL4
-\s\stst\s\sr1, #3
-\s\smovne\s\sr3, #0
-\s\smoveq\s\sr3, #1
-\s\scmp\s\sr2, #127
-\s\smovls\s\sr0, #0
-\s\sandhi\s\sr0, r3, #1
+  stmfd  sp!, {r4, r9, lr}
+  tst  r0, #3
+  mov  r4, r0
+  mov  r9, r0
+  mov  ip, r2
+  mov  lr, r1
+  movne  r0, #0
+  bne  L4
+  tst  r1, #3
+  movne  r3, #0
+  moveq  r3, #1
+  cmp  r2, #127
+  movls  r0, #0
+  andhi  r0, r3, #1
 L4
-\s\scmp\s\sr4, r1
-\s\sbcc\s\sL26
-\s\sbls\s\sL7
-\s\srsb\s\sr3, r1, r4
-\s\scmp\s\sip, r3
-\s\sbcc\s\sL26
-\s\scmp\s\sip, #0
-\s\sbeq\s\sL7
-\s\sadd\s\sr9, r4, ip
-\s\sadd\s\slr, ip, r1
-\s\sb\s\sL16
+  cmp  r4, r1
+  bcc  L26
+  bls  L7
+  rsb  r3, r1, r4
+  cmp  ip, r3
+  bcc  L26
+  cmp  ip, #0
+  beq  L7
+  add  r9, r4, ip
+  add  lr, ip, r1
+  b  L16
 L29
-\s\ssub\s\sip, ip, #8
-\s\scmp\s\sip, #7
-\s\sldrd\s\sr2, [lr, #-8]!
-\s\smovls\s\sr0, #0
-\s\scmp\s\sip, #0
-\s\sstrd\s\sr2, [r9, #-8]!
-\s\sbeq\s\sL7
+  sub  ip, ip, #8
+  cmp  ip, #7
+  ldrd  r2, [lr, #-8]!
+  movls  r0, #0
+  cmp  ip, #0
+  strd  r2, [r9, #-8]!
+  beq  L7
 L16
-\s\scmp\s\sr0, #0
-\s\sbne\s\sL29
-\s\ssub\s\sr3, lr, #1
-\s\ssub\s\sip, ip, #1
-\s\sldrb\s\sr3, [r3, #0]\s\s
-\s\ssub\s\sr2, r9, #1
-\s\scmp\s\sip, #0
-\s\ssub\s\sr9, r9, #1
-\s\ssub\s\slr, lr, #1
-\s\sstrb\s\sr3, [r2, #0]
-\s\sbne\s\sL16
-\s\sb   L7
+  cmp  r0, #0
+  bne  L29
+  sub  r3, lr, #1
+  sub  ip, ip, #1
+  ldrb  r3, [r3, #0]  
+  sub  r2, r9, #1
+  cmp  ip, #0
+  sub  r9, r9, #1
+  sub  lr, lr, #1
+  strb  r3, [r2, #0]
+  bne  L16
+  b   L7
 L11
-\s\sldrb\s\sr3, [lr], #1\s\s
-\s\ssub\s\sip, ip, #1
-\s\sstrb\s\sr3, [r9], #1
+  ldrb  r3, [lr], #1  
+  sub  ip, ip, #1
+  strb  r3, [r9], #1
 L26
-\s\scmp\s\sip, #0
-\s\sbeq\s\sL7
+  cmp  ip, #0
+  beq  L7
 L30
-\s\scmp\s\sr0, #0
-\s\sbeq\s\sL11
-\s\ssub\s\sip, ip, #128          // 32
-\s\scmp\s\sip, #127              // 31
-\s\svldm     lr!, {d0-d15}
-\s\smovls\s\sr0, #0
-\s\scmp\s\sip, #0
-\s\svstm  r9!, {d0-d15}
-\s\sbne\s\sL30
+  cmp  r0, #0
+  beq  L11
+  sub  ip, ip, #128          // 32
+  cmp  ip, #127              // 31
+  vldm     lr!, {d0-d15}
+  movls  r0, #0
+  cmp  ip, #0
+  vstm  r9!, {d0-d15}
+  bne  L30
 L7
   dsb
-  mov\s\sr0, r4
-\s\sldmfd\s\ssp!, {r4, r9, pc}
+  mov  r0, r4
+  ldmfd  sp!, {r4, r9, pc}
 \r
   END\r
   \r
index 24388ebba645990fedb0bc292ca15ae1285e0042..d5c50cbef4b0610c3a7545f604945728cf10a8d1 100755 (executable)
@@ -34,25 +34,25 @@ InternalMemSetMem (
   IN      UINT8                     Value\r
   )\r
 **/\r
-\s\s\r
+  \r
 .text\r
 .align 2\r
 GCC_ASM_EXPORT(InternalMemSetMem)\r
 \r
 ASM_PFX(InternalMemSetMem):\r
-\s\sstmfd\s\ssp!, {r4-r7, lr}\r
-\s\stst\s\s  r0, #3\r
-\s\smovne\s\sr3, #0\r
-\s\smoveq\s\sr3, #1\r
-\s\scmp\s\s  r1, #127\r
-\s\smovls lr, #0\r
-\s\sandhi\s\slr, r3, #1\r
-\s\scmp\s\s  lr, #0\r
-\s\smov\s\s  r12, r0\r
-\s\sbne\s\s  L31\r
+  stmfd  sp!, {r4-r7, lr}\r
+  tst    r0, #3\r
+  movne  r3, #0\r
+  moveq  r3, #1\r
+  cmp    r1, #127\r
+  movls lr, #0\r
+  andhi  lr, r3, #1\r
+  cmp    lr, #0\r
+  mov    r12, r0\r
+  bne    L31\r
 L32:\r
-\s\smov\s\s  r3, #0\r
-\s\sb\s\s    L43\r
+  mov    r3, #0\r
+  b      L43\r
 L31:\r
   vdup.8  q0,r2\r
   vmov    q1,q0\r
@@ -62,19 +62,19 @@ L31:
   vmov    q5,q0\r
   vmov    q6,q0\r
   vmov    q7,q0\r
-\s\sb\s\s      L32\r
+  b        L32\r
 L34:\r
-\s\scmp\s\s    lr, #0\r
-\s\sstreqb\s\sr2, [r12], #1\r
-\s\ssubeq\s\s  r1, r1, #1\r
-\s\sbeq\s\s    L43\r
-\s\ssub\s\s    r1, r1, #128\r
-\s\scmp\s\s    r1, #127\r
-\s\scmp\s\s    r1, #31\r
-\s\smovls\s\s  lr, r3\r
-\s\svstm    r12!, {d0-d15}\r
+  cmp      lr, #0\r
+  streqb  r2, [r12], #1\r
+  subeq    r1, r1, #1\r
+  beq      L43\r
+  sub      r1, r1, #128\r
+  cmp      r1, #127\r
+  cmp      r1, #31\r
+  movls    lr, r3\r
+  vstm    r12!, {d0-d15}\r
 L43:\r
-\s\scmp\s\s    r1, #0\r
-\s\sbne\s\s    L34\r
-\s\sldmfd\s\s  sp!, {pc}\r
-\s\s
\ No newline at end of file
+  cmp      r1, #0\r
+  bne      L34\r
+  ldmfd    sp!, {pc}\r
+  
\ No newline at end of file
index b0d26d641ca5caa59cf81e4bfd0963e8fd08e96c..bbab580cf135d9d37b0657b80e174e89bda1e51c 100755 (executable)
@@ -33,25 +33,25 @@ InternalMemSetMem (
   IN      UINT8                     Value\r
   )\r
 **/\r
-\s\s\r
-\s\sEXPORT InternalMemSetMem\r
-\s\s\r
-\s\sAREA AsmMemStuff, CODE, READONLY
+  \r
+  EXPORT InternalMemSetMem\r
+  \r
+  AREA AsmMemStuff, CODE, READONLY
 \r
 InternalMemSetMem\r
-\s\sstmfd\s\ssp!, {lr}\r
-\s\stst\s\s  r0, #3\r
-\s\smovne\s\sr3, #0\r
-\s\smoveq\s\sr3, #1\r
-\s\scmp\s\s  r1, #127\r
-\s\smovls lr, #0\r
-\s\sandhi\s\slr, r3, #1\r
-\s\scmp\s\s  lr, #0\r
-\s\smov\s\s  r12, r0\r
-\s\sbne\s\s  L31\r
+  stmfd  sp!, {lr}\r
+  tst    r0, #3\r
+  movne  r3, #0\r
+  moveq  r3, #1\r
+  cmp    r1, #127\r
+  movls lr, #0\r
+  andhi  lr, r3, #1\r
+  cmp    lr, #0\r
+  mov    r12, r0\r
+  bne    L31\r
 L32\r
-\s\smov\s\s  r3, #0\r
-\s\sb\s\s    L43\r
+  mov    r3, #0\r
+  b      L43\r
 L31\r
   vdup.8  q0,r2\r
   vmov    q1,q0\r
@@ -61,20 +61,20 @@ L31
   vmov    q5,q0\r
   vmov    q6,q0\r
   vmov    q7,q0\r
-\s\sb\s\s      L32\r
+  b        L32\r
 L34\r
-\s\scmp\s\s    lr, #0\r
-\s\sstreqb\s\sr2, [r12], #1\r
-\s\ssubeq\s\s  r1, r1, #1\r
-\s\sbeq\s\s    L43\r
-\s\ssub\s\s    r1, r1, #128\r
-\s\scmp\s\s    r1, #127\r
-\s\smovls\s\s  lr, r3\r
-\s\svstm    r12!, {d0-d15}\r
+  cmp      lr, #0\r
+  streqb  r2, [r12], #1\r
+  subeq    r1, r1, #1\r
+  beq      L43\r
+  sub      r1, r1, #128\r
+  cmp      r1, #127\r
+  movls    lr, r3\r
+  vstm    r12!, {d0-d15}\r
 L43\r
-\s\scmp\s\s    r1, #0\r
-\s\sbne\s\s    L34\r
-\s\sldmfd\s\s  sp!, {pc}\r
-\s\s\r
+  cmp      r1, #0\r
+  bne      L34\r
+  ldmfd    sp!, {pc}\r
+  \r
   END\r
   
\ No newline at end of file
index e5792b8afde8997d30275cac404d8d9fa090d7b4..0b7f9d39a5eb18b80e23f67aaad09cd4eac2d804 100644 (file)
@@ -34,8 +34,8 @@ EFI_STATUS BdsLoadFileFromSimpleFileSystem(
     }
 
     //Try to Open the volume and get root directory
-\s\sStatus = FsProtocol->OpenVolume(FsProtocol, &Fs);
-\s\sif (EFI_ERROR(Status)) {
+  Status = FsProtocol->OpenVolume(FsProtocol, &Fs);
+  if (EFI_ERROR(Status)) {
         return Status;
     }
 
index 89beba087710d771352f0d2f3418146264a16408..5578797125d27e6ca54fbf9bfcd18368889b6676 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__ashldi3)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__ashldi3)
+  
 ASM_PFX(__ashldi3):
-\s\scmp\s\sr2, #31
-\s\sbls\s\sL2
-\s\scmp\s\sr2, #63
-\s\ssubls\s\sr2, r2, #32
-\s\smovls\s\sr2, r0, asl r2
-\s\smovhi\s\sr2, #0
-\s\smov\s\sr1, r2
-\s\smov\s\sr0, #0
-\s\sbx\s\slr
+  cmp  r2, #31
+  bls  L2
+  cmp  r2, #63
+  subls  r2, r2, #32
+  movls  r2, r0, asl r2
+  movhi  r2, #0
+  mov  r1, r2
+  mov  r0, #0
+  bx  lr
 L2:
-\s\scmp\s\sr2, #0
-\s\srsbne\s\sr3, r2, #32
-\s\smovne\s\sr3, r0, lsr r3
-\s\smovne\s\sr0, r0, asl r2
-\s\sorrne\s\sr1, r3, r1, asl r2
-\s\sbx\s\slr
+  cmp  r2, #0
+  rsbne  r3, r2, #32
+  movne  r3, r0, lsr r3
+  movne  r0, r0, asl r2
+  orrne  r1, r3, r1, asl r2
+  bx  lr
index 8c99f18e520ca70639410239e0e064e1c7797f8a..defd1f081c12940a0e381c95ffb9f7e6f938e6be 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__ashrdi3)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__ashrdi3)
 
 ASM_PFX(__ashrdi3):
-\s\scmp\s\sr2, #31
-\s\sbls\s\sL2
-\s\scmp\s\sr2, #63
-\s\ssubls\s\sr2, r2, #32
-\s\smov\s\sip, r1, asr #31
-\s\smovls\s\sr2, r1, asr r2
-\s\smovhi\s\sr2, ip
-\s\smov\s\sr0, r2
-\s\smov\s\sr1, ip
-\s\sbx\s\slr
+  cmp  r2, #31
+  bls  L2
+  cmp  r2, #63
+  subls  r2, r2, #32
+  mov  ip, r1, asr #31
+  movls  r2, r1, asr r2
+  movhi  r2, ip
+  mov  r0, r2
+  mov  r1, ip
+  bx  lr
 L2:
-\s\scmp\s\sr2, #0
-\s\srsbne\s\sr3, r2, #32
-\s\smovne\s\sr3, r1, asl r3
-\s\smovne\s\sr1, r1, asr r2
-\s\sorrne\s\sr0, r3, r0, lsr r2
-\s\sbx\s\slr
+  cmp  r2, #0
+  rsbne  r3, r2, #32
+  movne  r3, r1, asl r3
+  movne  r1, r1, asr r2
+  orrne  r0, r3, r0, lsr r2
+  bx  lr
index ed01174bd2fd511d85cc34be3ad96df2ebe70d1d..11ea95cef47014009c00b2b7f7db1c2128d7153f 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__clzsi2)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__clzsi2)
 
 ASM_PFX(__clzsi2):
-\s\s@ frame_needed = 1, uses_anonymous_args = 0
-\s\sstmfd\s\ssp!, {r7, lr}
-\s\sadd\s\sr7, sp, #0
-\s\smovs\s\sr3, r0, lsr #16
-\s\smovne\s\sr3, #16
-\s\smoveq\s\sr3, #0
-\s\smovne\s\sr9, #0
-\s\smoveq\s\sr9, #16
-\s\smov\s\sr3, r0, lsr r3
-\s\stst\s\sr3, #65280
-\s\smovne\s\sr0, #8
-\s\smoveq\s\sr0, #0
-\s\smovne\s\slr, #0
-\s\smoveq\s\slr, #8
-\s\smov\s\sr3, r3, lsr r0
-\s\stst\s\sr3, #240
-\s\smovne\s\sr0, #4
-\s\smoveq\s\sr0, #0
-\s\smovne\s\sip, #0
-\s\smoveq\s\sip, #4
-\s\smov\s\sr3, r3, lsr r0
-\s\stst\s\sr3, #12
-\s\smovne\s\sr0, #2
-\s\smoveq\s\sr0, #0
-\s\smovne\s\sr1, #0
-\s\smoveq\s\sr1, #2
-\s\smov\s\sr2, r3, lsr r0
-\s\sadd\s\sr3, lr, r9
-\s\sadd\s\sr0, r3, ip
-\s\sadd\s\sr1, r0, r1
-\s\smov\s\sr0, r2, lsr #1
-\s\seor\s\sr0, r0, #1
-\s\sands\s\sr0, r0, #1
-\s\smvnne\s\sr0, #0
-\s\srsb\s\sr3, r2, #2
-\s\sand\s\sr0, r0, r3
-\s\sadd\s\sr0, r1, r0
-\s\sldmfd\s\ssp!, {r7, pc}
+  @ frame_needed = 1, uses_anonymous_args = 0
+  stmfd  sp!, {r7, lr}
+  add  r7, sp, #0
+  movs  r3, r0, lsr #16
+  movne  r3, #16
+  moveq  r3, #0
+  movne  r9, #0
+  moveq  r9, #16
+  mov  r3, r0, lsr r3
+  tst  r3, #65280
+  movne  r0, #8
+  moveq  r0, #0
+  movne  lr, #0
+  moveq  lr, #8
+  mov  r3, r3, lsr r0
+  tst  r3, #240
+  movne  r0, #4
+  moveq  r0, #0
+  movne  ip, #0
+  moveq  ip, #4
+  mov  r3, r3, lsr r0
+  tst  r3, #12
+  movne  r0, #2
+  moveq  r0, #0
+  movne  r1, #0
+  moveq  r1, #2
+  mov  r2, r3, lsr r0
+  add  r3, lr, r9
+  add  r0, r3, ip
+  add  r1, r0, r1
+  mov  r0, r2, lsr #1
+  eor  r0, r0, #1
+  ands  r0, r0, #1
+  mvnne  r0, #0
+  rsb  r3, r2, #2
+  and  r0, r0, r3
+  add  r0, r1, r0
+  ldmfd  sp!, {r7, pc}
index 3d9025ad1acf6bcc8eaf6ba57186eeb9a6150e67..0c8e78d961df9a9877955a3bec1c5da477b5dc32 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__ctzsi2)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__ctzsi2)
+  
 ASM_PFX(__ctzsi2):
-\s\suxth\s\sr3, r0
-\s\scmp\s\sr3, #0
-\s\smoveq\s\sip, #16
-\s\smovne\s\sip, #0
-\s\s@ lr needed for prologue
-\s\smov\s\sr0, r0, lsr ip
-\s\stst\s\sr0, #255
-\s\smovne\s\sr3, #0
-\s\smoveq\s\sr3, #8
-\s\smov\s\sr0, r0, lsr r3
-\s\stst\s\sr0, #15
-\s\smovne\s\sr1, #0
-\s\smoveq\s\sr1, #4
-\s\sadd\s\sr3, r3, ip
-\s\smov\s\sr0, r0, lsr r1
-\s\stst\s\sr0, #3
-\s\smovne\s\sr2, #0
-\s\smoveq\s\sr2, #2
-\s\sadd\s\sr3, r3, r1
-\s\smov\s\sr0, r0, lsr r2
-\s\sand\s\sr0, r0, #3
-\s\sadd\s\sr2, r3, r2
-\s\seor\s\sr3, r0, #1
-\s\smov\s\sr0, r0, lsr #1
-\s\sands\s\sr3, r3, #1
-\s\smvnne\s\sr3, #0
-\s\srsb\s\sr0, r0, #2
-\s\sand\s\sr0, r3, r0
-\s\sadd\s\sr0, r2, r0
-\s\sbx\s\slr
+  uxth  r3, r0
+  cmp  r3, #0
+  moveq  ip, #16
+  movne  ip, #0
+  @ lr needed for prologue
+  mov  r0, r0, lsr ip
+  tst  r0, #255
+  movne  r3, #0
+  moveq  r3, #8
+  mov  r0, r0, lsr r3
+  tst  r0, #15
+  movne  r1, #0
+  moveq  r1, #4
+  add  r3, r3, ip
+  mov  r0, r0, lsr r1
+  tst  r0, #3
+  movne  r2, #0
+  moveq  r2, #2
+  add  r3, r3, r1
+  mov  r0, r0, lsr r2
+  and  r0, r0, #3
+  add  r2, r3, r2
+  eor  r3, r0, #1
+  mov  r0, r0, lsr #1
+  ands  r3, r3, #1
+  mvnne  r3, #0
+  rsb  r0, r0, #2
+  and  r0, r3, r0
+  add  r0, r2, r0
+  bx  lr
index 080091a52fa1f8dc954bcfadd5ebc06ae6aa849d..342f376bb02d087c1a2eb3b1edcbe9c8ba2b97c7 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__divdi3)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__divdi3)
+  
 ASM_PFX(__divdi3):
-\s\s@ args = 0, pretend = 0, frame = 0
-\s\s@ frame_needed = 1, uses_anonymous_args = 0
-\s\sstmfd\s\ssp!, {r4, r5, r7, lr}
-\s\smov\s\sr4, r3, asr #31
-\s\sadd\s\sr7, sp, #8
-\s\sstmfd\s\ssp!, {r10, r11}
-\s\smov\s\sr10, r1, asr #31
-\s\ssub\s\ssp, sp, #8
-\s\smov\s\sr11, r10
-\s\smov\s\sr5, r4
-\s\seor\s\sr0, r0, r10
-\s\seor\s\sr1, r1, r10
-\s\seor\s\sr2, r2, r4
-\s\seor\s\sr3, r3, r4
-\s\ssubs\s\sr2, r2, r4
-\s\ssbc\s\sr3, r3, r5
-\s\smov\s\sip, #0
-\s\ssubs\s\sr0, r0, r10
-\s\ssbc\s\sr1, r1, r11
-\s\sstr\s\sip, [sp, #0]
-\s\sbl\s\sASM_PFX(__udivmoddi4)
-\s\seor\s\sr2, r10, r4
-\s\seor\s\sr3, r10, r4
-\s\seor\s\sr0, r0, r2
-\s\seor\s\sr1, r1, r3
-\s\ssubs\s\sr0, r0, r2
-\s\ssbc\s\sr1, r1, r3
-\s\ssub\s\ssp, r7, #16
-\s\sldmfd\s\ssp!, {r10, r11}
-\s\sldmfd\s\ssp!, {r4, r5, r7, pc}
+  @ args = 0, pretend = 0, frame = 0
+  @ frame_needed = 1, uses_anonymous_args = 0
+  stmfd  sp!, {r4, r5, r7, lr}
+  mov  r4, r3, asr #31
+  add  r7, sp, #8
+  stmfd  sp!, {r10, r11}
+  mov  r10, r1, asr #31
+  sub  sp, sp, #8
+  mov  r11, r10
+  mov  r5, r4
+  eor  r0, r0, r10
+  eor  r1, r1, r10
+  eor  r2, r2, r4
+  eor  r3, r3, r4
+  subs  r2, r2, r4
+  sbc  r3, r3, r5
+  mov  ip, #0
+  subs  r0, r0, r10
+  sbc  r1, r1, r11
+  str  ip, [sp, #0]
+  bl  ASM_PFX(__udivmoddi4)
+  eor  r2, r10, r4
+  eor  r3, r10, r4
+  eor  r0, r0, r2
+  eor  r1, r1, r3
+  subs  r0, r0, r2
+  sbc  r1, r1, r3
+  sub  sp, r7, #16
+  ldmfd  sp!, {r10, r11}
+  ldmfd  sp!, {r4, r5, r7, pc}
index 473f1f22b9367ce9e6eb427ca728ef1130a07e06..3976fda1486298ea8f1bc2cc9f73404d6a893850 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__divsi3)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__divsi3)
+  
 ASM_PFX(__divsi3):
-\s\seor\s\sr3, r0, r0, asr #31
-\s\seor\s\sr2, r1, r1, asr #31
-\s\sstmfd\s\ssp!, {r4, r5, r7, lr}
-\s\smov\s\sr5, r0, asr #31
-\s\sadd\s\sr7, sp, #8
-\s\smov\s\sr4, r1, asr #31
-\s\ssub\s\sr0, r3, r0, asr #31
-\s\ssub\s\sr1, r2, r1, asr #31
-\s\sbl\s\sASM_PFX(__udivsi3)
-\s\seor\s\sr1, r5, r4
-\s\seor\s\sr0, r0, r1
-\s\srsb\s\sr0, r1, r0
-\s\sldmfd\s\ssp!, {r4, r5, r7, pc}
+  eor  r3, r0, r0, asr #31
+  eor  r2, r1, r1, asr #31
+  stmfd  sp!, {r4, r5, r7, lr}
+  mov  r5, r0, asr #31
+  add  r7, sp, #8
+  mov  r4, r1, asr #31
+  sub  r0, r3, r0, asr #31
+  sub  r1, r2, r1, asr #31
+  bl  ASM_PFX(__udivsi3)
+  eor  r1, r5, r4
+  eor  r0, r0, r1
+  rsb  r0, r1, r0
+  ldmfd  sp!, {r4, r5, r7, pc}
index 2e7d70ab3625152b8691e3c21fe87c211f0c6c2f..02ecdfe8d7df7149f3ee31889e551b8d5d6f5b2a 100755 (executable)
@@ -13,9 +13,9 @@
 //------------------------------------------------------------------------------
 
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__aeabi_ldivmod)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__aeabi_ldivmod)
 
 //
 // A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}}, 
index 82e7cf78bbed4231497647e929dfd0ca822bde27..73d83599bafad8b1a106345dfeca6a1184c7fcf6 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__lshrdi3)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__lshrdi3)
+  
 ASM_PFX(__lshrdi3):
-\s\scmp\s\sr2, #31
-\s\sbls\s\sL2
-\s\scmp\s\sr2, #63
-\s\ssubls\s\sr2, r2, #32
-\s\smovls\s\sr2, r1, lsr r2
-\s\smovhi\s\sr2, #0
-\s\smov\s\sr0, r2
-\s\smov\s\sr1, #0
-\s\sbx\s\slr
+  cmp  r2, #31
+  bls  L2
+  cmp  r2, #63
+  subls  r2, r2, #32
+  movls  r2, r1, lsr r2
+  movhi  r2, #0
+  mov  r0, r2
+  mov  r1, #0
+  bx  lr
 L2:
-\s\scmp\s\sr2, #0
-\s\srsbne\s\sr3, r2, #32
-\s\smovne\s\sr3, r1, asl r3
-\s\smovne\s\sr1, r1, lsr r2
-\s\sorrne\s\sr0, r3, r0, lsr r2
-\s\sbx\s\slr
+  cmp  r2, #0
+  rsbne  r3, r2, #32
+  movne  r3, r1, asl r3
+  movne  r1, r1, lsr r2
+  orrne  r0, r3, r0, lsr r2
+  bx  lr
index 63d6c683d9286689864778809635fe3d94cde27d..18299326ca3e4c0e6877cd34039120a63263f5fc 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(memcpy)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(memcpy)
 
 ASM_PFX(memcpy):
-\s\sstmfd\s\ssp!, {r7, lr}
-\s\smov\s\sip, #0
-\s\sadd\s\sr7, sp, #0
-\s\smov\s\slr, r0
-\s\sb\s\sL4
+  stmfd  sp!, {r7, lr}
+  mov  ip, #0
+  add  r7, sp, #0
+  mov  lr, r0
+  b  L4
 L5:
-\s\sldrb\s\sr3, [r1], #1\s\s@ zero_extendqisi2
-\s\sadd\s\sip, ip, #1
-\s\sand\s\sr3, r3, #255
-\s\sstrb\s\sr3, [lr], #1
+  ldrb  r3, [r1], #1  @ zero_extendqisi2
+  add  ip, ip, #1
+  and  r3, r3, #255
+  strb  r3, [lr], #1
 L4:
-\s\scmp\s\sip, r2
-\s\sbne\s\sL5
-\s\sldmfd\s\ssp!, {r7, pc}
+  cmp  ip, r2
+  bne  L5
+  ldmfd  sp!, {r7, pc}
 
index 3cd71e9f5fd692f4fd94ed2866f5c843ef5972ff..35783620c7283dac2c6576771606bcbfa19db775 100644 (file)
 
 
   .text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT (memset)
+  .align 2
+  GCC_ASM_EXPORT (memset)
 
 
 ASM_PFX(memset):
 
-\s\s@ args = 0, pretend = 0, frame = 0
-\s\s@ frame_needed = 1, uses_anonymous_args = 0
-\s\sstmfd\s\ssp!, {r7, lr}
-\s\smov\s\sip, #0
-\s\sadd\s\sr7, sp, #0
-\s\smov\s\slr, r0
-\s\sb\s\sL9
+  @ args = 0, pretend = 0, frame = 0
+  @ frame_needed = 1, uses_anonymous_args = 0
+  stmfd  sp!, {r7, lr}
+  mov  ip, #0
+  add  r7, sp, #0
+  mov  lr, r0
+  b  L9
 L10:
-\s\sand\s\sr3, r1, #255
-\s\sadd\s\sip, ip, #1
-\s\sstrb\s\sr3, [lr], #1
+  and  r3, r1, #255
+  add  ip, ip, #1
+  strb  r3, [lr], #1
 L9:
-\s\scmp\s\sip, r2
-\s\sbne\s\sL10
-\s\sldmfd\s\ssp!, {r7, pc}
+  cmp  ip, r2
+  bne  L10
+  ldmfd  sp!, {r7, pc}
 
index c5b7ab301b3161246057aa9e6a076cd1b698ff2f..75572c82b64806855b2fe42e824a5920e727073f 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__moddi3)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__moddi3)
 
 ASM_PFX(__moddi3):
-\s\sstmfd\s\ssp!, {r4, r5, r7, lr}
-\s\smov\s\sr4, r1, asr #31
-\s\sadd\s\sr7, sp, #8
-\s\sstmfd\s\ssp!, {r10, r11}
-\s\smov\s\sr10, r3, asr #31
-\s\ssub\s\ssp, sp, #16
-\s\smov\s\sr5, r4
-\s\smov\s\sr11, r10
-\s\seor\s\sr0, r0, r4
-\s\seor\s\sr1, r1, r4
-\s\seor\s\sr2, r2, r10
-\s\seor\s\sr3, r3, r10
-\s\sadd\s\sip, sp, #8
-\s\ssubs\s\sr0, r0, r4
-\s\ssbc\s\sr1, r1, r5
-\s\ssubs\s\sr2, r2, r10
-\s\ssbc\s\sr3, r3, r11
-\s\sstr\s\sip, [sp, #0]
-\s\sbl\s\sASM_PFX(__udivmoddi4)
-\s\sldrd\s\sr0, [sp, #8]
-\s\seor\s\sr0, r0, r4
-\s\seor\s\sr1, r1, r4
-\s\ssubs\s\sr0, r0, r4
-\s\ssbc\s\sr1, r1, r5
-\s\ssub\s\ssp, r7, #16
-\s\sldmfd\s\ssp!, {r10, r11}
-\s\sldmfd\s\ssp!, {r4, r5, r7, pc}
+  stmfd  sp!, {r4, r5, r7, lr}
+  mov  r4, r1, asr #31
+  add  r7, sp, #8
+  stmfd  sp!, {r10, r11}
+  mov  r10, r3, asr #31
+  sub  sp, sp, #16
+  mov  r5, r4
+  mov  r11, r10
+  eor  r0, r0, r4
+  eor  r1, r1, r4
+  eor  r2, r2, r10
+  eor  r3, r3, r10
+  add  ip, sp, #8
+  subs  r0, r0, r4
+  sbc  r1, r1, r5
+  subs  r2, r2, r10
+  sbc  r3, r3, r11
+  str  ip, [sp, #0]
+  bl  ASM_PFX(__udivmoddi4)
+  ldrd  r0, [sp, #8]
+  eor  r0, r0, r4
+  eor  r1, r1, r4
+  subs  r0, r0, r4
+  sbc  r1, r1, r5
+  sub  sp, r7, #16
+  ldmfd  sp!, {r10, r11}
+  ldmfd  sp!, {r4, r5, r7, pc}
index 56b360426c2947b4e651e5787984c60aa3e637b2..eb698d604fe888bc5b99eef5bb282588f9f3c29b 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__modsi3)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__modsi3)
 
 ASM_PFX(__modsi3):
-\s\sstmfd\s\ssp!, {r4, r5, r7, lr}
-\s\sadd\s\sr7, sp, #8
-\s\smov\s\sr5, r0
-\s\smov\s\sr4, r1
-\s\sbl\s\s___divsi3
-\s\smul\s\sr0, r4, r0
-\s\srsb\s\sr0, r0, r5
-\s\sldmfd\s\ssp!, {r4, r5, r7, pc}
+  stmfd  sp!, {r4, r5, r7, lr}
+  add  r7, sp, #8
+  mov  r5, r0
+  mov  r4, r1
+  bl  ___divsi3
+  mul  r0, r4, r0
+  rsb  r0, r0, r5
+  ldmfd  sp!, {r4, r5, r7, pc}
index ab5d0cac2efdfbc594c37c5e0aa43b63f8444c36..36956c24e25d9fe65c8703b34dd33e80df42145d 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__muldi3)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__muldi3)
 
 ASM_PFX(__muldi3):
-\s\sstmfd\s\ssp!, {r4, r5, r6, r7, lr}
-\s\sadd\s\sr7, sp, #12
-\s\sstmfd\s\ssp!, {r8, r10, r11}
-\s\sldr\s\sr11, L4
-\s\smov\s\sr4, r0, lsr #16
-\s\sand\s\sr8, r0, r11
-\s\sand\s\sip, r2, r11
-\s\smul\s\slr, ip, r8
-\s\smul\s\sip, r4, ip
-\s\ssub\s\ssp, sp, #8
-\s\sadd\s\sr10, ip, lr, lsr #16
-\s\sand\s\sip, r10, r11
-\s\sand\s\slr, lr, r11
-\s\smov\s\sr6, r2, lsr #16
-\s\sstr\s\sr4, [sp, #4]
-\s\sadd\s\sr4, lr, ip, asl #16
-\s\smul\s\sip, r8, r6
-\s\smov\s\sr5, r10, lsr #16
-\s\sadd\s\sr10, ip, r4, lsr #16
-\s\sand\s\sip, r10, r11
-\s\sand\s\slr, r4, r11
-\s\sadd\s\sr4, lr, ip, asl #16
-\s\smul\s\sr0, r3, r0
-\s\sadd\s\sip, r5, r10, lsr #16
-\s\sldr\s\sr5, [sp, #4]
-\s\smla\s\sr0, r2, r1, r0
-\s\smla\s\sr5, r6, r5, ip
-\s\smov\s\sr10, r4
-\s\sadd\s\sr11, r0, r5
-\s\smov\s\sr1, r11
-\s\smov\s\sr0, r4
-\s\ssub\s\ssp, r7, #24
-\s\sldmfd\s\ssp!, {r8, r10, r11}
-\s\sldmfd\s\ssp!, {r4, r5, r6, r7, pc}
-\s\s.p2align 2
+  stmfd  sp!, {r4, r5, r6, r7, lr}
+  add  r7, sp, #12
+  stmfd  sp!, {r8, r10, r11}
+  ldr  r11, L4
+  mov  r4, r0, lsr #16
+  and  r8, r0, r11
+  and  ip, r2, r11
+  mul  lr, ip, r8
+  mul  ip, r4, ip
+  sub  sp, sp, #8
+  add  r10, ip, lr, lsr #16
+  and  ip, r10, r11
+  and  lr, lr, r11
+  mov  r6, r2, lsr #16
+  str  r4, [sp, #4]
+  add  r4, lr, ip, asl #16
+  mul  ip, r8, r6
+  mov  r5, r10, lsr #16
+  add  r10, ip, r4, lsr #16
+  and  ip, r10, r11
+  and  lr, r4, r11
+  add  r4, lr, ip, asl #16
+  mul  r0, r3, r0
+  add  ip, r5, r10, lsr #16
+  ldr  r5, [sp, #4]
+  mla  r0, r2, r1, r0
+  mla  r5, r6, r5, ip
+  mov  r10, r4
+  add  r11, r0, r5
+  mov  r1, r11
+  mov  r0, r4
+  sub  sp, r7, #24
+  ldmfd  sp!, {r8, r10, r11}
+  ldmfd  sp!, {r4, r5, r6, r7, pc}
+  .p2align 2
 L5:
-\s\s.align 2
+  .align 2
 L4:
-\s\s.long\s\s65535
+  .long  65535
index 533912426fca1cf96a2a1345c6045e88c1719ac0..5d369e9afbad98277850facca70b74be2adb4690 100644 (file)
@@ -13,8 +13,8 @@
 //------------------------------------------------------------------------------
 
 
-  EXPORT\s\s__ARM_ll_mullu
-  EXPORT\s\s__aeabi_lmul
+  EXPORT  __ARM_ll_mullu
+  EXPORT  __aeabi_lmul
        
   AREA  Math, CODE, READONLY
 
index 7a52a039ffd5f5bfcb8201dfb20f8285ebcc0c8b..8d34c5de52c9f18f385211848c8aaa5f37e0d4cd 100644 (file)
 
 
 
-    EXPORT\s\s__ARM_switch8
+    EXPORT  __ARM_switch8
 
-    AREA\s\sArmSwitch, CODE, READONLY
-\s\s
+    AREA  ArmSwitch, CODE, READONLY
+  
 __ARM_switch8
-\s\sLDRB\s\s  r12,[lr,#-1]
-\s\sCMP\s\s\s\s  r3,r12
-\s\sLDRBCC\s\sr3,[lr,r3]
-\s\sLDRBCS\s\sr3,[lr,r12]
-\s\sADD\s\s\s\s  r12,lr,r3,LSL #1
-\s\sBX\s\s\s\s  r12
+  LDRB    r12,[lr,#-1]
+  CMP      r3,r12
+  LDRBCC  r3,[lr,r3]
+  LDRBCS  r3,[lr,r12]
+  ADD      r12,lr,r3,LSL #1
+  BX      r12
   
     END
index ea5cf07ebaf66386ce87a1b34e0ce7b451379976..e85be6cae00e24af7450e4c05bd2c25dc551e830 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__ucmpdi2)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__ucmpdi2)
+  
 ASM_PFX(__ucmpdi2):
-\s\sstmfd\s\ssp!, {r4, r5, r8, lr}
-\s\scmp\s\sr1, r3
-\s\smov\s\sr8, r0
-\s\smov\s\sr4, r2
-\s\smov\s\sr5, r3
-\s\sbcc\s\sL2
-\s\sbhi\s\sL4
-\s\scmp\s\sr0, r2
-\s\sbcc\s\sL2
-\s\smovls\s\sr0, #1
-\s\sbls\s\sL8
-\s\sb\s\sL4
+  stmfd  sp!, {r4, r5, r8, lr}
+  cmp  r1, r3
+  mov  r8, r0
+  mov  r4, r2
+  mov  r5, r3
+  bcc  L2
+  bhi  L4
+  cmp  r0, r2
+  bcc  L2
+  movls  r0, #1
+  bls  L8
+  b  L4
 L2:
-\s\smov\s\sr0, #0
-\s\sb\s\sL8
+  mov  r0, #0
+  b  L8
 L4:
-\s\smov\s\sr0, #2
+  mov  r0, #2
 L8:
-\s\sldmfd\s\ssp!, {r4, r5, r8, pc}
+  ldmfd  sp!, {r4, r5, r8, pc}
index 36e2a11cd72f5f49e0c50a396df740251bd294d8..a8b9702707165564cbb592b4b500b09e79bd4309 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__udivdi3)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__udivdi3)
 
 ASM_PFX(__udivdi3):
-\s\sstmfd\s\ssp!, {r7, lr}
-\s\sadd\s\sr7, sp, #0
-\s\ssub\s\ssp, sp, #8
-\s\smov\s\sip, #0
-\s\sstr\s\sip, [sp, #0]
-\s\sbl\s\sASM_PFX(__udivmoddi4)
-\s\ssub\s\ssp, r7, #0
-\s\sldmfd\s\ssp!, {r7, pc}
+  stmfd  sp!, {r7, lr}
+  add  r7, sp, #0
+  sub  sp, sp, #8
+  mov  ip, #0
+  str  ip, [sp, #0]
+  bl  ASM_PFX(__udivmoddi4)
+  sub  sp, r7, #0
+  ldmfd  sp!, {r7, pc}
index 63e25094e90e6b6bbf73baae31770d982dc01d24..cadc1d291ac13a724f1c8b560b13a5a687ea5769 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__udivmoddi4)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__udivmoddi4)
+  
 ASM_PFX(__udivmoddi4):
-\s\sstmfd\s\ssp!, {r4, r5, r6, r7, lr}
-\s\sadd\s\sr7, sp, #12
-\s\sstmfd\s\ssp!, {r10, r11}
-\s\ssub\s\ssp, sp, #20
-\s\sstmia\s\ssp, {r2-r3}
-\s\sldr\s\sr6, [sp, #48]
-\s\sorrs\s\sr2, r2, r3
-\s\smov\s\sr10, r0
-\s\smov\s\sr11, r1
-\s\sbeq\s\sL2
-\s\ssubs\s\sip, r1, #0
-\s\sbne\s\sL4
-\s\scmp\s\sr3, #0
-\s\sbne\s\sL6
-\s\scmp\s\sr6, #0
-\s\sbeq\s\sL8
-\s\smov\s\sr1, r2
-\s\sbl\s\sASM_PFX(__umodsi3)
-\s\smov\s\sr1, #0
-\s\sstmia\s\sr6, {r0-r1}
+  stmfd  sp!, {r4, r5, r6, r7, lr}
+  add  r7, sp, #12
+  stmfd  sp!, {r10, r11}
+  sub  sp, sp, #20
+  stmia  sp, {r2-r3}
+  ldr  r6, [sp, #48]
+  orrs  r2, r2, r3
+  mov  r10, r0
+  mov  r11, r1
+  beq  L2
+  subs  ip, r1, #0
+  bne  L4
+  cmp  r3, #0
+  bne  L6
+  cmp  r6, #0
+  beq  L8
+  mov  r1, r2
+  bl  ASM_PFX(__umodsi3)
+  mov  r1, #0
+  stmia  r6, {r0-r1}
 L8:
-\s\sldr\s\sr1, [sp, #0]
-\s\smov\s\sr0, r10
-\s\sb\s\sL45
+  ldr  r1, [sp, #0]
+  mov  r0, r10
+  b  L45
 L6:
-\s\scmp\s\sr6, #0
-\s\smovne\s\sr1, #0
-\s\sstmneia\s\sr6, {r0-r1}
-\s\sb\s\sL2
+  cmp  r6, #0
+  movne  r1, #0
+  stmneia  r6, {r0-r1}
+  b  L2
 L4:
-\s\sldr\s\sr1, [sp, #0]
-\s\scmp\s\sr1, #0
-\s\sbne\s\sL12
-\s\sldr\s\sr2, [sp, #4]
-\s\scmp\s\sr2, #0
-\s\sbne\s\sL14
-\s\scmp\s\sr6, #0
-\s\sbeq\s\sL16
-\s\smov\s\sr1, r2
-\s\smov\s\sr0, r11
-\s\sbl\s\sASM_PFX(__umodsi3)
-\s\smov\s\sr1, #0
-\s\sstmia\s\sr6, {r0-r1}
+  ldr  r1, [sp, #0]
+  cmp  r1, #0
+  bne  L12
+  ldr  r2, [sp, #4]
+  cmp  r2, #0
+  bne  L14
+  cmp  r6, #0
+  beq  L16
+  mov  r1, r2
+  mov  r0, r11
+  bl  ASM_PFX(__umodsi3)
+  mov  r1, #0
+  stmia  r6, {r0-r1}
 L16:
-\s\sldr\s\sr1, [sp, #4]
-\s\smov\s\sr0, r11
+  ldr  r1, [sp, #4]
+  mov  r0, r11
 L45:
-\s\sbl\s\sASM_PFX(__udivsi3)
+  bl  ASM_PFX(__udivsi3)
 L46:
-\s\smov\s\sr10, r0
-\s\smov\s\sr11, #0
-\s\sb\s\sL10
+  mov  r10, r0
+  mov  r11, #0
+  b  L10
 L14:
-\s\ssubs\s\sr1, r0, #0
-\s\sbne\s\sL18
-\s\scmp\s\sr6, #0
-\s\sbeq\s\sL16
-\s\sldr\s\sr1, [sp, #4]
-\s\smov\s\sr0, r11
-\s\sbl\s\sASM_PFX(__umodsi3)
-\s\smov\s\sr4, r10
-\s\smov\s\sr5, r0
-\s\sstmia\s\sr6, {r4-r5}
-\s\sb\s\sL16
+  subs  r1, r0, #0
+  bne  L18
+  cmp  r6, #0
+  beq  L16
+  ldr  r1, [sp, #4]
+  mov  r0, r11
+  bl  ASM_PFX(__umodsi3)
+  mov  r4, r10
+  mov  r5, r0
+  stmia  r6, {r4-r5}
+  b  L16
 L18:
-\s\ssub\s\sr3, r2, #1
-\s\stst\s\sr2, r3
-\s\sbne\s\sL22
-\s\scmp\s\sr6, #0
-\s\smovne\s\sr4, r0
-\s\sandne\s\sr5, ip, r3
-\s\sstmneia\s\sr6, {r4-r5}
+  sub  r3, r2, #1
+  tst  r2, r3
+  bne  L22
+  cmp  r6, #0
+  movne  r4, r0
+  andne  r5, ip, r3
+  stmneia  r6, {r4-r5}
 L24:
-\s\srsb\s\sr3, r2, #0
-\s\sand\s\sr3, r2, r3
-\s\sclz\s\sr3, r3
-\s\srsb\s\sr3, r3, #31
-\s\smov\s\sr0, ip, lsr r3
-\s\sb\s\sL46
+  rsb  r3, r2, #0
+  and  r3, r2, r3
+  clz  r3, r3
+  rsb  r3, r3, #31
+  mov  r0, ip, lsr r3
+  b  L46
 L22:
-\s\sclz\s\sr2, r2
-\s\sclz\s\sr3, ip
-\s\srsb\s\sr3, r3, r2
-\s\scmp\s\sr3, #30
-\s\sbhi\s\sL48
-\s\srsb\s\sr2, r3, #31
-\s\sadd\s\slr, r3, #1
-\s\smov\s\sr3, r1, asl r2
-\s\sstr\s\sr3, [sp, #12]
-\s\smov\s\sr3, r1, lsr lr
-\s\sldr\s\sr0, [sp, #0]
-\s\smov\s\sr5, ip, lsr lr
-\s\sorr\s\sr4, r3, ip, asl r2
-\s\sstr\s\sr0, [sp, #8]
-\s\sb\s\sL29
+  clz  r2, r2
+  clz  r3, ip
+  rsb  r3, r3, r2
+  cmp  r3, #30
+  bhi  L48
+  rsb  r2, r3, #31
+  add  lr, r3, #1
+  mov  r3, r1, asl r2
+  str  r3, [sp, #12]
+  mov  r3, r1, lsr lr
+  ldr  r0, [sp, #0]
+  mov  r5, ip, lsr lr
+  orr  r4, r3, ip, asl r2
+  str  r0, [sp, #8]
+  b  L29
 L12:
-\s\sldr\s\sr3, [sp, #4]
-\s\scmp\s\sr3, #0
-\s\sbne\s\sL30
-\s\ssub\s\sr3, r1, #1
-\s\stst\s\sr1, r3
-\s\sbne\s\sL32
-\s\scmp\s\sr6, #0
-\s\sandne\s\sr3, r3, r0
-\s\smovne\s\sr2, r3
-\s\smovne\s\sr3, #0
-\s\sstmneia\s\sr6, {r2-r3}
+  ldr  r3, [sp, #4]
+  cmp  r3, #0
+  bne  L30
+  sub  r3, r1, #1
+  tst  r1, r3
+  bne  L32
+  cmp  r6, #0
+  andne  r3, r3, r0
+  movne  r2, r3
+  movne  r3, #0
+  stmneia  r6, {r2-r3}
 L34:
-\s\scmp\s\sr1, #1
-\s\sbeq\s\sL10
-\s\srsb\s\sr3, r1, #0
-\s\sand\s\sr3, r1, r3
-\s\sclz\s\sr3, r3
-\s\srsb\s\sr0, r3, #31
-\s\smov\s\sr1, ip, lsr r0
-\s\srsb\s\sr3, r0, #32
-\s\smov\s\sr0, r10, lsr r0
-\s\sorr\s\sip, r0, ip, asl r3
-\s\sstr\s\sr1, [sp, #12]
-\s\sstr\s\sip, [sp, #8]
-\s\sldrd\s\sr10, [sp, #8]
-\s\sb\s\sL10
+  cmp  r1, #1
+  beq  L10
+  rsb  r3, r1, #0
+  and  r3, r1, r3
+  clz  r3, r3
+  rsb  r0, r3, #31
+  mov  r1, ip, lsr r0
+  rsb  r3, r0, #32
+  mov  r0, r10, lsr r0
+  orr  ip, r0, ip, asl r3
+  str  r1, [sp, #12]
+  str  ip, [sp, #8]
+  ldrd  r10, [sp, #8]
+  b  L10
 L32:
-\s\sclz\s\sr2, r1
-\s\sclz\s\sr3, ip
-\s\srsb\s\sr3, r3, r2
-\s\srsb\s\sr4, r3, #31
-\s\smov\s\sr2, r0, asl r4
-\s\smvn\s\sr1, r3
-\s\sand\s\sr2, r2, r1, asr #31
-\s\sadd\s\slr, r3, #33
-\s\sstr\s\sr2, [sp, #8]
-\s\sadd\s\sr2, r3, #1
-\s\smov\s\sr3, r3, asr #31
-\s\sand\s\sr0, r3, r0, asl r1
-\s\smov\s\sr3, r10, lsr r2
-\s\sorr\s\sr3, r3, ip, asl r4
-\s\sand\s\sr3, r3, r1, asr #31
-\s\sorr\s\sr0, r0, r3
-\s\smov\s\sr3, ip, lsr lr
-\s\sstr\s\sr0, [sp, #12]
-\s\smov\s\sr0, r10, lsr lr
-\s\sand\s\sr5, r3, r2, asr #31
-\s\srsb\s\sr3, lr, #31
-\s\smov\s\sr3, r3, asr #31
-\s\sorr\s\sr0, r0, ip, asl r1
-\s\sand\s\sr3, r3, ip, lsr r2
-\s\sand\s\sr0, r0, r2, asr #31
-\s\sorr\s\sr4, r3, r0
-\s\sb\s\sL29
+  clz  r2, r1
+  clz  r3, ip
+  rsb  r3, r3, r2
+  rsb  r4, r3, #31
+  mov  r2, r0, asl r4
+  mvn  r1, r3
+  and  r2, r2, r1, asr #31
+  add  lr, r3, #33
+  str  r2, [sp, #8]
+  add  r2, r3, #1
+  mov  r3, r3, asr #31
+  and  r0, r3, r0, asl r1
+  mov  r3, r10, lsr r2
+  orr  r3, r3, ip, asl r4
+  and  r3, r3, r1, asr #31
+  orr  r0, r0, r3
+  mov  r3, ip, lsr lr
+  str  r0, [sp, #12]
+  mov  r0, r10, lsr lr
+  and  r5, r3, r2, asr #31
+  rsb  r3, lr, #31
+  mov  r3, r3, asr #31
+  orr  r0, r0, ip, asl r1
+  and  r3, r3, ip, lsr r2
+  and  r0, r0, r2, asr #31
+  orr  r4, r3, r0
+  b  L29
 L30:
-\s\sclz\s\sr2, r3
-\s\sclz\s\sr3, ip
-\s\srsb\s\sr3, r3, r2
-\s\scmp\s\sr3, #31
-\s\sbls\s\sL37
+  clz  r2, r3
+  clz  r3, ip
+  rsb  r3, r3, r2
+  cmp  r3, #31
+  bls  L37
 L48:
-\s\scmp\s\sr6, #0
-\s\sstmneia\s\sr6, {r10-r11}
-\s\sb\s\sL2
+  cmp  r6, #0
+  stmneia  r6, {r10-r11}
+  b  L2
 L37:
-\s\srsb\s\sr1, r3, #31
-\s\smov\s\sr0, r0, asl r1
-\s\sadd\s\slr, r3, #1
-\s\smov\s\sr2, #0
-\s\sstr\s\sr0, [sp, #12]
-\s\smov\s\sr0, r10, lsr lr
-\s\sstr\s\sr2, [sp, #8]
-\s\ssub\s\sr2, r3, #31
-\s\sand\s\sr0, r0, r2, asr #31
-\s\smov\s\sr3, ip, lsr lr
-\s\sorr\s\sr4, r0, ip, asl r1
-\s\sand\s\sr5, r3, r2, asr #31
+  rsb  r1, r3, #31
+  mov  r0, r0, asl r1
+  add  lr, r3, #1
+  mov  r2, #0
+  str  r0, [sp, #12]
+  mov  r0, r10, lsr lr
+  str  r2, [sp, #8]
+  sub  r2, r3, #31
+  and  r0, r0, r2, asr #31
+  mov  r3, ip, lsr lr
+  orr  r4, r0, ip, asl r1
+  and  r5, r3, r2, asr #31
 L29:
-\s\smov\s\sip, #0
-\s\smov\s\sr10, ip
-\s\sb\s\sL40
+  mov  ip, #0
+  mov  r10, ip
+  b  L40
 L41:
-\s\sldr\s\sr1, [sp, #12]
-\s\sldr\s\sr2, [sp, #8]
-\s\smov\s\sr3, r4, lsr #31
-\s\sorr\s\sr5, r3, r5, asl #1
-\s\smov\s\sr3, r1, lsr #31
-\s\sorr\s\sr4, r3, r4, asl #1
-\s\smov\s\sr3, r2, lsr #31
-\s\sorr\s\sr0, r3, r1, asl #1
-\s\sorr\s\sr1, ip, r2, asl #1
-\s\sldmia\s\ssp, {r2-r3}
-\s\sstr\s\sr0, [sp, #12]
-\s\ssubs\s\sr2, r2, r4
-\s\ssbc\s\sr3, r3, r5
-\s\sstr\s\sr1, [sp, #8]
-\s\ssubs\s\sr0, r2, #1
-\s\ssbc\s\sr1, r3, #0
-\s\smov\s\sr2, r1, asr #31
-\s\sldmia\s\ssp, {r0-r1}
-\s\smov\s\sr3, r2
-\s\sand\s\sip, r2, #1
-\s\sand\s\sr3, r3, r1
-\s\sand\s\sr2, r2, r0
-\s\ssubs\s\sr4, r4, r2
-\s\ssbc\s\sr5, r5, r3
-\s\sadd\s\sr10, r10, #1
+  ldr  r1, [sp, #12]
+  ldr  r2, [sp, #8]
+  mov  r3, r4, lsr #31
+  orr  r5, r3, r5, asl #1
+  mov  r3, r1, lsr #31
+  orr  r4, r3, r4, asl #1
+  mov  r3, r2, lsr #31
+  orr  r0, r3, r1, asl #1
+  orr  r1, ip, r2, asl #1
+  ldmia  sp, {r2-r3}
+  str  r0, [sp, #12]
+  subs  r2, r2, r4
+  sbc  r3, r3, r5
+  str  r1, [sp, #8]
+  subs  r0, r2, #1
+  sbc  r1, r3, #0
+  mov  r2, r1, asr #31
+  ldmia  sp, {r0-r1}
+  mov  r3, r2
+  and  ip, r2, #1
+  and  r3, r3, r1
+  and  r2, r2, r0
+  subs  r4, r4, r2
+  sbc  r5, r5, r3
+  add  r10, r10, #1
 L40:
-\s\scmp\s\sr10, lr
-\s\sbne\s\sL41
-\s\sldrd\s\sr0, [sp, #8]
-\s\sadds\s\sr0, r0, r0
-\s\sadc\s\sr1, r1, r1
-\s\scmp\s\sr6, #0
-\s\sorr\s\sr10, r0, ip
-\s\smov\s\sr11, r1
-\s\sstmneia\s\sr6, {r4-r5}
-\s\sb\s\sL10
+  cmp  r10, lr
+  bne  L41
+  ldrd  r0, [sp, #8]
+  adds  r0, r0, r0
+  adc  r1, r1, r1
+  cmp  r6, #0
+  orr  r10, r0, ip
+  mov  r11, r1
+  stmneia  r6, {r4-r5}
+  b  L10
 L2:
-\s\smov\s\sr10, #0
-\s\smov\s\sr11, #0
+  mov  r10, #0
+  mov  r11, #0
 L10:
-\s\smov\s\sr0, r10
-\s\smov\s\sr1, r11
-\s\ssub\s\ssp, r7, #20
-\s\sldmfd\s\ssp!, {r10, r11}
-\s\sldmfd\s\ssp!, {r4, r5, r6, r7, pc}
+  mov  r0, r10
+  mov  r1, r11
+  sub  sp, r7, #20
+  ldmfd  sp!, {r10, r11}
+  ldmfd  sp!, {r4, r5, r6, r7, pc}
index 903d1b1a877c949622cbe90bef8e42306d0e49a3..92c9cad960177927ab70d355a69ad67e6060b84a 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__udivsi3)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__udivsi3)
 
 ASM_PFX(__udivsi3):
-\s\scmp\s\sr1, #0
-\s\scmpne\s\sr0, #0
-\s\sstmfd\s\ssp!, {r4, r5, r7, lr}
-\s\sadd\s\sr7, sp, #8
-\s\sbeq\s\sL2
-\s\sclz\s\sr2, r1
-\s\sclz\s\sr3, r0
-\s\srsb\s\sr3, r3, r2
-\s\scmp\s\sr3, #31
-\s\sbhi\s\sL2
-\s\sldmeqfd\s\ssp!, {r4, r5, r7, pc}
-\s\sadd\s\sr5, r3, #1
-\s\srsb\s\sr3, r3, #31
-\s\smov\s\slr, #0
-\s\smov\s\sr2, r0, asl r3
-\s\smov\s\sip, r0, lsr r5
-\s\smov\s\sr4, lr
-\s\sb\s\sL8
+  cmp  r1, #0
+  cmpne  r0, #0
+  stmfd  sp!, {r4, r5, r7, lr}
+  add  r7, sp, #8
+  beq  L2
+  clz  r2, r1
+  clz  r3, r0
+  rsb  r3, r3, r2
+  cmp  r3, #31
+  bhi  L2
+  ldmeqfd  sp!, {r4, r5, r7, pc}
+  add  r5, r3, #1
+  rsb  r3, r3, #31
+  mov  lr, #0
+  mov  r2, r0, asl r3
+  mov  ip, r0, lsr r5
+  mov  r4, lr
+  b  L8
 L9:
-\s\smov\s\sr0, r2, lsr #31
-\s\sorr\s\sip, r0, ip, asl #1
-\s\sorr\s\sr2, r3, lr
-\s\srsb\s\sr3, ip, r1
-\s\ssub\s\sr3, r3, #1
-\s\sand\s\sr0, r1, r3, asr #31
-\s\smov\s\slr, r3, lsr #31
-\s\srsb\s\sip, r0, ip
-\s\sadd\s\sr4, r4, #1
+  mov  r0, r2, lsr #31
+  orr  ip, r0, ip, asl #1
+  orr  r2, r3, lr
+  rsb  r3, ip, r1
+  sub  r3, r3, #1
+  and  r0, r1, r3, asr #31
+  mov  lr, r3, lsr #31
+  rsb  ip, r0, ip
+  add  r4, r4, #1
 L8:
-\s\scmp\s\sr4, r5
-\s\smov\s\sr3, r2, asl #1
-\s\sbne\s\sL9
-\s\sorr\s\sr0, r3, lr
-\s\sldmfd\s\ssp!, {r4, r5, r7, pc}
+  cmp  r4, r5
+  mov  r3, r2, asl #1
+  bne  L9
+  orr  r0, r3, lr
+  ldmfd  sp!, {r4, r5, r7, pc}
 L2:
-\s\smov\s\sr0, #0
-\s\sldmfd\s\ssp!, {r4, r5, r7, pc}
+  mov  r0, #0
+  ldmfd  sp!, {r4, r5, r7, pc}
 
index 6b309f9b0bed4adabce1fd28fa9a38202748d4bd..6b55135f334e8add5310f8c4105f74fe46ecf2f4 100755 (executable)
@@ -14,9 +14,9 @@
 
 
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__aeabi_uldivmod)
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__aeabi_uldivmod)
 
 //        
 //UINT64
index df47e703194326b4747a710f60f264dfce77177d..75bb240888aa6f2f2497b77bd72f68580267cee5 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__umoddi3)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__umoddi3)
+  
 ASM_PFX(__umoddi3):
-\s\sstmfd\s\ssp!, {r7, lr}
-\s\sadd\s\sr7, sp, #0
-\s\ssub\s\ssp, sp, #16
-\s\sadd\s\sip, sp, #8
-\s\sstr\s\sip, [sp, #0]
-\s\sbl\s\sASM_PFX(__udivmoddi4)
-\s\sldrd\s\sr0, [sp, #8]
-\s\ssub\s\ssp, r7, #0
-\s\sldmfd\s\ssp!, {r7, pc}
+  stmfd  sp!, {r7, lr}
+  add  r7, sp, #0
+  sub  sp, sp, #16
+  add  ip, sp, #8
+  str  ip, [sp, #0]
+  bl  ASM_PFX(__udivmoddi4)
+  ldrd  r0, [sp, #8]
+  sub  sp, r7, #0
+  ldmfd  sp!, {r7, pc}
 
index 9506eedb38834ccc8ac063d39d02ea6f58b6b61c..9d0f17e6e9823bf39f19a1d29003b3b79c2e8e24 100644 (file)
 #
 #------------------------------------------------------------------------------
 
-\s\s.text
-\s\s.align 2
-\s\sGCC_ASM_EXPORT(__umodsi3)
-\s\s
+  .text
+  .align 2
+  GCC_ASM_EXPORT(__umodsi3)
+  
 ASM_PFX(__umodsi3):
-\s\sstmfd\s\ssp!, {r4, r5, r7, lr}
-\s\sadd\s\sr7, sp, #8
-\s\smov\s\sr5, r0
-\s\smov\s\sr4, r1
-\s\sbl \s\sASM_PFX(__udivsi3)
-\s\smul\s\sr0, r4, r0
-\s\srsb\s\sr0, r0, r5
-\s\sldmfd\s\ssp!, {r4, r5, r7, pc}
+  stmfd  sp!, {r4, r5, r7, lr}
+  add  r7, sp, #8
+  mov  r5, r0
+  mov  r4, r1
+  bl   ASM_PFX(__udivsi3)
+  mul  r0, r4, r0
+  rsb  r0, r0, r5
+  ldmfd  sp!, {r4, r5, r7, pc}
 
index 412e0192bc61bb5971165f89c1f4bf2fb292e742..eced1d8e20f4c4d2041f1f21c51370da89634167 100644 (file)
 \r
 #define MMC_OCR_POWERUP             0x80000000\r
 \r
-#define MMC_CSD_GET_CCC(Response)\s\s\s\s(Response[1] >> 20)\r
-#define MMC_CSD_GET_TRANSPEED(Response)\s\s\s\s(Response[0] & 0xFF)\r
-#define MMC_CSD_GET_READBLLEN(Response)\s\s\s\s((Response[1] >> 16) & 0xF)\r
-#define MMC_CSD_GET_WRITEBLLEN(Response)\s\s((Response[3] >> 22) & 0xF)\r
-#define MMC_CSD_GET_FILEFORMAT(Response)\s\s((Response[3] >> 10) & 0x3)\r
-#define MMC_CSD_GET_FILEFORMATGRP(Response)\s\s((Response[3] >> 15) & 0x1)\r
+#define MMC_CSD_GET_CCC(Response)    (Response[1] >> 20)\r
+#define MMC_CSD_GET_TRANSPEED(Response)    (Response[0] & 0xFF)\r
+#define MMC_CSD_GET_READBLLEN(Response)    ((Response[1] >> 16) & 0xF)\r
+#define MMC_CSD_GET_WRITEBLLEN(Response)  ((Response[3] >> 22) & 0xF)\r
+#define MMC_CSD_GET_FILEFORMAT(Response)  ((Response[3] >> 10) & 0x3)\r
+#define MMC_CSD_GET_FILEFORMATGRP(Response)  ((Response[3] >> 15) & 0x1)\r
 #define MMC_CSD_GET_DEVICESIZE(csd)         (((Response[2] >> 30) & 0x3) | ((Response[1] & 0x3FF) << 2))\r
 #define MMC_CSD_GET_DEVICESIZEMULT(csd)     ((Response[2] >> 15) & 0x7)\r
 \r
index 8cfa2a3deb766fdcd271a8189dfea2c56e3c57f7..e37fc4265a39e6a4232b83291278325342ea480a 100644 (file)
@@ -94,20 +94,20 @@ Abstract:
 \r
 \r
 typedef struct {\r
-  UINTN        tv_sec;         /* seconds */\r
-       UINTN   tv_nsec;        /* and nanoseconds */\r
+  UINTN  tv_sec;    /* seconds */\r
+  UINTN  tv_nsec;  /* and nanoseconds */\r
 } EFI_timespec;\r
 \r
 \r
 \r
 typedef struct stat_fix { \\r
-       dev_t           st_dev;                 /* [XSI] ID of device containing file */ \r
-       mode_t          st_mode;                /* [XSI] Mode of file (see below) */ \r
-       nlink_t         st_nlink;               /* [XSI] Number of hard links */ \r
-       __darwin_ino64_t st_ino;                /* [XSI] File serial number */ \r
-       uid_t           st_uid;                 /* [XSI] User ID of the file */ \r
-       gid_t           st_gid;                 /* [XSI] Group ID of the file */ \r
-       dev_t           st_rdev;                /* [XSI] Device ID */ \r
+  dev_t    st_dev;      /* [XSI] ID of device containing file */ \r
+  mode_t    st_mode;    /* [XSI] Mode of file (see below) */ \r
+  nlink_t    st_nlink;    /* [XSI] Number of hard links */ \r
+  __darwin_ino64_t st_ino;    /* [XSI] File serial number */ \r
+  uid_t    st_uid;      /* [XSI] User ID of the file */ \r
+  gid_t    st_gid;      /* [XSI] Group ID of the file */ \r
+  dev_t    st_rdev;    /* [XSI] Device ID */ \r
 \r
   // clang for X64 ABI follows Windows and a long is 32-bits\r
   // this breaks system inlcude files so that is why we need\r
@@ -117,44 +117,44 @@ typedef struct stat_fix { \
   EFI_timespec  st_ctimespec;\r
   EFI_timespec  st_birthtimespec;\r
 \r
-       off_t           st_size;                /* [XSI] file size, in bytes */ \r
-       blkcnt_t        st_blocks;              /* [XSI] blocks allocated for file */ \r
-       blksize_t       st_blksize;             /* [XSI] optimal blocksize for I/O */ \r
-       __uint32_t      st_flags;               /* user defined flags for file */ \r
-       __uint32_t      st_gen;                 /* file generation number */ \r
-       __int32_t       st_lspare;              /* RESERVED: DO NOT USE! */ \r
-       __int64_t       st_qspare[2];           /* RESERVED: DO NOT USE! */ \r
+  off_t    st_size;    /* [XSI] file size, in bytes */ \r
+  blkcnt_t  st_blocks;    /* [XSI] blocks allocated for file */ \r
+  blksize_t  st_blksize;    /* [XSI] optimal blocksize for I/O */ \r
+  __uint32_t  st_flags;    /* user defined flags for file */ \r
+  __uint32_t  st_gen;      /* file generation number */ \r
+  __int32_t  st_lspare;    /* RESERVED: DO NOT USE! */ \r
+  __int64_t  st_qspare[2];    /* RESERVED: DO NOT USE! */ \r
 } STAT_FIX;\r
 \r
 #else /* !__DARWIN_64_BIT_INO_T */\r
 \r
 typedef struct stat_fix {\r
-       dev_t           st_dev;         /* [XSI] ID of device containing file */\r
-       ino_t           st_ino;         /* [XSI] File serial number */\r
-       mode_t          st_mode;        /* [XSI] Mode of file (see below) */\r
-       nlink_t         st_nlink;       /* [XSI] Number of hard links */\r
-       uid_t           st_uid;         /* [XSI] User ID of the file */\r
-       gid_t           st_gid;         /* [XSI] Group ID of the file */\r
-       dev_t           st_rdev;        /* [XSI] Device ID */\r
+  dev_t     st_dev;    /* [XSI] ID of device containing file */\r
+  ino_t      st_ino;    /* [XSI] File serial number */\r
+  mode_t     st_mode;  /* [XSI] Mode of file (see below) */\r
+  nlink_t    st_nlink;  /* [XSI] Number of hard links */\r
+  uid_t    st_uid;    /* [XSI] User ID of the file */\r
+  gid_t    st_gid;    /* [XSI] Group ID of the file */\r
+  dev_t    st_rdev;  /* [XSI] Device ID */\r
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)\r
-       struct  timespec st_atimespec;  /* time of last access */\r
-       struct  timespec st_mtimespec;  /* time of last data modification */\r
-       struct  timespec st_ctimespec;  /* time of last status change */\r
+  struct  timespec st_atimespec;  /* time of last access */\r
+  struct  timespec st_mtimespec;  /* time of last data modification */\r
+  struct  timespec st_ctimespec;  /* time of last status change */\r
 #else\r
-       time_t          st_atime;       /* [XSI] Time of last access */\r
-       long            st_atimensec;   /* nsec of last access */\r
-       time_t          st_mtime;       /* [XSI] Last data modification time */\r
-       long            st_mtimensec;   /* last data modification nsec */\r
-       time_t          st_ctime;       /* [XSI] Time of last status change */\r
-       long            st_ctimensec;   /* nsec of last status change */\r
+  time_t    st_atime;  /* [XSI] Time of last access */\r
+  long    st_atimensec;  /* nsec of last access */\r
+  time_t    st_mtime;  /* [XSI] Last data modification time */\r
+  long    st_mtimensec;  /* last data modification nsec */\r
+  time_t    st_ctime;  /* [XSI] Time of last status change */\r
+  long    st_ctimensec;  /* nsec of last status change */\r
 #endif\r
-       off_t           st_size;        /* [XSI] file size, in bytes */\r
-       blkcnt_t        st_blocks;      /* [XSI] blocks allocated for file */\r
-       blksize_t       st_blksize;     /* [XSI] optimal blocksize for I/O */\r
-       __uint32_t      st_flags;       /* user defined flags for file */\r
-       __uint32_t      st_gen;         /* file generation number */\r
-       __int32_t       st_lspare;      /* RESERVED: DO NOT USE! */\r
-       __int64_t       st_qspare[2];   /* RESERVED: DO NOT USE! */\r
+  off_t    st_size;  /* [XSI] file size, in bytes */\r
+  blkcnt_t  st_blocks;  /* [XSI] blocks allocated for file */\r
+  blksize_t  st_blksize;  /* [XSI] optimal blocksize for I/O */\r
+  __uint32_t  st_flags;  /* user defined flags for file */\r
+  __uint32_t  st_gen;    /* file generation number */\r
+  __int32_t  st_lspare;  /* RESERVED: DO NOT USE! */\r
+  __int64_t  st_qspare[2];  /* RESERVED: DO NOT USE! */\r
 } STAT_FIX;\r
 \r
 #endif\r
index 85ac5f90862c7eb6c535d84b2cd6dc2b673d8178..476dcc659f9954b181655ee74cf79eb0d184094a 100644 (file)
@@ -192,7 +192,7 @@ struct _EFI_UNIX_UGA_IO_PROTOCOL;
 typedef
 EFI_STATUS
 (EFIAPI *UnixUgaCreate)(struct _EFI_UNIX_UGA_IO_PROTOCOL **UgaIo,
-                CONST CHAR16 *Title);
+     CONST CHAR16 *Title);
 
 typedef
 int
@@ -229,7 +229,7 @@ int
 typedef
 int
 (EFIAPI *UnixTcsetattr) (int __fd, int __optional_actions,
-                     __const struct termios *__termios_p);
+          __const struct termios *__termios_p);
 
 
 //
@@ -292,13 +292,13 @@ typedef struct _EFI_UNIX_THUNK_PROTOCOL {
   UINT64                              Signature;
 
   UnixSleep                           Sleep;
-  UnixExit                           Exit;
+  UnixExit                            Exit;
   UnixSetTimer                        SetTimer;
-  UnixGetLocalTime                             GetLocalTime;
+  UnixGetLocalTime                    GetLocalTime;
   UnixGmTime                          GmTime;
   UnixGetTimeZone                     GetTimeZone;
   UnixGetDayLight                     GetDayLight;
-  UnixPoll                               Poll;
+  UnixPoll                            Poll;
   UnixRead                            Read;
   UnixWrite                           Write;
   UnixGetenv                          Getenv;
@@ -322,7 +322,7 @@ typedef struct _EFI_UNIX_THUNK_PROTOCOL {
   UnixChmod                           Chmod;
   UnixUTime                           UTime;
   UnixTcflush                         Tcflush;
-  UnixUgaCreate                                          UgaCreate;
+  UnixUgaCreate                        UgaCreate;
   UnixPerror                          Perror;
   UnixIoCtl                           IoCtl;
   UnixFcntl                           Fcntl;
index 5200e4c4e081b8449046c9e1c3ce85e0c124a58a..1327e6a096fab0593ce120bc209d8be8e13f7838 100644 (file)
@@ -81,23 +81,23 @@ EFI_STATUS
 
 
 typedef struct {
-         UINTN                                   SourceX;
-         UINTN                                   SourceY;
-         UINTN                                   DestinationX;
-         UINTN                                   DestinationY;
-         UINTN                                   Width;
-         UINTN                                   Height;
-         UINTN                                   Delta;
+    UINTN                                   SourceX;
+    UINTN                                   SourceY;
+    UINTN                                   DestinationX;
+    UINTN                                   DestinationY;
+    UINTN                                   Width;
+    UINTN                                   Height;
+    UINTN                                   Delta;
 } UGA_BLT_ARGS;
 
 typedef
 EFI_STATUS
 (EFIAPI *UGABlt)(
     IN  EFI_UNIX_UGA_IO_PROTOCOL                *Uga,
-         IN  EFI_UGA_PIXEL                           *BltBuffer OPTIONAL,
-         IN  EFI_UGA_BLT_OPERATION                   BltOperation,
-         IN  UGA_BLT_ARGS                            *Args
-         );
+    IN  EFI_UGA_PIXEL                           *BltBuffer OPTIONAL,
+    IN  EFI_UGA_BLT_OPERATION                   BltOperation,
+    IN  UGA_BLT_ARGS                            *Args
+    );
 
 typedef
 BOOLEAN
index 00bedfc65b9b60e297c1cf5ed5e6784cefa878c4..d9a7b3e9813bfc4d67eddd9189034162588c7f6a 100644 (file)
@@ -134,7 +134,7 @@ OemHookStatusCodeReport (
               mStdOut,\r
               Buffer,\r
               CharCount\r
-             );\r
+        );\r
 \r
     return EFI_SUCCESS;\r
 \r
index 68bd7f84e20ec2bd1976bc8a0ccef8f4a6b87528..f98b30bed8f1fb304ac04d037e7fe7c17779c44a 100644 (file)
@@ -56,7 +56,7 @@ DxeUnixPeCoffLibExtraActionConstructor (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-        EFI_HOB_GUID_TYPE        *GuidHob;\r
+   EFI_HOB_GUID_TYPE        *GuidHob;\r
 \r
   //\r
   // Retrieve UnixThunkProtocol from GUID'ed HOB\r
index 40715ec8f0f8919611c26b890c0ca3fdda1c75a2..3a8f3040208d1b2925856fbc9514c6e18b438f78 100644 (file)
@@ -55,7 +55,7 @@ Returns:
 \r
 --*/\r
 {\r
-       PEI_UNIX_THUNK_PPI      *UnixThunkPpi;\r
+  PEI_UNIX_THUNK_PPI      *UnixThunkPpi;\r
   EFI_STATUS              Status;\r
   EFI_UNIX_THUNK_PROTOCOL *Unix;\r
 \r
index 2945b08b59398c1ce2483a7b7fc20a75b1f79d74..b42101c24fc824b2845300745e0e20b9d2e93de3 100644 (file)
@@ -142,7 +142,7 @@ OemHookStatusCodeReport (
               mStdOut,\r
               Buffer,\r
               CharCount\r
-             );\r
+        );\r
 \r
     return EFI_SUCCESS;\r
 \r
index e3a3c7ca3ee8bd3449df32a22f33e33e286e63ed..98b5b9e1167645d4318f3b563b92b2d46aad058e 100644 (file)
@@ -48,7 +48,7 @@ EFIAPI
 UnixPeCoffGetUnixThunkStucture (\r
   )\r
 {\r
-       PEI_UNIX_THUNK_PPI  *UnixThunkPpi;\r
+  PEI_UNIX_THUNK_PPI  *UnixThunkPpi;\r
   EFI_STATUS        Status;\r
 \r
   \r
index 3c7ef8009793cf1212970d7713eac6c1dbc2875d..04c65f1a8dac6924097e2cf940a40f994c09e73e 100644 (file)
@@ -398,7 +398,7 @@ GasketUgaBlt (
    EFI_UNIX_UGA_IO_PROTOCOL *UgaIo,\r
    IN  EFI_UGA_PIXEL                           *BltBuffer OPTIONAL,\r
    IN  EFI_UGA_BLT_OPERATION                   BltOperation,\r
-        IN  UGA_BLT_ARGS                            *Args\r
+   IN  UGA_BLT_ARGS                            *Args\r
    )\r
 {\r
   return GasketUintnUintnUintnUintn (UgaBlt, (UINTN)UgaIo, (UINTN)BltBuffer, (UINTN)BltOperation, (UINTN)Args);\r
index 440e73d6df4e4ff224c1d451a38b68414f02286f..5f762a3782afd02183b3fa3d03091d7d8df33d39 100644 (file)
@@ -264,21 +264,21 @@ _GasketUintnUint16:
   \r
 .globl _ReverseGasketUint64\r
 _ReverseGasketUint64:\r
-       pushl   %ebp\r
-       movl    %esp, %ebp\r
-       subl    $40, %esp\r
-       movl    12(%ebp), %eax\r
-       movl    %eax, -16(%ebp)\r
-       movl    16(%ebp), %eax\r
-       movl    %eax, -12(%ebp)\r
-       movl    -16(%ebp), %eax\r
-       movl    -12(%ebp), %edx\r
-       movl    %eax, (%esp)\r
-       movl    %edx, 4(%esp)\r
-       movl    8(%ebp), %eax\r
-       call    *%eax\r
-       leave\r
-       ret\r
+  pushl  %ebp\r
+  movl  %esp, %ebp\r
+  subl  $40, %esp\r
+  movl  12(%ebp), %eax\r
+  movl  %eax, -16(%ebp)\r
+  movl  16(%ebp), %eax\r
+  movl  %eax, -12(%ebp)\r
+  movl  -16(%ebp), %eax\r
+  movl  -12(%ebp), %edx\r
+  movl  %eax, (%esp)\r
+  movl  %edx, 4(%esp)\r
+  movl  8(%ebp), %eax\r
+  call  *%eax\r
+  leave\r
+  ret\r
   \r
   \r
 .globl _ReverseGasketUint64Uint64\r
@@ -314,31 +314,31 @@ _ReverseGasketUint64Uint64:
 \r
 .globl _GasketSecUnixPeiLoadFile\r
 _GasketSecUnixPeiLoadFile:\r
-       jmp       _SecUnixPeiLoadFile\r
+  jmp    _SecUnixPeiLoadFile\r
 \r
 \r
 .globl _GasketSecUnixPeiAutoScan\r
 _GasketSecUnixPeiAutoScan:\r
-       jmp       _SecUnixPeiAutoScan\r
+  jmp    _SecUnixPeiAutoScan\r
 \r
 \r
 .globl _GasketSecUnixUnixThunkAddress\r
 _GasketSecUnixUnixThunkAddress:\r
-       jmp       _SecUnixUnixThunkAddress\r
+  jmp    _SecUnixUnixThunkAddress\r
 \r
 \r
 .globl _GasketSecPeiReportStatusCode\r
 _GasketSecPeiReportStatusCode:\r
-       jmp       _SecPeiReportStatusCode\r
+  jmp    _SecPeiReportStatusCode\r
 \r
 \r
 .globl _GasketSecUnixFdAddress\r
 _GasketSecUnixFdAddress:\r
-       jmp       _SecUnixFdAddress\r
+  jmp    _SecUnixFdAddress\r
 \r
 \r
 .globl _GasketSecTemporaryRamSupport\r
 _GasketSecTemporaryRamSupport:\r
-       jmp       _SecTemporaryRamSupport\r
+  jmp    _SecTemporaryRamSupport\r
   \r
   #endif\r
index dc4b14c00fadac3623aadd86fba01c73fecda26d..a82ec1cce18642632cbfe9209a5e370c50671edb 100644 (file)
@@ -279,17 +279,17 @@ Returns:
     // Open the FD and remmeber where it got mapped into our processes address space
     //
     Status = MapFile (
-                     FileName,
-                     &gFdInfo[Index].Address,
-                     &gFdInfo[Index].Size
-                     );
+          FileName,
+          &gFdInfo[Index].Address,
+          &gFdInfo[Index].Size
+          );
     if (EFI_ERROR (Status)) {
       printf ("ERROR : Can not open Firmware Device File %s (%x).  Exiting.\n", FileName, (unsigned int)Status);
       exit (1);
     }
 
     printf ("  FD loaded from %s at 0x%08lx",
-           FileName, (unsigned long)gFdInfo[Index].Address);
+      FileName, (unsigned long)gFdInfo[Index].Address);
 
     if (PeiCoreFile == NULL) {
       //
@@ -419,10 +419,10 @@ Returns:
       /* Read entry address.  */
       lseek (fd, FileSize - 0x20, SEEK_SET);
       if (read (fd, &EntryAddress, 4) != 4)
-       {
-         close (fd);
-         return EFI_DEVICE_ERROR;
-       }
+  {
+    close (fd);
+    return EFI_DEVICE_ERROR;
+  }
     }
 #endif
 
@@ -664,8 +664,8 @@ Returns:
 
   *MemoryBase = 0;
   res = MapMemory(0, gSystemMemory[Index].Size,
-                 PROT_READ | PROT_WRITE | PROT_EXEC,
-                 MAP_PRIVATE | MAP_ANONYMOUS);
+      PROT_READ | PROT_WRITE | PROT_EXEC,
+      MAP_PRIVATE | MAP_ANONYMOUS);
   if (res == MAP_FAILED)
     return EFI_DEVICE_ERROR;
   *MemorySize = gSystemMemory[Index].Size;
index 0a9b0a314cd004701cb10fd946ffe346e0d06652..5250fb3c61d7f6ea7b5e203190b69a16b8ad321d 100644 (file)
@@ -59,7 +59,7 @@ typedef struct {
   EFI_UNIX_UGA_IO_PROTOCOL UgaIo;
 
   Display *display;
-  int screen;                  /* values for window_size in main */
+  int screen;      /* values for window_size in main */
   Window win;
   GC gc;
   Visual *visual;
@@ -393,15 +393,15 @@ handleMouseMoved(UGA_IO_PRIVATE *drv, XEvent *ev)
   if ( ev->xmotion.x != drv->previous_x )
   {
     drv->pointer_state.RelativeMovementX += ( ev->xmotion.x - drv->previous_x );
-       drv->previous_x = ev->xmotion.x;
-       drv->pointer_state_changed = 1;
+  drv->previous_x = ev->xmotion.x;
+  drv->pointer_state_changed = 1;
   }
 
   if ( ev->xmotion.y != drv->previous_y )
   {
     drv->pointer_state.RelativeMovementY += ( ev->xmotion.y - drv->previous_y );
     drv->previous_y = ev->xmotion.y;
-       drv->pointer_state_changed = 1;
+  drv->pointer_state_changed = 1;
   }
 
   drv->pointer_state.RelativeMovementZ = 0;
@@ -413,12 +413,12 @@ handleMouseDown(UGA_IO_PRIVATE *drv, XEvent *ev, BOOLEAN Pressed)
   if ( ev->xbutton.button == Button1 )
   {
     drv->pointer_state_changed = ( drv->pointer_state.LeftButton != Pressed );
-       drv->pointer_state.LeftButton = Pressed;
+  drv->pointer_state.LeftButton = Pressed;
   }
   if ( ev->xbutton.button == Button2 )
   {
     drv->pointer_state_changed = ( drv->pointer_state.RightButton != Pressed );
-       drv->pointer_state.RightButton = Pressed;
+  drv->pointer_state.RightButton = Pressed;
   }
 }
 
@@ -460,10 +460,10 @@ HandleEvent(UGA_IO_PRIVATE *drv, XEvent *ev)
       break;
     case ButtonPress:
       handleMouseDown(drv, ev, TRUE);
-         break;
+    break;
     case ButtonRelease:
       handleMouseDown(drv, ev, FALSE);
-         break;
+    break;
 #if 0
     case DestroyNotify:
       XCloseDisplay (drv->display);
index 532585b608c037803b9278e3f6bcc7214a4dfc69..d457f6be128561ef0b83fdc9136ac39408051b2d 100644 (file)
@@ -9,7 +9,7 @@
 # to get the correct binding (does not work from assembly). So we have 4 functions
 # that do an indirect call, while the others call POSIX APIs directly
 #
-# movq _gUnixRmDir@GOTPCREL(%rip), %rax 
+# movq  _gUnixRmDir@GOTPCREL(%rip), %rax 
 #
 #
 # UNIX Arg passing: RCX, RDX,  R8,  R9
@@ -34,7 +34,7 @@
 // EFI ABI code will sub 40 (0x28) from %rsp before calling a function
 //  This is the 32 (0x20) byte to spill registers and 8 bytes to align stack on 16 byte boundry.
 //
-       .text
+  .text
 
 // 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte boundry
 // Any call with 0 - 4 arguments allocates 40 bytes on the stack.
 
 
 
-       .text
+  .text
 
 
 ASM_GLOBAL ASM_PFX(Gasketrmdir)
 ASM_PFX(Gasketrmdir):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
-       pushq     %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
-       pushq     %rdi
+  pushq    %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
+  pushq    %rdi
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       movq    ASM_PFX(gUnixRmDir)@GOTPCREL(%rip), %rax  // Get function name mangled by C
-       movq    (%rax), %rax
-       call    *%rax
+  movq  ASM_PFX(gUnixRmDir)@GOTPCREL(%rip), %rax  // Get function name mangled by C
+  movq  (%rax), %rax
+  call  *%rax
 
 
-       popq  %rdi          // restore state
-       popq  %rsi
-       popq  %rbp
-       ret
+  popq  %rdi          // restore state
+  popq  %rsi
+  popq  %rbp
+  ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketopendir)
 ASM_PFX(Gasketopendir):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
-       pushq     %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
-       pushq     %rdi
+  pushq    %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
+  pushq    %rdi
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       movq    ASM_PFX(gUnixOpenDir)@GOTPCREL(%rip), %rax  // Get function name mangled by C
-       movq    (%rax), %rax
-       call    *%rax
-       
-       popq  %rdi             // restore state
-       popq  %rsi
-       popq  %rbp
+  movq  ASM_PFX(gUnixOpenDir)@GOTPCREL(%rip), %rax  // Get function name mangled by C
+  movq  (%rax), %rax
+  call  *%rax
+  
+  popq  %rdi             // restore state
+  popq  %rsi
+  popq  %rbp
   ret
 
 
 
 ASM_GLOBAL ASM_PFX(Gasketstat)
 ASM_PFX(Gasketstat):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
-       pushq     %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
-       pushq     %rdi
+  pushq    %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
+  pushq    %rdi
 
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       movq    ASM_PFX(gUnixStat)@GOTPCREL(%rip), %rax   // Get function name mangled by C
-       movq    (%rax), %rax
-       call    *%rax
-       
+  movq  ASM_PFX(gUnixStat)@GOTPCREL(%rip), %rax   // Get function name mangled by C
+  movq  (%rax), %rax
+  call  *%rax
+  
 
-       popq  %rdi            // restore state
-       popq  %rsi
-       popq  %rbp
+  popq  %rdi            // restore state
+  popq  %rsi
+  popq  %rbp
   ret
-       
-       
+  
+  
 ASM_GLOBAL ASM_PFX(Gasketstatfs)
 ASM_PFX(Gasketstatfs):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
-       pushq     %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
-       pushq     %rdi
+  pushq    %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
+  pushq    %rdi
 
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       movq    ASM_PFX(gUnixStatFs)@GOTPCREL(%rip), %rax   // Get function name mangled by C
-       movq    (%rax), %rax
-       call    *%rax
-       
-       popq  %rdi            // restore state
-       popq  %rsi
-       popq  %rbp
+  movq  ASM_PFX(gUnixStatFs)@GOTPCREL(%rip), %rax   // Get function name mangled by C
+  movq  (%rax), %rax
+  call  *%rax
+  
+  popq  %rdi            // restore state
+  popq  %rsi
+  popq  %rbp
   ret
-       
+  
 ASM_GLOBAL ASM_PFX(Gasketrewinddir)
 ASM_PFX(Gasketrewinddir):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
-       pushq     %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
-       pushq     %rdi
+  pushq    %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
+  pushq    %rdi
   
   movq    %rcx, %rdi    // Swizzle args 
 
-       movq    ASM_PFX(gUnixRewinddir)@GOTPCREL(%rip), %rax   // Get function name mangled by C
-       movq    (%rax), %rax
-       call    *%rax
-       
-       popq  %rdi            // restore state
-       popq  %rsi
-       popq  %rbp
+  movq  ASM_PFX(gUnixRewinddir)@GOTPCREL(%rip), %rax   // Get function name mangled by C
+  movq  (%rax), %rax
+  call  *%rax
+  
+  popq  %rdi            // restore state
+  popq  %rsi
+  popq  %rbp
   ret
-       
+  
 ASM_GLOBAL ASM_PFX(Gasketreaddir)
 ASM_PFX(Gasketreaddir):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
-       pushq     %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
-       pushq     %rdi
+  pushq    %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
+  pushq    %rdi
   
   movq    %rcx, %rdi    // Swizzle args 
 
-       movq    ASM_PFX(gUnixReaddir)@GOTPCREL(%rip), %rax   // Get function name mangled by C
-       movq    (%rax), %rax
-       call    *%rax
-       
-       popq  %rdi            // restore state
-       popq  %rsi
-       popq  %rbp
+  movq  ASM_PFX(gUnixReaddir)@GOTPCREL(%rip), %rax   // Get function name mangled by C
+  movq  (%rax), %rax
+  call  *%rax
+  
+  popq  %rdi            // restore state
+  popq  %rsi
+  popq  %rbp
   ret
-       
+  
 
 ASM_GLOBAL ASM_PFX(GasketmsSleep)
 ASM_PFX(GasketmsSleep):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
-       pushq     %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
-       pushq     %rdi
+  pushq    %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
+  pushq    %rdi
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call    ASM_PFX(msSleep)
-       
-       popq  %rdi            // restore state
-       popq  %rsi
-       popq  %rbp
+  call  ASM_PFX(msSleep)
+  
+  popq  %rdi            // restore state
+  popq  %rsi
+  popq  %rbp
   ret
-       
-       
+  
+  
 ASM_GLOBAL ASM_PFX(Gasketexit)
 ASM_PFX(Gasketexit):
   movq    %rcx, %rdi    // Swizzle args 
-       call    ASM_PFX(exit)           // Less to do as we will never return to EFI ABI world
+  call  ASM_PFX(exit)           // Less to do as we will never return to EFI ABI world
 LDEAD_LOOP:
   jmp  LDEAD_LOOP       // _exit should never return
 
@@ -202,26 +202,26 @@ LDEAD_LOOP:
 
 ASM_GLOBAL ASM_PFX(GasketSetTimer)
 ASM_PFX(GasketSetTimer):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
-       pushq     %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
-       pushq     %rdi
+  pushq    %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
+  pushq    %rdi
 
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call    ASM_PFX(SetTimer)
-       
-       popq  %rdi            // restore state
-       popq  %rsi
-       popq  %rbp
+  call  ASM_PFX(SetTimer)
+  
+  popq  %rdi            // restore state
+  popq  %rsi
+  popq  %rbp
   ret
 
-       
+  
 ASM_GLOBAL ASM_PFX(GasketGetLocalTime)
 ASM_PFX(GasketGetLocalTime):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -229,18 +229,18 @@ ASM_PFX(GasketGetLocalTime):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call    ASM_PFX(GetLocalTime)
+  call  ASM_PFX(GetLocalTime)
 
   popq  %rdi            // restore state
   popq  %rsi
-       popq  %rbp
+  popq  %rbp
   ret
 
   
 
 ASM_GLOBAL ASM_PFX(Gasketgmtime)
 ASM_PFX(Gasketgmtime):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -248,50 +248,50 @@ ASM_PFX(Gasketgmtime):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call    ASM_PFX(localtime)
+  call  ASM_PFX(localtime)
 
   popq  %rdi            // restore state
   popq  %rsi
-       popq  %rbp
+  popq  %rbp
   ret
 
 
 
 ASM_GLOBAL ASM_PFX(GasketGetTimeZone)
 ASM_PFX(GasketGetTimeZone):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
   pushq   %rdi
 
-       call    ASM_PFX(GetTimeZone)
+  call  ASM_PFX(GetTimeZone)
 
   popq  %rdi            // restore state
   popq  %rsi
-       popq  %rbp
+  popq  %rbp
   ret
 
   
 ASM_GLOBAL ASM_PFX(GasketGetDayLight)
 ASM_PFX(GasketGetDayLight):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
   pushq   %rdi
 
-       call    ASM_PFX(GetDayLight)
+  call  ASM_PFX(GetDayLight)
 
   popq  %rdi            // restore state
   popq  %rsi
-       popq  %rbp
+  popq  %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketpoll)
 ASM_PFX(Gasketpoll):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -301,18 +301,18 @@ ASM_PFX(Gasketpoll):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(poll)
+  call    ASM_PFX(poll)
 
   popq  %rdi            // restore state
   popq  %rsi
-       popq  %rbp
+  popq  %rbp
   ret
 
 
 
 ASM_GLOBAL ASM_PFX(Gasketread)
 ASM_PFX(Gasketread):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -322,17 +322,17 @@ ASM_PFX(Gasketread):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(read)
+  call    ASM_PFX(read)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketwrite)
 ASM_PFX(Gasketwrite):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -342,17 +342,17 @@ ASM_PFX(Gasketwrite):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(write)
+  call    ASM_PFX(write)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketgetenv)
 ASM_PFX(Gasketgetenv):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -360,17 +360,17 @@ ASM_PFX(Gasketgetenv):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call      ASM_PFX(getenv)
+  call    ASM_PFX(getenv)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketopen)
 ASM_PFX(Gasketopen):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -380,17 +380,17 @@ ASM_PFX(Gasketopen):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(open)
+  call    ASM_PFX(open)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketlseek)
 ASM_PFX(Gasketlseek):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -400,17 +400,17 @@ ASM_PFX(Gasketlseek):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(lseek)
+  call    ASM_PFX(lseek)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketftruncate)
 ASM_PFX(Gasketftruncate):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -420,17 +420,17 @@ ASM_PFX(Gasketftruncate):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(ftruncate)
+  call    ASM_PFX(ftruncate)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketclose)
 ASM_PFX(Gasketclose):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -438,18 +438,18 @@ ASM_PFX(Gasketclose):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call      ASM_PFX(close)
+  call    ASM_PFX(close)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 
 ASM_GLOBAL ASM_PFX(Gasketmkdir)
 ASM_PFX(Gasketmkdir):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -458,17 +458,17 @@ ASM_PFX(Gasketmkdir):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(mkdir)
+  call    ASM_PFX(mkdir)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketunlink)
 ASM_PFX(Gasketunlink):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -476,32 +476,32 @@ ASM_PFX(Gasketunlink):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call      ASM_PFX(unlink)
+  call    ASM_PFX(unlink)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketGetErrno)
 ASM_PFX(GasketGetErrno):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
   pushq   %rdi
 
-       call    ASM_PFX(GetErrno)
+  call  ASM_PFX(GetErrno)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 ASM_GLOBAL ASM_PFX(Gasketclosedir)
 ASM_PFX(Gasketclosedir):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -509,17 +509,17 @@ ASM_PFX(Gasketclosedir):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call      ASM_PFX(closedir)
+  call    ASM_PFX(closedir)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketrename)
 ASM_PFX(Gasketrename):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -528,17 +528,17 @@ ASM_PFX(Gasketrename):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(rename)
+  call    ASM_PFX(rename)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketmktime)
 ASM_PFX(Gasketmktime):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -547,17 +547,17 @@ ASM_PFX(Gasketmktime):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(mktime)
+  call    ASM_PFX(mktime)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketfsync)
 ASM_PFX(Gasketfsync):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -566,17 +566,17 @@ ASM_PFX(Gasketfsync):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(fsync)
+  call    ASM_PFX(fsync)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketchmod)
 ASM_PFX(Gasketchmod):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -585,17 +585,17 @@ ASM_PFX(Gasketchmod):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(chmod)
+  call    ASM_PFX(chmod)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketutime)
 ASM_PFX(Gasketutime):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -604,17 +604,17 @@ ASM_PFX(Gasketutime):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(utime)
+  call    ASM_PFX(utime)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gaskettcflush)
 ASM_PFX(Gaskettcflush):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -623,17 +623,17 @@ ASM_PFX(Gaskettcflush):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(tcflush)
+  call    ASM_PFX(tcflush)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUgaCreate)
 ASM_PFX(GasketUgaCreate):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -642,17 +642,17 @@ ASM_PFX(GasketUgaCreate):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(UgaCreate)
+  call    ASM_PFX(UgaCreate)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketperror)
 ASM_PFX(Gasketperror):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -661,17 +661,17 @@ ASM_PFX(Gasketperror):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(perror)
+  call    ASM_PFX(perror)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketioctl)
 ASM_PFX(Gasketioctl):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -681,17 +681,17 @@ ASM_PFX(Gasketioctl):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(UnixIoCtl1)
+  call    ASM_PFX(UnixIoCtl1)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gasketfcntl)
 ASM_PFX(Gasketfcntl):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -701,18 +701,18 @@ ASM_PFX(Gasketfcntl):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(UnixFcntl1)
+  call    ASM_PFX(UnixFcntl1)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 
 ASM_GLOBAL ASM_PFX(Gasketcfsetispeed)
 ASM_PFX(Gasketcfsetispeed):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -721,18 +721,18 @@ ASM_PFX(Gasketcfsetispeed):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(cfsetispeed)
+  call    ASM_PFX(cfsetispeed)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 
 ASM_GLOBAL ASM_PFX(Gasketcfsetospeed)
 ASM_PFX(Gasketcfsetospeed):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -741,17 +741,17 @@ ASM_PFX(Gasketcfsetospeed):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(cfsetospeed)
+  call    ASM_PFX(cfsetospeed)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gaskettcgetattr)
 ASM_PFX(Gaskettcgetattr):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -761,17 +761,17 @@ ASM_PFX(Gaskettcgetattr):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(tcgetattr)
+  call    ASM_PFX(tcgetattr)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(Gaskettcsetattr)
 ASM_PFX(Gaskettcsetattr):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -781,17 +781,17 @@ ASM_PFX(Gaskettcsetattr):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(tcsetattr)
+  call    ASM_PFX(tcsetattr)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUnixPeCoffGetEntryPoint)
 ASM_PFX(GasketUnixPeCoffGetEntryPoint):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -800,18 +800,18 @@ ASM_PFX(GasketUnixPeCoffGetEntryPoint):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(SecPeCoffGetEntryPoint)
+  call    ASM_PFX(SecPeCoffGetEntryPoint)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 
 ASM_GLOBAL ASM_PFX(GasketUnixPeCoffRelocateImageExtraAction)
 ASM_PFX(GasketUnixPeCoffRelocateImageExtraAction):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -819,17 +819,17 @@ ASM_PFX(GasketUnixPeCoffRelocateImageExtraAction):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call      ASM_PFX(SecPeCoffRelocateImageExtraAction)
+  call    ASM_PFX(SecPeCoffRelocateImageExtraAction)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUnixPeCoffUnloadImageExtraAction)
 ASM_PFX(GasketUnixPeCoffUnloadImageExtraAction):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -837,11 +837,11 @@ ASM_PFX(GasketUnixPeCoffUnloadImageExtraAction):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call      ASM_PFX(SecPeCoffLoaderUnloadImageExtraAction)
+  call    ASM_PFX(SecPeCoffLoaderUnloadImageExtraAction)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
@@ -850,7 +850,7 @@ ASM_PFX(GasketUnixPeCoffUnloadImageExtraAction):
 
 ASM_GLOBAL ASM_PFX(Gasketsocket)
 ASM_PFX(Gasketsocket):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -865,14 +865,14 @@ ASM_PFX(Gasketsocket):
 
   popq  %rdi            // restore state
   popq  %rsi
-       popq  %rbp
+  popq  %rbp
   ret
 
 
 
 ASM_GLOBAL ASM_PFX(Gasketgetifaddrs)
 ASM_PFX(Gasketgetifaddrs):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -883,16 +883,16 @@ ASM_PFX(Gasketgetifaddrs):
   call    ASM_PFX(getifaddrs)
   
 
-       popq  %rbp
-       popq  %rsi
-       popq  %rbp
+  popq  %rbp
+  popq  %rsi
+  popq  %rbp
   ret
 
 
 
 ASM_GLOBAL _Gasketfreeifaddrs
 _Gasketfreeifaddrs:
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -905,7 +905,7 @@ _Gasketfreeifaddrs:
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
@@ -914,7 +914,7 @@ _Gasketfreeifaddrs:
 
 ASM_GLOBAL ASM_PFX(GasketUgaClose)
 ASM_PFX(GasketUgaClose):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -922,11 +922,11 @@ ASM_PFX(GasketUgaClose):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call      ASM_PFX(UgaClose)
+  call    ASM_PFX(UgaClose)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
@@ -934,7 +934,7 @@ ASM_PFX(GasketUgaClose):
 
 ASM_GLOBAL ASM_PFX(GasketUgaSize)
 ASM_PFX(GasketUgaSize):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -944,17 +944,17 @@ ASM_PFX(GasketUgaSize):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(UgaSize)
+  call    ASM_PFX(UgaSize)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUgaCheckKey)
 ASM_PFX(GasketUgaCheckKey):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -962,17 +962,17 @@ ASM_PFX(GasketUgaCheckKey):
 
   movq    %rcx, %rdi    // Swizzle args 
 
-       call      ASM_PFX(UgaCheckKey)
+  call    ASM_PFX(UgaCheckKey)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUgaGetKey)
 ASM_PFX(GasketUgaGetKey):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -981,16 +981,16 @@ ASM_PFX(GasketUgaGetKey):
   movq    %rcx, %rdi    // Swizzle args 
   movq    %rdx, %rsi     
 
-       call      ASM_PFX(UgaGetKey)
+  call    ASM_PFX(UgaGetKey)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 ASM_GLOBAL ASM_PFX(GasketUgaKeySetState)
 ASM_PFX(GasketUgaKeySetState):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1003,13 +1003,13 @@ ASM_PFX(GasketUgaKeySetState):
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUgaRegisterKeyNotify)
 ASM_PFX(GasketUgaRegisterKeyNotify):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1023,7 +1023,7 @@ ASM_PFX(GasketUgaRegisterKeyNotify):
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
@@ -1032,7 +1032,7 @@ ASM_PFX(GasketUgaRegisterKeyNotify):
 
 ASM_GLOBAL ASM_PFX(GasketUgaBlt)
 ASM_PFX(GasketUgaBlt):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1043,17 +1043,17 @@ ASM_PFX(GasketUgaBlt):
   movq    %r8,  %rdx
   movq    %r9,  %rcx
 
-       call      ASM_PFX(UgaBlt)
+  call    ASM_PFX(UgaBlt)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUgaCheckPointer)
 ASM_PFX(GasketUgaCheckPointer):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1065,13 +1065,13 @@ ASM_PFX(GasketUgaCheckPointer):
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUgaGetPointerState)
 ASM_PFX(GasketUgaGetPointerState):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1084,13 +1084,13 @@ ASM_PFX(GasketUgaGetPointerState):
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketUnixEnableInterrupt)
 ASM_PFX(GasketUnixEnableInterrupt):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1100,12 +1100,12 @@ ASM_PFX(GasketUnixEnableInterrupt):
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 ASM_GLOBAL ASM_PFX(GasketUnixDisableInterrupt)
 ASM_PFX(GasketUnixDisableInterrupt):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1115,7 +1115,7 @@ ASM_PFX(GasketUnixDisableInterrupt):
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 //
@@ -1128,7 +1128,7 @@ ASM_PFX(GasketUnixDisableInterrupt):
 //   );
 ASM_GLOBAL ASM_PFX(ReverseGasketUint64)
 ASM_PFX(ReverseGasketUint64):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   movq    %rdi, %rax    // Swizzle args 
@@ -1138,7 +1138,7 @@ ASM_PFX(ReverseGasketUint64):
   call  *%rax
   addq  $32, %rsp
 
-       popq   %rbp          
+  popq   %rbp          
   ret
 
 //
@@ -1152,7 +1152,7 @@ ASM_PFX(ReverseGasketUint64):
 //   );
 ASM_GLOBAL ASM_PFX(ReverseGasketUint64Uint64)
 ASM_PFX(ReverseGasketUint64Uint64):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   movq    %rdi, %rax    // Swizzle args 
@@ -1162,7 +1162,7 @@ ASM_PFX(ReverseGasketUint64Uint64):
   call  *%rax
   addq  $32, %rsp
 
-       popq   %rbp          
+  popq   %rbp          
   ret
   
 
@@ -1170,7 +1170,7 @@ ASM_PFX(ReverseGasketUint64Uint64):
 
 ASM_GLOBAL ASM_PFX(GasketSecUnixPeiLoadFile)
 ASM_PFX(GasketSecUnixPeiLoadFile):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1181,7 +1181,7 @@ ASM_PFX(GasketSecUnixPeiLoadFile):
   movq    %r8,  %rdx
   movq    %r9,  %rcx
 
-       call      ASM_PFX(SecUnixPeiLoadFile)
+  call    ASM_PFX(SecUnixPeiLoadFile)
   
   popq    %rdi          // restore state
   popq    %rsi
@@ -1192,7 +1192,7 @@ ASM_PFX(GasketSecUnixPeiLoadFile):
 
 ASM_GLOBAL ASM_PFX(GasketSecUnixPeiAutoScan)
 ASM_PFX(GasketSecUnixPeiAutoScan):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1202,33 +1202,33 @@ ASM_PFX(GasketSecUnixPeiAutoScan):
   movq    %rdx, %rsi     
   movq    %r8,  %rdx
 
-       call      ASM_PFX(SecUnixPeiAutoScan)
+  call    ASM_PFX(SecUnixPeiAutoScan)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 ASM_GLOBAL ASM_PFX(GasketSecUnixUnixThunkAddress)
 ASM_PFX(GasketSecUnixUnixThunkAddress):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
   pushq   %rdi
 
-       call      ASM_PFX(SecUnixUnixThunkAddress)
+  call    ASM_PFX(SecUnixUnixThunkAddress)
   
 
-       popq    %rdi
-       popq    %rsi
-       popq    %rbp
+  popq    %rdi
+  popq    %rsi
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketSecPeiReportStatusCode)
 ASM_PFX(GasketSecPeiReportStatusCode):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1241,17 +1241,17 @@ ASM_PFX(GasketSecPeiReportStatusCode):
   movq    $0,   %r8     // BugBug: This should come from the stack
   movq    $0,   %r9     //         But we can cheat since they are optional for bringup....
 
-       call      ASM_PFX(SecPeiReportStatusCode)
+  call    ASM_PFX(SecPeiReportStatusCode)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
 ASM_GLOBAL ASM_PFX(GasketSecUnixFdAddress)
 ASM_PFX(GasketSecUnixFdAddress):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1262,11 +1262,11 @@ ASM_PFX(GasketSecUnixFdAddress):
   movq    %r8,  %rdx
   movq    %r9,  %rcx
 
-       call      ASM_PFX(SecUnixFdAddress)
+  call    ASM_PFX(SecUnixFdAddress)
 
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
@@ -1274,7 +1274,7 @@ ASM_PFX(GasketSecUnixFdAddress):
 
 ASM_GLOBAL ASM_PFX(GasketSecTemporaryRamSupport)
 ASM_PFX(GasketSecTemporaryRamSupport):
-       pushq   %rbp            // stack frame is for the debugger
+  pushq   %rbp            // stack frame is for the debugger
   movq    %rsp, %rbp
 
   pushq   %rsi          // %rsi & %rdi are volatile in Unix and callee-save in EFI ABI
@@ -1285,11 +1285,11 @@ ASM_PFX(GasketSecTemporaryRamSupport):
   movq    %r8,  %rdx
   movq    %r9,  %rcx
 
-       call      ASM_PFX(SecTemporaryRamSupport)
+  call    ASM_PFX(SecTemporaryRamSupport)
   
   popq    %rdi          // restore state
   popq    %rsi
-       popq    %rbp
+  popq    %rbp
   ret
 
 
index e964e4d178b950bb521b4fa4ca60eb5cbd1d303e..e9adefce397614bbfbdecc618e89601e2981dfd7 100644 (file)
@@ -39,8 +39,8 @@
 #------------------------------------------------------------------------------\r
 ASM_GLOBAL ASM_PFX(PeiSwitchStacks)\r
 ASM_PFX(PeiSwitchStacks):\r
-         pushq   %rbp            // stack frame is for the debugger\r
-       movq    %rsp, %rbp\r
+    pushq   %rbp            // stack frame is for the debugger\r
+    movq    %rsp, %rbp\r
 \r
     movq    %r8,  %rsp\r
     \r
@@ -52,7 +52,7 @@ ASM_PFX(PeiSwitchStacks):
     # Reserve space for register parameters (rcx, rdx, r8 & r9) on the stack,\r
     # in case the callee wishes to spill them.\r
     #\r
-         subq    $32, %rsp  // 32-byte shadow space plus alignment pad\r
+    subq    $32, %rsp  // 32-byte shadow space plus alignment pad\r
     call    *%rax\r
 \r
 \r
@@ -76,8 +76,8 @@ ASM_PFX(PeiSwitchStacks):
 #------------------------------------------------------------------------------\r
 ASM_GLOBAL ASM_PFX(UnixPeiSwitchStacks)\r
 ASM_PFX(UnixPeiSwitchStacks):\r
-         pushq   %rbp            // stack frame is for the debugger\r
-       movq    %rsp, %rbp\r
+    pushq   %rbp            // stack frame is for the debugger\r
+    movq    %rsp, %rbp\r
 \r
     mov     %rdi, %rax\r
     mov     %rsi, %rdi\r
@@ -105,7 +105,7 @@ ASM_PFX(UnixPeiSwitchStacks):
 #------------------------------------------------------------------------------    \r
 ASM_GLOBAL ASM_PFX(SecSwitchStack)\r
 ASM_PFX(SecSwitchStack):\r
-       pushq   %rbp            // stack frame is for the debugger\r
+  pushq   %rbp            // stack frame is for the debugger\r
   movq    %rsp, %rbp\r
 \r
   mov     %rsp, %rax\r
index 385db630dbb6342e9ec4afecba330276b9804f6e..5314d11ccdf3b08e182e5a6195b70c99edce0174 100644 (file)
@@ -227,7 +227,7 @@ Returns:
   //\r
   if (TimerPeriod == 0\r
       || ((TimerPeriod > TIMER_MINIMUM_VALUE)\r
-         && (TimerPeriod < TIMER_MAXIMUM_VALUE))) {\r
+    && (TimerPeriod < TIMER_MAXIMUM_VALUE))) {\r
     mTimerPeriodMs = DivU64x32 (TimerPeriod + 5000, 10000);\r
 \r
     gUnix->SetTimer (mTimerPeriodMs, TimerCallback);\r
index 0df0e3d9674056845630e3ebdea6279a4ce0b8d9..69ba61dfb5d02cac1b208579ef25e963754677ed 100644 (file)
@@ -149,7 +149,7 @@ UnixBlockIoDriverDiagnosticsRunDiagnostics (
     *ErrorType  = &gEfiBlockIoProtocolGuid;\r
     *BufferSize = 0x60;\r
     gBS->AllocatePool (EfiBootServicesData, (UINTN) (*BufferSize),\r
-                      (void *)Buffer);\r
+           (void *)Buffer);\r
     CopyMem (*Buffer, L"Unix Block I/O Driver Diagnostics Failed\n", *BufferSize);\r
     return EFI_DEVICE_ERROR;\r
   }\r
index f61db9481b50536813a5cc319db552f26f57cc21..2de6cc628267b894723f0849de86f5ee3216965a 100644 (file)
@@ -410,7 +410,7 @@ Returns:
   BOOLEAN                     WriteProtected;\r
   UINTN                       NumberOfBlocks;\r
   UINTN                       BlockSize;\r
-  INTN                       i;\r
+  INTN                        i;\r
 \r
   //\r
   // Grab the protocols we need\r
index 52618d73a09222b6c5dcd43602f4d489aa8371d0..e1ec083822e689d10d0e82a3917607dfade561e4 100644 (file)
@@ -468,7 +468,7 @@ Returns:
 \r
         UnixDevice->ControllerNameTable = NULL;\r
 \r
-       //  FIXME: check size\r
+  //  FIXME: check size\r
         StrCpy(ComponentName, UnixDevice->UnixIo.EnvString);\r
 \r
         UnixDevice->DevicePath = UnixBusCreateDevicePath (\r
index 484a07c482c9f59414182b6236111b72d9caaf6e..704b54e2349c3399b3a2a8080999a8c8143ef837 100644 (file)
@@ -191,10 +191,10 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gUnixSerialIoComponentName;
 #define __MAX_BAUD B4000000\r
 #endif\r
 #ifndef CMSPAR\r
-#define CMSPAR   010000000000          /* mark or space (stick) parity */\r
+#define CMSPAR    010000000000    /* mark or space (stick) parity */\r
 #endif\r
 #ifndef FIONREAD\r
-#define FIONREAD       0x541B\r
+#define FIONREAD  0x541B\r
 #endif\r
 //\r
 // Function Prototypes\r
index 81065e73558ce0c8d9c5f73ca3e22aa0a2db56e9..e697b99a38d6d0be5b865a9a94831344ca06071f 100644 (file)
@@ -350,9 +350,9 @@ Done:
     if (Private != NULL) {\r
 \r
       if (Private->VolumeLabel != NULL)\r
-       gBS->FreePool (Private->VolumeLabel);\r
+  gBS->FreePool (Private->VolumeLabel);\r
       if (Private->FilePath != NULL)\r
-       gBS->FreePool (Private->FilePath);\r
+  gBS->FreePool (Private->FilePath);\r
       FreeUnicodeStringTable (Private->ControllerNameTable);\r
 \r
       gBS->FreePool (Private);\r
@@ -862,7 +862,7 @@ OpenRoot:
       // Create a directory\r
       //\r
       if (NewPrivateFile->UnixThunk->MkDir (NewPrivateFile->FileName, 0777) != 0) {\r
-       INTN LastError;\r
+  INTN LastError;\r
 \r
         LastError = PrivateFile->UnixThunk->GetErrno ();\r
         if (LastError != EEXIST) {\r
@@ -897,9 +897,9 @@ OpenRoot:
        0666);\r
     if (NewPrivateFile->fd < 0) {\r
       if (PrivateFile->UnixThunk->GetErrno () == ENOENT) {\r
-       Status = EFI_NOT_FOUND;\r
+  Status = EFI_NOT_FOUND;\r
       } else {\r
-       Status = EFI_ACCESS_DENIED;\r
+  Status = EFI_ACCESS_DENIED;\r
       }\r
     }\r
   }\r
@@ -1184,7 +1184,7 @@ Returns:
   }\r
   if (PrivateFile->UnixThunk->Stat (\r
           FileName == NULL ? PrivateFile->FileName : FileName,\r
-         &buf) < 0)\r
+    &buf) < 0)\r
     return EFI_DEVICE_ERROR;\r
 \r
   Status  = EFI_SUCCESS;\r
@@ -1285,9 +1285,9 @@ Returns:
     }\r
 \r
     Res = PrivateFile->UnixThunk->Read (\r
-                                        PrivateFile->fd,\r
-                                        Buffer,\r
-                                        *BufferSize);\r
+           PrivateFile->fd,\r
+           Buffer,\r
+           *BufferSize);\r
     if (Res < 0) {\r
       Status = EFI_DEVICE_ERROR;\r
       goto Done;\r
@@ -1336,14 +1336,14 @@ Returns:
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
-                 \r
+      \r
   AsciiStrCpy(FullFileName, PrivateFile->FileName);\r
   AsciiStrCat(FullFileName, "/");\r
   AsciiStrCat(FullFileName, PrivateFile->Dirent->d_name);\r
   Status = UnixSimpleFileSystemFileInfo (PrivateFile,\r
-                                         FullFileName,\r
-                                         BufferSize,\r
-                                         Buffer);\r
+            FullFileName,\r
+            BufferSize,\r
+            Buffer);\r
   gBS->FreePool (FullFileName);\r
 \r
   PrivateFile->Dirent = NULL;\r
@@ -1423,9 +1423,9 @@ Returns:
   }\r
 \r
   Res = PrivateFile->UnixThunk->Write (\r
-                                       PrivateFile->fd,\r
-                                       Buffer,\r
-                                       *BufferSize);\r
+          PrivateFile->fd,\r
+          Buffer,\r
+          *BufferSize);\r
   if (Res == (UINTN)-1) {\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
@@ -1850,7 +1850,7 @@ Returns:
   }\r
 \r
   Status = gBS->AllocatePool (EfiBootServicesData, OldInfoSize,\r
-                             (VOID **)&OldFileInfo);\r
+            (VOID **)&OldFileInfo);\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
index 8dcadd75082a462ae9cfe93db43db750d7701235..b91004191182d060d8697d647c6bd1966aaadc9c 100644 (file)
@@ -24,12 +24,12 @@ Abstract:
 \r
 EFI_DRIVER_BINDING_PROTOCOL gUnixSnpDriverBinding =\r
 {\r
-       UnixSnpDriverBindingSupported,\r
-       UnixSnpDriverBindingStart,\r
-       UnixSnpDriverBindingStop,\r
-       0xA,\r
-       NULL,\r
-       NULL\r
+  UnixSnpDriverBindingSupported,\r
+  UnixSnpDriverBindingStart,\r
+  UnixSnpDriverBindingStop,\r
+  0xA,\r
+  NULL,\r
+  NULL\r
 };\r
 \r
 /**\r
@@ -43,8 +43,8 @@ EFI_DRIVER_BINDING_PROTOCOL gUnixSnpDriverBinding =
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpStart(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This\r
+  );\r
   \r
 /**\r
   Changes the state of a network interface from "started" to "stopped".\r
@@ -57,8 +57,8 @@ UnixSnpStart(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpStop(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This\r
+  );\r
   \r
 /**\r
   Resets a network adapter and allocates the transmit and receive buffers \r
@@ -83,10 +83,10 @@ UnixSnpStop(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpInitialize(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN UINTN                                                        ExtraRxBufferSize OPTIONAL,\r
-       IN UINTN                                                        ExtraTxBufferSize OPTIONAL\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN UINTN              ExtraRxBufferSize OPTIONAL,\r
+  IN UINTN              ExtraTxBufferSize OPTIONAL\r
+  );\r
   \r
 /**\r
   Resets a network adapter and re-initializes it with the parameters that were \r
@@ -103,9 +103,9 @@ UnixSnpInitialize(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpReset(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      ExtendedVerification\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              ExtendedVerification\r
+  );\r
 \r
 /**\r
   Resets a network adapter and leaves it in a state that is safe for \r
@@ -119,8 +119,8 @@ UnixSnpReset(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpShutdown(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This\r
+  );\r
 \r
 /**\r
   Manages the multicast receive filters of a network interface.\r
@@ -146,13 +146,13 @@ UnixSnpShutdown(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpReceiveFilters(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN UINT32                                                       EnableBits,\r
-       IN UINT32                                                       DisableBits,\r
-       IN BOOLEAN                                                      ResetMcastFilter,\r
-       IN UINTN                                                        McastFilterCount OPTIONAL,\r
-       IN EFI_MAC_ADDRESS*                                     McastFilter OPTIONAL\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN UINT32              EnableBits,\r
+  IN UINT32              DisableBits,\r
+  IN BOOLEAN              ResetMcastFilter,\r
+  IN UINTN              McastFilterCount OPTIONAL,\r
+  IN EFI_MAC_ADDRESS*          McastFilter OPTIONAL\r
+  );\r
 \r
 /**\r
   Modifies or resets the current station address, if supported.\r
@@ -168,10 +168,10 @@ UnixSnpReceiveFilters(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpStationAddress(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      Reset,\r
-       IN EFI_MAC_ADDRESS*                                     NewMacAddr OPTIONAL\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              Reset,\r
+  IN EFI_MAC_ADDRESS*          NewMacAddr OPTIONAL\r
+  );\r
 \r
 /**\r
   Resets or collects the statistics on a network interface.\r
@@ -195,11 +195,11 @@ UnixSnpStationAddress(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpStatistics(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      Reset,\r
-       IN OUT UINTN*                                           StatisticsSize OPTIONAL,\r
-       OUT EFI_NETWORK_STATISTICS*                     StatisticsTable OPTIONAL\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              Reset,\r
+  IN OUT UINTN*            StatisticsSize OPTIONAL,\r
+  OUT EFI_NETWORK_STATISTICS*      StatisticsTable OPTIONAL\r
+  );\r
   \r
 /**\r
   Converts a multicast IP address to a multicast HW MAC address.\r
@@ -223,11 +223,11 @@ UnixSnpStatistics(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpMcastIptoMac(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      Ipv6,\r
-       IN EFI_IP_ADDRESS*                                      Ip,\r
-       OUT EFI_MAC_ADDRESS*                            Mac\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              Ipv6,\r
+  IN EFI_IP_ADDRESS*          Ip,\r
+  OUT EFI_MAC_ADDRESS*        Mac\r
+  );\r
 \r
 /**\r
   Performs read and write operations on the NVRAM device attached to a \r
@@ -248,12 +248,12 @@ UnixSnpMcastIptoMac(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpNvdata(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      ReadOrWrite,\r
-       IN UINTN                                                        Offset,\r
-       IN UINTN                                                        BufferSize,\r
-       IN OUT VOID*                                            Buffer\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              ReadOrWrite,\r
+  IN UINTN              Offset,\r
+  IN UINTN              BufferSize,\r
+  IN OUT VOID*            Buffer\r
+  );\r
 \r
 /**\r
   Reads the current interrupt status and recycled transmit buffer status from \r
@@ -279,10 +279,10 @@ UnixSnpNvdata(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpGetStatus(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       OUT UINT32*                                                     InterruptStatus,\r
-       OUT VOID**                                                      TxBuffer\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  OUT UINT32*              InterruptStatus,\r
+  OUT VOID**              TxBuffer\r
+  );\r
 \r
 /**\r
   Places a packet in the transmit queue of a network interface.\r
@@ -316,14 +316,14 @@ UnixSnpGetStatus(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpTransmit(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN UINTN                                                        HeaderSize,\r
-       IN UINTN                                                        BufferSize,\r
-       IN VOID*                                                        Buffer,\r
-       IN EFI_MAC_ADDRESS*                                     SrcAddr OPTIONAL,\r
-       IN EFI_MAC_ADDRESS*                                     DestAddr OPTIONAL,\r
-       IN UINT16*                                                      Protocol OPTIONAL\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN UINTN              HeaderSize,\r
+  IN UINTN              BufferSize,\r
+  IN VOID*              Buffer,\r
+  IN EFI_MAC_ADDRESS*          SrcAddr OPTIONAL,\r
+  IN EFI_MAC_ADDRESS*          DestAddr OPTIONAL,\r
+  IN UINT16*              Protocol OPTIONAL\r
+  );\r
 \r
 /**\r
   Receives a packet from a network interface.\r
@@ -358,21 +358,21 @@ UnixSnpTransmit(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpReceive(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       OUT UINTN*                                                      HeaderSize OPTIONAL,\r
-       IN OUT UINTN*                                           BuffSize,\r
-       OUT VOID*                                                       Buffer,\r
-       OUT EFI_MAC_ADDRESS*                            SourceAddr OPTIONAL,\r
-       OUT EFI_MAC_ADDRESS*                            DestinationAddr OPTIONAL,\r
-       OUT UINT16*                                                     Protocol OPTIONAL\r
-       );\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  OUT UINTN*              HeaderSize OPTIONAL,\r
+  IN OUT UINTN*            BuffSize,\r
+  OUT VOID*              Buffer,\r
+  OUT EFI_MAC_ADDRESS*        SourceAddr OPTIONAL,\r
+  OUT EFI_MAC_ADDRESS*        DestinationAddr OPTIONAL,\r
+  OUT UINT16*              Protocol OPTIONAL\r
+  );\r
 \r
 VOID\r
 EFIAPI\r
 UnixSnpWaitForPacketNotify(\r
-       IN EFI_EVENT                                            Event,\r
-       IN VOID*                                                        Private\r
-       );\r
+  IN EFI_EVENT            Event,\r
+  IN VOID*              Private\r
+  );\r
 \r
 //\r
 // Strange, but there doesn't appear to be any structure for the Ethernet header in edk2...\r
@@ -380,171 +380,171 @@ UnixSnpWaitForPacketNotify(
 \r
 typedef struct\r
 {\r
-       UINT8                                                           DstAddr[ NET_ETHER_ADDR_LEN ];\r
-       UINT8                                                           SrcAddr[ NET_ETHER_ADDR_LEN ];\r
-       UINT16                                                          Type;\r
+  UINT8                DstAddr[ NET_ETHER_ADDR_LEN ];\r
+  UINT8                SrcAddr[ NET_ETHER_ADDR_LEN ];\r
+  UINT16                Type;\r
 } EthernetHeader;\r
 \r
 UNIX_SNP_PRIVATE_DATA gUnixSnpPrivateTemplate =\r
 {\r
-       UNIX_SNP_PRIVATE_DATA_SIGNATURE,                        // Signature\r
-       NULL,                                                                           // UnixThunk\r
-       NULL,                                                                           // DeviceHandle\r
-       NULL,                                                                           // DevicePath\r
-       { 0 },                                                                          // MacAddress\r
-       NULL,                                                                           // InterfaceName\r
-       0,                                                                                      // ReadBufferSize\r
-       NULL,                                                                           // ReadBuffer\r
-       NULL,                                                                           // CurrentReadPointer\r
-       NULL,                                                                           // EndReadPointer\r
-       0,                                                                                      // BpfFd\r
-       {                                                                               // Snp\r
-               EFI_SIMPLE_NETWORK_PROTOCOL_REVISION,   // Revision\r
-               UnixSnpStart,                                                   // Start\r
-               UnixSnpStop,                                                    // Stop\r
-               UnixSnpInitialize,                                              // Initialize\r
-               UnixSnpReset,                                                   // Reset\r
-               UnixSnpShutdown,                                                // Shutdown\r
-               UnixSnpReceiveFilters,                                  // ReceiveFilters\r
-               UnixSnpStationAddress,                                  // StationAddress\r
-               UnixSnpStatistics,                                              // Statistics\r
-               UnixSnpMcastIptoMac,                                    // MCastIpToMac\r
-               UnixSnpNvdata,                                                  // NvData\r
-               UnixSnpGetStatus,                                               // GetStatus\r
-               UnixSnpTransmit,                                                // Transmit\r
-               UnixSnpReceive,                                                 // Receive\r
-               NULL,                                                                   // WaitForPacket\r
-               NULL                                                                    // Mode\r
-       },\r
-       {                                                                               // Mode\r
-               EfiSimpleNetworkStopped,                                //  State\r
-               NET_ETHER_ADDR_LEN,                                             //  HwAddressSize\r
-               NET_ETHER_HEADER_SIZE,                                  //  MediaHeaderSize\r
-               1500,                                                                   //  MaxPacketSize\r
-               0,                                                                              //  NvRamSize\r
-               0,                                                                              //  NvRamAccessSize\r
-               0,                                                                              //  ReceiveFilterMask\r
-               0,                                                                              //  ReceiveFilterSetting\r
-               MAX_MCAST_FILTER_CNT,                                   //  MaxMCastFilterCount\r
-               0,                                                                              //  MCastFilterCount\r
-               {\r
-                       0\r
-               },                                                                              //  MCastFilter\r
-               {\r
-                       0\r
-               },                                                                              //  CurrentAddress\r
-               {\r
-                       0\r
-               },                                                                              //  BroadcastAddress\r
-               {\r
-                       0\r
-               },                                                                              //  PermanentAddress\r
-               NET_IFTYPE_ETHERNET,                                    //  IfType\r
-               FALSE,                                                                  //  MacAddressChangeable\r
-               FALSE,                                                                  //  MultipleTxSupported\r
-               FALSE,                                                                  //  MediaPresentSupported\r
-               TRUE                                                                    //  MediaPresent\r
-       }\r
+  UNIX_SNP_PRIVATE_DATA_SIGNATURE,      // Signature\r
+  NULL,                    // UnixThunk\r
+  NULL,                    // DeviceHandle\r
+  NULL,                    // DevicePath\r
+  { 0 },                    // MacAddress\r
+  NULL,                    // InterfaceName\r
+  0,                      // ReadBufferSize\r
+  NULL,                    // ReadBuffer\r
+  NULL,                    // CurrentReadPointer\r
+  NULL,                    // EndReadPointer\r
+  0,                      // BpfFd\r
+  {                    // Snp\r
+    EFI_SIMPLE_NETWORK_PROTOCOL_REVISION,  // Revision\r
+    UnixSnpStart,              // Start\r
+    UnixSnpStop,              // Stop\r
+    UnixSnpInitialize,            // Initialize\r
+    UnixSnpReset,              // Reset\r
+    UnixSnpShutdown,            // Shutdown\r
+    UnixSnpReceiveFilters,          // ReceiveFilters\r
+    UnixSnpStationAddress,          // StationAddress\r
+    UnixSnpStatistics,            // Statistics\r
+    UnixSnpMcastIptoMac,          // MCastIpToMac\r
+    UnixSnpNvdata,              // NvData\r
+    UnixSnpGetStatus,            // GetStatus\r
+    UnixSnpTransmit,            // Transmit\r
+    UnixSnpReceive,              // Receive\r
+    NULL,                  // WaitForPacket\r
+    NULL                  // Mode\r
+  },\r
+  {                    // Mode\r
+    EfiSimpleNetworkStopped,        //  State\r
+    NET_ETHER_ADDR_LEN,            //  HwAddressSize\r
+    NET_ETHER_HEADER_SIZE,          //  MediaHeaderSize\r
+    1500,                  //  MaxPacketSize\r
+    0,                    //  NvRamSize\r
+    0,                    //  NvRamAccessSize\r
+    0,                    //  ReceiveFilterMask\r
+    0,                    //  ReceiveFilterSetting\r
+    MAX_MCAST_FILTER_CNT,          //  MaxMCastFilterCount\r
+    0,                    //  MCastFilterCount\r
+    {\r
+      0\r
+    },                    //  MCastFilter\r
+    {\r
+      0\r
+    },                    //  CurrentAddress\r
+    {\r
+      0\r
+    },                    //  BroadcastAddress\r
+    {\r
+      0\r
+    },                    //  PermanentAddress\r
+    NET_IFTYPE_ETHERNET,          //  IfType\r
+    FALSE,                  //  MacAddressChangeable\r
+    FALSE,                  //  MultipleTxSupported\r
+    FALSE,                  //  MediaPresentSupported\r
+    TRUE                  //  MediaPresent\r
+  }\r
 };\r
 \r
 STATIC EFI_STATUS\r
 GetInterfaceMacAddr(\r
-       IN UNIX_SNP_PRIVATE_DATA*                       Private,\r
-       IN EFI_UNIX_IO_PROTOCOL*                        UnixIo\r
-       )\r
+  IN UNIX_SNP_PRIVATE_DATA*      Private,\r
+  IN EFI_UNIX_IO_PROTOCOL*      UnixIo\r
+  )\r
 {\r
-       struct ifaddrs*                                         IfAddrs;\r
-       struct ifaddrs*                                         If;\r
-       struct sockaddr_dl*                                     IfSdl;\r
-       EFI_STATUS                                                      Status;\r
-       INTN                                                            Result;\r
-\r
-       Result = UnixIo->UnixThunk->GetIfAddrs( &IfAddrs );\r
-       if ( Result != 0 )\r
-       {\r
-               return( EFI_UNSUPPORTED );\r
-       }\r
-\r
-       //\r
-       // Convert the interface name to ASCII so we can find it.\r
-       //\r
-       Private->InterfaceName = AllocateZeroPool( StrLen( UnixIo->EnvString ) );\r
-\r
-       if ( !Private->InterfaceName )\r
-       {\r
-               Status = EFI_OUT_OF_RESOURCES;\r
-               goto Exit;\r
-       }\r
-\r
-       UnicodeStrToAsciiStr( UnixIo->EnvString, Private->InterfaceName );\r
-\r
-       If = IfAddrs;\r
-\r
-       while ( If != NULL )\r
-       {\r
-               IfSdl = ( struct sockaddr_dl * ) If->ifa_addr;\r
-\r
-               if ( IfSdl->sdl_family == AF_LINK )\r
-               {\r
-                       if ( !AsciiStrCmp( Private->InterfaceName, If->ifa_name ) )\r
-                       {\r
-                               CopyMem( &Private->MacAddress, LLADDR( IfSdl ), NET_ETHER_ADDR_LEN );\r
-\r
-                               Status = EFI_SUCCESS;\r
-                               break;\r
-                       }\r
-               }\r
-\r
-               If = If->ifa_next;\r
-       }\r
+  struct ifaddrs*            IfAddrs;\r
+  struct ifaddrs*            If;\r
+  struct sockaddr_dl*          IfSdl;\r
+  EFI_STATUS              Status;\r
+  INTN                Result;\r
+\r
+  Result = UnixIo->UnixThunk->GetIfAddrs( &IfAddrs );\r
+  if ( Result != 0 )\r
+  {\r
+    return( EFI_UNSUPPORTED );\r
+  }\r
+\r
+  //\r
+  // Convert the interface name to ASCII so we can find it.\r
+  //\r
+  Private->InterfaceName = AllocateZeroPool( StrLen( UnixIo->EnvString ) );\r
+\r
+  if ( !Private->InterfaceName )\r
+  {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    goto Exit;\r
+  }\r
+\r
+  UnicodeStrToAsciiStr( UnixIo->EnvString, Private->InterfaceName );\r
+\r
+  If = IfAddrs;\r
+\r
+  while ( If != NULL )\r
+  {\r
+    IfSdl = ( struct sockaddr_dl * ) If->ifa_addr;\r
+\r
+    if ( IfSdl->sdl_family == AF_LINK )\r
+    {\r
+      if ( !AsciiStrCmp( Private->InterfaceName, If->ifa_name ) )\r
+      {\r
+        CopyMem( &Private->MacAddress, LLADDR( IfSdl ), NET_ETHER_ADDR_LEN );\r
+\r
+        Status = EFI_SUCCESS;\r
+        break;\r
+      }\r
+    }\r
+\r
+    If = If->ifa_next;\r
+  }\r
 \r
 Exit:\r
-       ( VOID ) UnixIo->UnixThunk->FreeIfAddrs( IfAddrs );\r
+  ( VOID ) UnixIo->UnixThunk->FreeIfAddrs( IfAddrs );\r
 \r
-       return( Status );\r
+  return( Status );\r
 }\r
 \r
 \r
 STATIC EFI_STATUS\r
 OpenBpfFileDescriptor(\r
-       IN UNIX_SNP_PRIVATE_DATA*               Private,\r
-       OUT INTN*                                               Fd\r
-       )\r
+  IN UNIX_SNP_PRIVATE_DATA*    Private,\r
+  OUT INTN*            Fd\r
+  )\r
 {\r
-       CHAR8                                                   BfpDeviceName[ 256 ];\r
-       INTN                                                    Index;\r
-       EFI_STATUS                                              Status = EFI_OUT_OF_RESOURCES;\r
-       INTN                                                    Result;\r
-\r
-       //\r
-       // Open a Berkeley Packet Filter device.  This must be done as root, so this is probably\r
-       // the place which is most likely to fail...\r
-       //\r
-       for ( Index = 0; TRUE; Index++ )\r
-       {\r
-               AsciiSPrint( BfpDeviceName, sizeof( BfpDeviceName ), "/dev/bpf%d", Index );\r
-\r
-               *Fd = Private->UnixThunk->Open( BfpDeviceName, O_RDWR, 0 );\r
-\r
-               if ( *Fd >= 0 )\r
-               {\r
-                       Status = EFI_SUCCESS;\r
-                       break;\r
-               }\r
-\r
-               Result = Private->UnixThunk->GetErrno();\r
+  CHAR8              BfpDeviceName[ 256 ];\r
+  INTN              Index;\r
+  EFI_STATUS            Status = EFI_OUT_OF_RESOURCES;\r
+  INTN              Result;\r
+\r
+  //\r
+  // Open a Berkeley Packet Filter device.  This must be done as root, so this is probably\r
+  // the place which is most likely to fail...\r
+  //\r
+  for ( Index = 0; TRUE; Index++ )\r
+  {\r
+    AsciiSPrint( BfpDeviceName, sizeof( BfpDeviceName ), "/dev/bpf%d", Index );\r
+\r
+    *Fd = Private->UnixThunk->Open( BfpDeviceName, O_RDWR, 0 );\r
+\r
+    if ( *Fd >= 0 )\r
+    {\r
+      Status = EFI_SUCCESS;\r
+      break;\r
+    }\r
+\r
+    Result = Private->UnixThunk->GetErrno();\r
     if ( Result == EACCES )\r
     {\r
       DEBUG( ( EFI_D_ERROR, "Permissions on '%a' are incorrect.  Fix with 'sudo chmod 666 %a'.\n",\r
           BfpDeviceName, BfpDeviceName ) );\r
     }\r
-               if ( Result != EBUSY )\r
-               {\r
-                       break;\r
-               }\r
-       }\r
+    if ( Result != EBUSY )\r
+    {\r
+      break;\r
+    }\r
+  }\r
 \r
-       return( Status );\r
+  return( Status );\r
 }\r
 \r
 \r
@@ -568,51 +568,51 @@ OpenBpfFileDescriptor(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpDriverBindingSupported(\r
-       IN EFI_DRIVER_BINDING_PROTOCOL*         This,\r
-       IN EFI_HANDLE                                           ControllerHandle,\r
-       IN EFI_DEVICE_PATH_PROTOCOL*            RemainingDevicePath OPTIONAL\r
-       )\r
+  IN EFI_DRIVER_BINDING_PROTOCOL*    This,\r
+  IN EFI_HANDLE            ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL*    RemainingDevicePath OPTIONAL\r
+  )\r
 {\r
-       EFI_STATUS                                                      Status;\r
-       EFI_UNIX_IO_PROTOCOL*                           UnixIo;\r
-\r
-       //\r
-       // Open the I/O abstraction needed to perform the supported test.\r
-       //\r
-       Status = gBS->OpenProtocol(\r
-                                       ControllerHandle,\r
-                                       &gEfiUnixIoProtocolGuid,\r
-                                       ( VOID ** ) &UnixIo,\r
-                                       This->DriverBindingHandle,\r
-                                       ControllerHandle,\r
-                                       EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                                       );\r
-\r
-       if ( EFI_ERROR( Status ) )\r
-       {\r
-               return( Status );\r
-       }\r
-\r
-       //\r
-       // Validate GUID\r
-       //\r
-       Status = EFI_UNSUPPORTED;\r
-       if ( CompareGuid( UnixIo->TypeGuid, &gEfiUnixNetworkGuid ) )\r
-       {\r
-               Status = EFI_SUCCESS;\r
-       }\r
-\r
-       //\r
-       // Close the I/O abstraction used to perform the supported test.\r
-       //\r
-       gBS->CloseProtocol(\r
-                                       ControllerHandle,\r
-                                       &gEfiUnixIoProtocolGuid,\r
-                                       This->DriverBindingHandle,\r
-                                       ControllerHandle\r
-                                       );\r
-\r
-       return( Status );\r
+  EFI_STATUS              Status;\r
+  EFI_UNIX_IO_PROTOCOL*        UnixIo;\r
+\r
+  //\r
+  // Open the I/O abstraction needed to perform the supported test.\r
+  //\r
+  Status = gBS->OpenProtocol(\r
+          ControllerHandle,\r
+          &gEfiUnixIoProtocolGuid,\r
+          ( VOID ** ) &UnixIo,\r
+          This->DriverBindingHandle,\r
+          ControllerHandle,\r
+          EFI_OPEN_PROTOCOL_BY_DRIVER\r
+          );\r
+\r
+  if ( EFI_ERROR( Status ) )\r
+  {\r
+    return( Status );\r
+  }\r
+\r
+  //\r
+  // Validate GUID\r
+  //\r
+  Status = EFI_UNSUPPORTED;\r
+  if ( CompareGuid( UnixIo->TypeGuid, &gEfiUnixNetworkGuid ) )\r
+  {\r
+    Status = EFI_SUCCESS;\r
+  }\r
+\r
+  //\r
+  // Close the I/O abstraction used to perform the supported test.\r
+  //\r
+  gBS->CloseProtocol(\r
+          ControllerHandle,\r
+          &gEfiUnixIoProtocolGuid,\r
+          This->DriverBindingHandle,\r
+          ControllerHandle\r
+          );\r
+\r
+  return( Status );\r
 }\r
 \r
 \r
@@ -635,175 +635,175 @@ UnixSnpDriverBindingSupported(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpDriverBindingStart(\r
-       IN EFI_DRIVER_BINDING_PROTOCOL*         This,\r
-       IN EFI_HANDLE                                           ControllerHandle,\r
-       IN EFI_DEVICE_PATH_PROTOCOL*            RemainingDevicePath OPTIONAL\r
-       )\r
+  IN EFI_DRIVER_BINDING_PROTOCOL*    This,\r
+  IN EFI_HANDLE            ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL*    RemainingDevicePath OPTIONAL\r
+  )\r
 {\r
-       MAC_ADDR_DEVICE_PATH                    Node;\r
-       EFI_DEVICE_PATH_PROTOCOL*               ParentDevicePath = NULL;\r
-       EFI_UNIX_IO_PROTOCOL*                   UnixIo;\r
-       UNIX_SNP_PRIVATE_DATA*                  Private = NULL;\r
-       EFI_STATUS                                              Status;\r
-       BOOLEAN                                                 CreateDevice;\r
-\r
-       //\r
-       // Grab the protocols we need.\r
-       //\r
-       Status = gBS->OpenProtocol(\r
-                                       ControllerHandle,\r
-                                       &gEfiDevicePathProtocolGuid,\r
-                                       ( VOID ** ) &ParentDevicePath,\r
-                                       This->DriverBindingHandle,\r
-                                       ControllerHandle,\r
-                                       EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                                       );\r
-       if ( EFI_ERROR( Status ) )\r
-       {\r
-               goto ErrorExit;\r
-       }\r
-\r
-       //\r
-       // Open the I/O abstraction needed to perform the supported test.\r
-       //\r
-       Status = gBS->OpenProtocol(\r
-                                       ControllerHandle,\r
-                                       &gEfiUnixIoProtocolGuid,\r
-                                       ( VOID ** ) &UnixIo,\r
-                                       This->DriverBindingHandle,\r
-                                       ControllerHandle,\r
-                                       EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                                       );\r
-       if ( EFI_ERROR( Status ) )\r
-       {\r
-               goto ErrorExit;\r
-       }\r
-\r
-       //\r
-       // Validate GUID\r
-       //\r
-       if ( !CompareGuid( UnixIo->TypeGuid, &gEfiUnixNetworkGuid ) )\r
-       {\r
-               Status = EFI_UNSUPPORTED;\r
-               goto ErrorExit;\r
-       }\r
-\r
-       CreateDevice = TRUE;\r
-       if ( ( RemainingDevicePath != NULL ) && IsDevicePathEnd( RemainingDevicePath ) )\r
-       {\r
-               CreateDevice = FALSE;\r
-       }\r
-\r
-       if ( CreateDevice )\r
-       {\r
-               //\r
-               //  Allocate the private data.\r
-               //\r
-               Private = AllocateCopyPool( sizeof( UNIX_SNP_PRIVATE_DATA ), &gUnixSnpPrivateTemplate );\r
-               if ( Private == NULL )\r
-               {\r
-                       Status = EFI_OUT_OF_RESOURCES;\r
-                       goto ErrorExit;\r
-               }\r
-\r
-               Status = GetInterfaceMacAddr( Private, UnixIo );\r
-               if ( EFI_ERROR( Status ) )\r
-               {\r
-                       goto ErrorExit;\r
-               }\r
-\r
-               Private->UnixThunk = UnixIo->UnixThunk;\r
-\r
-               Private->Snp.Mode = &Private->Mode;\r
-\r
-               //\r
-               // Set the broadcast address.\r
-               //\r
-               SetMem( &Private->Mode.BroadcastAddress, sizeof( EFI_MAC_ADDRESS ), 0xFF );\r
-\r
-               CopyMem( &Private->Mode.CurrentAddress, &Private->MacAddress, sizeof( EFI_MAC_ADDRESS ) );\r
-               CopyMem( &Private->Mode.PermanentAddress, &Private->MacAddress, sizeof( EFI_MAC_ADDRESS ) );\r
-\r
-               //\r
-               // Since the fake SNP is based on a real NIC, to avoid conflict with the host NIC\r
-               // network stack, we use a different MAC address.\r
-               // So just change the last byte of the MAC address for the real NIC.\r
-               //\r
-               Private->Mode.CurrentAddress.Addr[ NET_ETHER_ADDR_LEN - 1 ]++;\r
-\r
-               //\r
-               // Build the device path by appending the MAC node to the ParentDevicePath\r
-               // from the UnixIo handle.\r
-               //\r
-               ZeroMem( &Node, sizeof( MAC_ADDR_DEVICE_PATH ) );\r
-\r
-               Node.Header.Type        = MESSAGING_DEVICE_PATH;\r
-               Node.Header.SubType     = MSG_MAC_ADDR_DP;\r
-               Node.IfType                     = Private->Mode.IfType;\r
-\r
-               SetDevicePathNodeLength( ( EFI_DEVICE_PATH_PROTOCOL * ) &Node, sizeof( MAC_ADDR_DEVICE_PATH ) );\r
-\r
-               CopyMem( &Node.MacAddress, &Private->Mode.CurrentAddress, sizeof( EFI_MAC_ADDRESS ) );\r
-\r
-               //\r
-               // Build the device path by appending the MAC node to the ParentDevicePath from the UnixIo handle.\r
-               //\r
-               Private->DevicePath = AppendDevicePathNode( ParentDevicePath, ( EFI_DEVICE_PATH_PROTOCOL * ) &Node );\r
-               if ( Private->DevicePath == NULL )\r
-               {\r
-                       Status = EFI_OUT_OF_RESOURCES;\r
-                       goto ErrorExit;\r
-               }\r
-\r
-               Status = gBS->InstallMultipleProtocolInterfaces(\r
-                                               &Private->DeviceHandle,\r
-                                               &gEfiSimpleNetworkProtocolGuid,\r
-                                               &Private->Snp,\r
-                                               &gEfiDevicePathProtocolGuid,\r
-                                               Private->DevicePath,\r
-                                               NULL\r
-                                               );\r
-               if ( EFI_ERROR( Status ) )\r
-               {\r
-                       goto ErrorExit;\r
-               }\r
-\r
-               Status = gBS->OpenProtocol(\r
-                                               ControllerHandle,\r
-                                               &gEfiUnixIoProtocolGuid,\r
-                                               ( VOID ** ) &UnixIo,\r
-                                               This->DriverBindingHandle,\r
-                                               Private->DeviceHandle,\r
-                                               EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-                                               );\r
-               if ( EFI_ERROR( Status ) )\r
-               {\r
-                       goto ErrorExit;\r
-               }\r
-       }\r
-       return( Status );\r
+  MAC_ADDR_DEVICE_PATH      Node;\r
+  EFI_DEVICE_PATH_PROTOCOL*    ParentDevicePath = NULL;\r
+  EFI_UNIX_IO_PROTOCOL*      UnixIo;\r
+  UNIX_SNP_PRIVATE_DATA*      Private = NULL;\r
+  EFI_STATUS            Status;\r
+  BOOLEAN              CreateDevice;\r
+\r
+  //\r
+  // Grab the protocols we need.\r
+  //\r
+  Status = gBS->OpenProtocol(\r
+          ControllerHandle,\r
+          &gEfiDevicePathProtocolGuid,\r
+          ( VOID ** ) &ParentDevicePath,\r
+          This->DriverBindingHandle,\r
+          ControllerHandle,\r
+          EFI_OPEN_PROTOCOL_BY_DRIVER\r
+          );\r
+  if ( EFI_ERROR( Status ) )\r
+  {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  //\r
+  // Open the I/O abstraction needed to perform the supported test.\r
+  //\r
+  Status = gBS->OpenProtocol(\r
+          ControllerHandle,\r
+          &gEfiUnixIoProtocolGuid,\r
+          ( VOID ** ) &UnixIo,\r
+          This->DriverBindingHandle,\r
+          ControllerHandle,\r
+          EFI_OPEN_PROTOCOL_BY_DRIVER\r
+          );\r
+  if ( EFI_ERROR( Status ) )\r
+  {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  //\r
+  // Validate GUID\r
+  //\r
+  if ( !CompareGuid( UnixIo->TypeGuid, &gEfiUnixNetworkGuid ) )\r
+  {\r
+    Status = EFI_UNSUPPORTED;\r
+    goto ErrorExit;\r
+  }\r
+\r
+  CreateDevice = TRUE;\r
+  if ( ( RemainingDevicePath != NULL ) && IsDevicePathEnd( RemainingDevicePath ) )\r
+  {\r
+    CreateDevice = FALSE;\r
+  }\r
+\r
+  if ( CreateDevice )\r
+  {\r
+    //\r
+    //  Allocate the private data.\r
+    //\r
+    Private = AllocateCopyPool( sizeof( UNIX_SNP_PRIVATE_DATA ), &gUnixSnpPrivateTemplate );\r
+    if ( Private == NULL )\r
+    {\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+      goto ErrorExit;\r
+    }\r
+\r
+    Status = GetInterfaceMacAddr( Private, UnixIo );\r
+    if ( EFI_ERROR( Status ) )\r
+    {\r
+      goto ErrorExit;\r
+    }\r
+\r
+    Private->UnixThunk = UnixIo->UnixThunk;\r
+\r
+    Private->Snp.Mode = &Private->Mode;\r
+\r
+    //\r
+    // Set the broadcast address.\r
+    //\r
+    SetMem( &Private->Mode.BroadcastAddress, sizeof( EFI_MAC_ADDRESS ), 0xFF );\r
+\r
+    CopyMem( &Private->Mode.CurrentAddress, &Private->MacAddress, sizeof( EFI_MAC_ADDRESS ) );\r
+    CopyMem( &Private->Mode.PermanentAddress, &Private->MacAddress, sizeof( EFI_MAC_ADDRESS ) );\r
+\r
+    //\r
+    // Since the fake SNP is based on a real NIC, to avoid conflict with the host NIC\r
+    // network stack, we use a different MAC address.\r
+    // So just change the last byte of the MAC address for the real NIC.\r
+    //\r
+    Private->Mode.CurrentAddress.Addr[ NET_ETHER_ADDR_LEN - 1 ]++;\r
+\r
+    //\r
+    // Build the device path by appending the MAC node to the ParentDevicePath\r
+    // from the UnixIo handle.\r
+    //\r
+    ZeroMem( &Node, sizeof( MAC_ADDR_DEVICE_PATH ) );\r
+\r
+    Node.Header.Type  = MESSAGING_DEVICE_PATH;\r
+    Node.Header.SubType  = MSG_MAC_ADDR_DP;\r
+    Node.IfType      = Private->Mode.IfType;\r
+\r
+    SetDevicePathNodeLength( ( EFI_DEVICE_PATH_PROTOCOL * ) &Node, sizeof( MAC_ADDR_DEVICE_PATH ) );\r
+\r
+    CopyMem( &Node.MacAddress, &Private->Mode.CurrentAddress, sizeof( EFI_MAC_ADDRESS ) );\r
+\r
+    //\r
+    // Build the device path by appending the MAC node to the ParentDevicePath from the UnixIo handle.\r
+    //\r
+    Private->DevicePath = AppendDevicePathNode( ParentDevicePath, ( EFI_DEVICE_PATH_PROTOCOL * ) &Node );\r
+    if ( Private->DevicePath == NULL )\r
+    {\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+      goto ErrorExit;\r
+    }\r
+\r
+    Status = gBS->InstallMultipleProtocolInterfaces(\r
+            &Private->DeviceHandle,\r
+            &gEfiSimpleNetworkProtocolGuid,\r
+            &Private->Snp,\r
+            &gEfiDevicePathProtocolGuid,\r
+            Private->DevicePath,\r
+            NULL\r
+            );\r
+    if ( EFI_ERROR( Status ) )\r
+    {\r
+      goto ErrorExit;\r
+    }\r
+\r
+    Status = gBS->OpenProtocol(\r
+            ControllerHandle,\r
+            &gEfiUnixIoProtocolGuid,\r
+            ( VOID ** ) &UnixIo,\r
+            This->DriverBindingHandle,\r
+            Private->DeviceHandle,\r
+            EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+            );\r
+    if ( EFI_ERROR( Status ) )\r
+    {\r
+      goto ErrorExit;\r
+    }\r
+  }\r
+  return( Status );\r
 \r
 ErrorExit:\r
-       if ( Private->InterfaceName != NULL )\r
-       {\r
-               FreePool( Private->InterfaceName );\r
-               Private->InterfaceName = NULL;\r
-       }\r
-       if ( Private != NULL )\r
-       {\r
-               FreePool( Private );\r
-       }\r
-       if ( ParentDevicePath != NULL )\r
-       {\r
-               gBS->CloseProtocol(\r
-                                       ControllerHandle,\r
-                                       &gEfiDevicePathProtocolGuid,\r
-                                       This->DriverBindingHandle,\r
-                                       ControllerHandle\r
-                                       );\r
-       }\r
-\r
-       return( Status );\r
+  if ( Private->InterfaceName != NULL )\r
+  {\r
+    FreePool( Private->InterfaceName );\r
+    Private->InterfaceName = NULL;\r
+  }\r
+  if ( Private != NULL )\r
+  {\r
+    FreePool( Private );\r
+  }\r
+  if ( ParentDevicePath != NULL )\r
+  {\r
+    gBS->CloseProtocol(\r
+          ControllerHandle,\r
+          &gEfiDevicePathProtocolGuid,\r
+          This->DriverBindingHandle,\r
+          ControllerHandle\r
+          );\r
+  }\r
+\r
+  return( Status );\r
 }\r
 \r
 /**\r
@@ -826,55 +826,55 @@ ErrorExit:
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpDriverBindingStop(\r
-       IN EFI_DRIVER_BINDING_PROTOCOL*         This,\r
-       IN EFI_HANDLE                                           ControllerHandle,\r
-       IN UINTN                                                        NumberOfChildren,\r
-       IN EFI_HANDLE*                                          ChildHandleBuffer\r
-       )\r
+  IN EFI_DRIVER_BINDING_PROTOCOL*    This,\r
+  IN EFI_HANDLE            ControllerHandle,\r
+  IN UINTN              NumberOfChildren,\r
+  IN EFI_HANDLE*            ChildHandleBuffer\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private = NULL;\r
-       EFI_SIMPLE_NETWORK_PROTOCOL*            Snp;\r
-       EFI_STATUS                                                      Status;\r
-\r
-       //\r
-       // Get our context back.\r
-       //\r
-       Status = gBS->OpenProtocol(\r
-                               ControllerHandle,\r
-                               &gEfiSimpleNetworkProtocolGuid,\r
-                               ( VOID ** ) &Snp,\r
-                               This->DriverBindingHandle,\r
-                               ControllerHandle,\r
-                               EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-                               );\r
-       if ( EFI_ERROR( Status ) )\r
-       {\r
-               return( EFI_UNSUPPORTED );\r
-       }\r
-\r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( Snp );\r
-\r
-       Status = gBS->CloseProtocol(\r
-                               ControllerHandle,\r
-                               &gEfiUnixIoProtocolGuid,\r
-                               This->DriverBindingHandle,\r
-                               Private->DeviceHandle\r
-                               );\r
-\r
-       Status = gBS->UninstallMultipleProtocolInterfaces(\r
-                               Private->DeviceHandle,\r
-                               &gEfiSimpleNetworkProtocolGuid,\r
-                               &Private->Snp,\r
-                               &gEfiDevicePathProtocolGuid,\r
-                               Private->DevicePath,\r
-                               NULL\r
-                               );\r
-\r
-       FreePool( Private->InterfaceName );\r
-       FreePool( Private->DevicePath );\r
-       FreePool( Private );\r
-\r
-       return( EFI_SUCCESS );\r
+  UNIX_SNP_PRIVATE_DATA*        Private = NULL;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL*    Snp;\r
+  EFI_STATUS              Status;\r
+\r
+  //\r
+  // Get our context back.\r
+  //\r
+  Status = gBS->OpenProtocol(\r
+        ControllerHandle,\r
+        &gEfiSimpleNetworkProtocolGuid,\r
+        ( VOID ** ) &Snp,\r
+        This->DriverBindingHandle,\r
+        ControllerHandle,\r
+        EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+        );\r
+  if ( EFI_ERROR( Status ) )\r
+  {\r
+    return( EFI_UNSUPPORTED );\r
+  }\r
+\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( Snp );\r
+\r
+  Status = gBS->CloseProtocol(\r
+        ControllerHandle,\r
+        &gEfiUnixIoProtocolGuid,\r
+        This->DriverBindingHandle,\r
+        Private->DeviceHandle\r
+        );\r
+\r
+  Status = gBS->UninstallMultipleProtocolInterfaces(\r
+        Private->DeviceHandle,\r
+        &gEfiSimpleNetworkProtocolGuid,\r
+        &Private->Snp,\r
+        &gEfiDevicePathProtocolGuid,\r
+        Private->DevicePath,\r
+        NULL\r
+        );\r
+\r
+  FreePool( Private->InterfaceName );\r
+  FreePool( Private->DevicePath );\r
+  FreePool( Private );\r
+\r
+  return( EFI_SUCCESS );\r
 }\r
 \r
 \r
@@ -889,210 +889,210 @@ UnixSnpDriverBindingStop(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpStart(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This\r
+  )\r
 {\r
-       STATIC struct bpf_insn                          FilterInstructionTemplate[] =\r
-       {\r
-               // Load 4 bytes from the destination MAC address.\r
-               BPF_STMT( BPF_LD + BPF_W + BPF_ABS, OFFSET_OF( EthernetHeader, DstAddr[ 0 ] ) ),\r
-\r
-               // Compare to first 4 bytes of fake MAC address.\r
-               BPF_JUMP( BPF_JMP + BPF_JEQ + BPF_K, 0x12345678, 0, 3 ),\r
-\r
-               // Load remaining 2 bytes from the destination MAC address.\r
-               BPF_STMT( BPF_LD + BPF_H + BPF_ABS, OFFSET_OF( EthernetHeader, DstAddr[ 4 ] ) ),\r
-\r
-               // Compare to remaining 2 bytes of fake MAC address.\r
-               BPF_JUMP( BPF_JMP + BPF_JEQ + BPF_K, 0x9ABC, 5, 0 ),\r
-\r
-               // Load 4 bytes from the destination MAC address.\r
-               BPF_STMT( BPF_LD + BPF_W + BPF_ABS, OFFSET_OF( EthernetHeader, DstAddr[ 0 ] ) ),\r
-\r
-               // Compare to first 4 bytes of broadcast MAC address.\r
-               BPF_JUMP( BPF_JMP + BPF_JEQ + BPF_K, 0xFFFFFFFF, 0, 2 ),\r
-\r
-               // Load remaining 2 bytes from the destination MAC address.\r
-               BPF_STMT( BPF_LD + BPF_H + BPF_ABS, OFFSET_OF( EthernetHeader, DstAddr[ 4 ] ) ),\r
-\r
-               // Compare to remaining 2 bytes of broadcast MAC address.\r
-               BPF_JUMP( BPF_JMP + BPF_JEQ + BPF_K, 0xFFFF, 1, 0 ),\r
-\r
-               // Reject packet.\r
-               BPF_STMT( BPF_RET + BPF_K, 0 ),\r
-\r
-               // Receive entire packet.\r
-               BPF_STMT( BPF_RET + BPF_K, -1 )\r
-       };\r
-       struct ifreq                                            BoundIf;\r
-       struct bpf_program                                      BpfProgram;\r
-       struct bpf_insn*                                        FilterProgram;\r
-       UNIX_SNP_PRIVATE_DATA*                          Private;\r
-       EFI_STATUS                                                      Status;\r
-       UINT32                                                          Temp32;\r
-       INTN                                                            Fd;\r
-       INTN                                                            Result;\r
-       INTN                                                            Value;\r
-       UINT16                                                          Temp16;\r
-\r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
-\r
-       switch ( Private->Snp.Mode->State )\r
-       {\r
-               case EfiSimpleNetworkStopped:\r
-                       break;\r
-\r
-               case EfiSimpleNetworkStarted:\r
-               case EfiSimpleNetworkInitialized:\r
-                       return( EFI_ALREADY_STARTED );\r
-                       break;\r
-\r
-               default:\r
-                       return( EFI_DEVICE_ERROR );\r
-                       break;\r
-       }\r
-\r
-       if ( Private->BpfFd == 0 )\r
-       {\r
-               Status = OpenBpfFileDescriptor( Private, &Fd );\r
-\r
-               if ( EFI_ERROR( Status ) )\r
-               {\r
-                       goto ErrorExit;\r
-               }\r
-\r
-               Private->BpfFd = Fd;\r
-\r
-               //\r
-               // Associate our interface with this BPF file descriptor.\r
-               //\r
-               AsciiStrCpy( BoundIf.ifr_name, Private->InterfaceName );\r
-               Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCSETIF, &BoundIf );\r
-\r
-               if ( Result < 0 )\r
-               {\r
-                       goto DeviceErrorExit;\r
-               }\r
-\r
-               //\r
-               // Enable immediate mode and find out the buffer size.\r
-               //\r
-               Value = 1;\r
-               Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCIMMEDIATE, &Value );\r
-\r
-               if ( Result < 0 )\r
-               {\r
-                       goto DeviceErrorExit;\r
-               }\r
-\r
-               //\r
-               // Enable non-blocking I/O.\r
-               //\r
-\r
-               Value = Private->UnixThunk->Fcntl( Private->BpfFd, F_GETFL, 0 );\r
-\r
-               if ( Value == -1 )\r
-               {\r
-                       goto DeviceErrorExit;\r
-               }\r
-\r
-               Value |= O_NONBLOCK;\r
-\r
-               Result = Private->UnixThunk->Fcntl( Private->BpfFd, F_SETFL, (void *) Value );\r
-\r
-               if ( Result == -1 )\r
-               {\r
-                       goto DeviceErrorExit;\r
-               }\r
-\r
-               //\r
-               // Disable "header complete" flag.  This means the supplied source MAC address is\r
-               // what goes on the wire.\r
-               //\r
-               Value = 1;\r
-               Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCSHDRCMPLT, &Value );\r
-\r
-               if ( Result < 0 )\r
-               {\r
-                       goto DeviceErrorExit;\r
-               }\r
-\r
-               Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCGBLEN, &Value );\r
-\r
-               if ( Result < 0 )\r
-               {\r
-                       goto DeviceErrorExit;\r
-               }\r
-\r
-               //\r
-               // Allocate read buffer.\r
-               //\r
-               Private->ReadBufferSize = Value;\r
-               Private->ReadBuffer = AllocateZeroPool( Private->ReadBufferSize );\r
-               if ( Private->ReadBuffer == NULL )\r
-               {\r
-                       Status = EFI_OUT_OF_RESOURCES;\r
-                       goto ErrorExit;\r
-               }\r
-\r
-               Private->CurrentReadPointer = Private->EndReadPointer = Private->ReadBuffer;\r
-\r
-               //\r
-               // Install our packet filter: successful reads should only produce broadcast or unitcast\r
-               // packets directed to our fake MAC address.\r
-               //\r
-               FilterProgram = AllocateCopyPool( sizeof( FilterInstructionTemplate ), &FilterInstructionTemplate );\r
-               if ( FilterProgram == NULL )\r
-               {\r
-                       goto ErrorExit;\r
-               }\r
-\r
-               //\r
-               // Insert out fake MAC address into the filter.  The data has to be host endian.\r
-               //\r
-               CopyMem( &Temp32, &Private->Mode.CurrentAddress.Addr[ 0 ], sizeof( UINT32 ) );\r
-               FilterProgram[ 1 ].k = NTOHL( Temp32 );\r
-               CopyMem( &Temp16, &Private->Mode.CurrentAddress.Addr[ 4 ], sizeof( UINT16 ) );\r
-               FilterProgram[ 3 ].k = NTOHS( Temp16 );\r
-\r
-               BpfProgram.bf_len = sizeof( FilterInstructionTemplate ) / sizeof( struct bpf_insn );\r
-               BpfProgram.bf_insns = FilterProgram;\r
-\r
-               Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCSETF, &BpfProgram );\r
-\r
-               if ( Result < 0 )\r
-               {\r
-                       goto DeviceErrorExit;\r
-               }\r
-\r
-               FreePool( FilterProgram );\r
-\r
-               //\r
-               // Enable promiscuous mode.\r
-               //\r
-\r
-               Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCPROMISC, 0 );\r
-\r
-               if ( Result < 0 )\r
-               {\r
-                       goto DeviceErrorExit;\r
-               }\r
+  STATIC struct bpf_insn        FilterInstructionTemplate[] =\r
+  {\r
+    // Load 4 bytes from the destination MAC address.\r
+    BPF_STMT( BPF_LD + BPF_W + BPF_ABS, OFFSET_OF( EthernetHeader, DstAddr[ 0 ] ) ),\r
+\r
+    // Compare to first 4 bytes of fake MAC address.\r
+    BPF_JUMP( BPF_JMP + BPF_JEQ + BPF_K, 0x12345678, 0, 3 ),\r
+\r
+    // Load remaining 2 bytes from the destination MAC address.\r
+    BPF_STMT( BPF_LD + BPF_H + BPF_ABS, OFFSET_OF( EthernetHeader, DstAddr[ 4 ] ) ),\r
+\r
+    // Compare to remaining 2 bytes of fake MAC address.\r
+    BPF_JUMP( BPF_JMP + BPF_JEQ + BPF_K, 0x9ABC, 5, 0 ),\r
+\r
+    // Load 4 bytes from the destination MAC address.\r
+    BPF_STMT( BPF_LD + BPF_W + BPF_ABS, OFFSET_OF( EthernetHeader, DstAddr[ 0 ] ) ),\r
+\r
+    // Compare to first 4 bytes of broadcast MAC address.\r
+    BPF_JUMP( BPF_JMP + BPF_JEQ + BPF_K, 0xFFFFFFFF, 0, 2 ),\r
+\r
+    // Load remaining 2 bytes from the destination MAC address.\r
+    BPF_STMT( BPF_LD + BPF_H + BPF_ABS, OFFSET_OF( EthernetHeader, DstAddr[ 4 ] ) ),\r
+\r
+    // Compare to remaining 2 bytes of broadcast MAC address.\r
+    BPF_JUMP( BPF_JMP + BPF_JEQ + BPF_K, 0xFFFF, 1, 0 ),\r
+\r
+    // Reject packet.\r
+    BPF_STMT( BPF_RET + BPF_K, 0 ),\r
+\r
+    // Receive entire packet.\r
+    BPF_STMT( BPF_RET + BPF_K, -1 )\r
+  };\r
+  struct ifreq            BoundIf;\r
+  struct bpf_program          BpfProgram;\r
+  struct bpf_insn*          FilterProgram;\r
+  UNIX_SNP_PRIVATE_DATA*        Private;\r
+  EFI_STATUS              Status;\r
+  UINT32                Temp32;\r
+  INTN                Fd;\r
+  INTN                Result;\r
+  INTN                Value;\r
+  UINT16                Temp16;\r
+\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
+\r
+  switch ( Private->Snp.Mode->State )\r
+  {\r
+    case EfiSimpleNetworkStopped:\r
+      break;\r
+\r
+    case EfiSimpleNetworkStarted:\r
+    case EfiSimpleNetworkInitialized:\r
+      return( EFI_ALREADY_STARTED );\r
+      break;\r
+\r
+    default:\r
+      return( EFI_DEVICE_ERROR );\r
+      break;\r
+  }\r
+\r
+  if ( Private->BpfFd == 0 )\r
+  {\r
+    Status = OpenBpfFileDescriptor( Private, &Fd );\r
+\r
+    if ( EFI_ERROR( Status ) )\r
+    {\r
+      goto ErrorExit;\r
+    }\r
+\r
+    Private->BpfFd = Fd;\r
+\r
+    //\r
+    // Associate our interface with this BPF file descriptor.\r
+    //\r
+    AsciiStrCpy( BoundIf.ifr_name, Private->InterfaceName );\r
+    Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCSETIF, &BoundIf );\r
+\r
+    if ( Result < 0 )\r
+    {\r
+      goto DeviceErrorExit;\r
+    }\r
+\r
+    //\r
+    // Enable immediate mode and find out the buffer size.\r
+    //\r
+    Value = 1;\r
+    Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCIMMEDIATE, &Value );\r
+\r
+    if ( Result < 0 )\r
+    {\r
+      goto DeviceErrorExit;\r
+    }\r
+\r
+    //\r
+    // Enable non-blocking I/O.\r
+    //\r
+\r
+    Value = Private->UnixThunk->Fcntl( Private->BpfFd, F_GETFL, 0 );\r
+\r
+    if ( Value == -1 )\r
+    {\r
+      goto DeviceErrorExit;\r
+    }\r
+\r
+    Value |= O_NONBLOCK;\r
+\r
+    Result = Private->UnixThunk->Fcntl( Private->BpfFd, F_SETFL, (void *) Value );\r
+\r
+    if ( Result == -1 )\r
+    {\r
+      goto DeviceErrorExit;\r
+    }\r
+\r
+    //\r
+    // Disable "header complete" flag.  This means the supplied source MAC address is\r
+    // what goes on the wire.\r
+    //\r
+    Value = 1;\r
+    Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCSHDRCMPLT, &Value );\r
+\r
+    if ( Result < 0 )\r
+    {\r
+      goto DeviceErrorExit;\r
+    }\r
+\r
+    Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCGBLEN, &Value );\r
+\r
+    if ( Result < 0 )\r
+    {\r
+      goto DeviceErrorExit;\r
+    }\r
+\r
+    //\r
+    // Allocate read buffer.\r
+    //\r
+    Private->ReadBufferSize = Value;\r
+    Private->ReadBuffer = AllocateZeroPool( Private->ReadBufferSize );\r
+    if ( Private->ReadBuffer == NULL )\r
+    {\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+      goto ErrorExit;\r
+    }\r
+\r
+    Private->CurrentReadPointer = Private->EndReadPointer = Private->ReadBuffer;\r
+\r
+    //\r
+    // Install our packet filter: successful reads should only produce broadcast or unitcast\r
+    // packets directed to our fake MAC address.\r
+    //\r
+    FilterProgram = AllocateCopyPool( sizeof( FilterInstructionTemplate ), &FilterInstructionTemplate );\r
+    if ( FilterProgram == NULL )\r
+    {\r
+      goto ErrorExit;\r
+    }\r
+\r
+    //\r
+    // Insert out fake MAC address into the filter.  The data has to be host endian.\r
+    //\r
+    CopyMem( &Temp32, &Private->Mode.CurrentAddress.Addr[ 0 ], sizeof( UINT32 ) );\r
+    FilterProgram[ 1 ].k = NTOHL( Temp32 );\r
+    CopyMem( &Temp16, &Private->Mode.CurrentAddress.Addr[ 4 ], sizeof( UINT16 ) );\r
+    FilterProgram[ 3 ].k = NTOHS( Temp16 );\r
+\r
+    BpfProgram.bf_len = sizeof( FilterInstructionTemplate ) / sizeof( struct bpf_insn );\r
+    BpfProgram.bf_insns = FilterProgram;\r
+\r
+    Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCSETF, &BpfProgram );\r
+\r
+    if ( Result < 0 )\r
+    {\r
+      goto DeviceErrorExit;\r
+    }\r
+\r
+    FreePool( FilterProgram );\r
+\r
+    //\r
+    // Enable promiscuous mode.\r
+    //\r
+\r
+    Result = Private->UnixThunk->IoCtl( Private->BpfFd, BIOCPROMISC, 0 );\r
+\r
+    if ( Result < 0 )\r
+    {\r
+      goto DeviceErrorExit;\r
+    }\r
 \r
 \r
-               Private->Snp.Mode->State = EfiSimpleNetworkStarted;                     \r
-       }\r
+    Private->Snp.Mode->State = EfiSimpleNetworkStarted;      \r
+  }\r
 \r
-       return( Status );\r
+  return( Status );\r
 \r
 DeviceErrorExit:\r
-       Status = EFI_DEVICE_ERROR;\r
+  Status = EFI_DEVICE_ERROR;\r
 ErrorExit:\r
-       if ( Private->ReadBuffer != NULL )\r
-       {\r
-               FreePool( Private->ReadBuffer );\r
-               Private->ReadBuffer = NULL;\r
-       }\r
-       return( Status );\r
+  if ( Private->ReadBuffer != NULL )\r
+  {\r
+    FreePool( Private->ReadBuffer );\r
+    Private->ReadBuffer = NULL;\r
+  }\r
+  return( Status );\r
 }\r
 \r
 \r
@@ -1107,43 +1107,43 @@ ErrorExit:
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpStop(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private = EFI_SUCCESS;\r
-       EFI_STATUS                                                      Status;\r
+  UNIX_SNP_PRIVATE_DATA*        Private = EFI_SUCCESS;\r
+  EFI_STATUS              Status;\r
 \r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
 \r
-       switch ( Private->Snp.Mode->State )\r
-       {\r
-               case EfiSimpleNetworkStarted:\r
-                       break;\r
+  switch ( Private->Snp.Mode->State )\r
+  {\r
+    case EfiSimpleNetworkStarted:\r
+      break;\r
 \r
-               case EfiSimpleNetworkStopped:\r
-                       return( EFI_NOT_STARTED );\r
-                       break;\r
+    case EfiSimpleNetworkStopped:\r
+      return( EFI_NOT_STARTED );\r
+      break;\r
 \r
-               default:\r
-                       return( EFI_DEVICE_ERROR );\r
-                       break;\r
-       }\r
+    default:\r
+      return( EFI_DEVICE_ERROR );\r
+      break;\r
+  }\r
 \r
-       if ( Private->BpfFd != 0 )\r
-       {\r
-               Private->UnixThunk->Close( Private->BpfFd );\r
-               Private->BpfFd = 0;\r
-       }\r
+  if ( Private->BpfFd != 0 )\r
+  {\r
+    Private->UnixThunk->Close( Private->BpfFd );\r
+    Private->BpfFd = 0;\r
+  }\r
 \r
-       if ( Private->ReadBuffer != NULL )\r
-       {\r
-               FreePool( Private->ReadBuffer );\r
-               Private->CurrentReadPointer = Private->EndReadPointer = Private->ReadBuffer = NULL;\r
-       }\r
+  if ( Private->ReadBuffer != NULL )\r
+  {\r
+    FreePool( Private->ReadBuffer );\r
+    Private->CurrentReadPointer = Private->EndReadPointer = Private->ReadBuffer = NULL;\r
+  }\r
 \r
-       Private->Snp.Mode->State = EfiSimpleNetworkStopped;\r
+  Private->Snp.Mode->State = EfiSimpleNetworkStopped;\r
 \r
-       return( Status );\r
+  return( Status );\r
 }\r
 \r
 \r
@@ -1170,50 +1170,50 @@ UnixSnpStop(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpInitialize(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN UINTN                                                        ExtraRxBufferSize OPTIONAL,\r
-       IN UINTN                                                        ExtraTxBufferSize OPTIONAL\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN UINTN              ExtraRxBufferSize OPTIONAL,\r
+  IN UINTN              ExtraTxBufferSize OPTIONAL\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private = EFI_SUCCESS;\r
-       EFI_STATUS                                                      Status;\r
+  UNIX_SNP_PRIVATE_DATA*        Private = EFI_SUCCESS;\r
+  EFI_STATUS              Status;\r
 \r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
 \r
-       switch ( Private->Snp.Mode->State )\r
-       {\r
-               case EfiSimpleNetworkStarted:\r
-                       break;\r
+  switch ( Private->Snp.Mode->State )\r
+  {\r
+    case EfiSimpleNetworkStarted:\r
+      break;\r
 \r
-               case EfiSimpleNetworkStopped:\r
-                       return( EFI_NOT_STARTED );\r
-                       break;\r
+    case EfiSimpleNetworkStopped:\r
+      return( EFI_NOT_STARTED );\r
+      break;\r
 \r
-               default:\r
-                       return( EFI_DEVICE_ERROR );\r
-                       break;\r
-       }\r
+    default:\r
+      return( EFI_DEVICE_ERROR );\r
+      break;\r
+  }\r
 \r
 #if 0\r
-       Status = gBS->CreateEvent(\r
-                                       EVT_NOTIFY_WAIT,\r
-                                       TPL_NOTIFY,\r
-                                       UnixSnpWaitForPacketNotify,\r
-                                       Private,\r
-                                       &Private->Snp.WaitForPacket\r
-                                       );\r
+  Status = gBS->CreateEvent(\r
+          EVT_NOTIFY_WAIT,\r
+          TPL_NOTIFY,\r
+          UnixSnpWaitForPacketNotify,\r
+          Private,\r
+          &Private->Snp.WaitForPacket\r
+          );\r
 #endif\r
 \r
-       if ( !EFI_ERROR( Status ) )\r
-       {\r
-               Private->Mode.MCastFilterCount = 0;\r
-               Private->Mode.ReceiveFilterSetting = 0;\r
-               ZeroMem( Private->Mode.MCastFilter, sizeof( Private->Mode.MCastFilter ) );\r
+  if ( !EFI_ERROR( Status ) )\r
+  {\r
+    Private->Mode.MCastFilterCount = 0;\r
+    Private->Mode.ReceiveFilterSetting = 0;\r
+    ZeroMem( Private->Mode.MCastFilter, sizeof( Private->Mode.MCastFilter ) );\r
 \r
-               Private->Snp.Mode->State = EfiSimpleNetworkInitialized;\r
-       }\r
+    Private->Snp.Mode->State = EfiSimpleNetworkInitialized;\r
+  }\r
 \r
-       return( Status );\r
+  return( Status );\r
 }\r
 \r
 /**\r
@@ -1231,30 +1231,30 @@ UnixSnpInitialize(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpReset(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      ExtendedVerification\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              ExtendedVerification\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private;\r
-       EFI_STATUS                                                      Success = EFI_SUCCESS;\r
+  UNIX_SNP_PRIVATE_DATA*        Private;\r
+  EFI_STATUS              Success = EFI_SUCCESS;\r
 \r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
 \r
-       switch ( Private->Snp.Mode->State )\r
-       {\r
-               case EfiSimpleNetworkInitialized:\r
-                       break;\r
+  switch ( Private->Snp.Mode->State )\r
+  {\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
 \r
-               case EfiSimpleNetworkStopped:\r
-                       return( EFI_NOT_STARTED );\r
-                       break;\r
+    case EfiSimpleNetworkStopped:\r
+      return( EFI_NOT_STARTED );\r
+      break;\r
 \r
-               default:\r
-                       return( EFI_DEVICE_ERROR );\r
-                       break;\r
-       }\r
+    default:\r
+      return( EFI_DEVICE_ERROR );\r
+      break;\r
+  }\r
 \r
-       return( Success );\r
+  return( Success );\r
 }\r
 \r
 /**\r
@@ -1269,53 +1269,53 @@ UnixSnpReset(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpShutdown(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private;\r
-       EFI_STATUS                                                      Success = EFI_SUCCESS;\r
-\r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
-\r
-       switch ( Private->Snp.Mode->State )\r
-       {\r
-               case EfiSimpleNetworkInitialized:\r
-                       break;\r
-\r
-               case EfiSimpleNetworkStopped:\r
-                       return( EFI_NOT_STARTED );\r
-                       break;\r
-\r
-               default:\r
-                       return( EFI_DEVICE_ERROR );\r
-                       break;\r
-       }\r
-\r
-       Private->Snp.Mode->State = EfiSimpleNetworkStarted;\r
-\r
-       Private->Mode.ReceiveFilterSetting = 0;\r
-       Private->Mode.MCastFilterCount = 0;\r
-       ZeroMem( Private->Mode.MCastFilter, sizeof( Private->Mode.MCastFilter ) );\r
-\r
-       if ( Private->Snp.WaitForPacket != NULL )\r
-       {\r
-               gBS->CloseEvent( Private->Snp.WaitForPacket );\r
-               Private->Snp.WaitForPacket = NULL;\r
-       }\r
-\r
-       if ( Private->BpfFd != 0 )\r
-       {\r
-               Private->UnixThunk->Close( Private->BpfFd );\r
-               Private->BpfFd = 0;\r
-       }\r
-\r
-       if ( Private->ReadBuffer != NULL )\r
-       {\r
-               FreePool( Private->ReadBuffer );\r
-               Private->CurrentReadPointer = Private->EndReadPointer = Private->ReadBuffer = NULL;\r
-       }\r
-\r
-       return( Success );\r
+  UNIX_SNP_PRIVATE_DATA*        Private;\r
+  EFI_STATUS              Success = EFI_SUCCESS;\r
+\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
+\r
+  switch ( Private->Snp.Mode->State )\r
+  {\r
+    case EfiSimpleNetworkInitialized:\r
+      break;\r
+\r
+    case EfiSimpleNetworkStopped:\r
+      return( EFI_NOT_STARTED );\r
+      break;\r
+\r
+    default:\r
+      return( EFI_DEVICE_ERROR );\r
+      break;\r
+  }\r
+\r
+  Private->Snp.Mode->State = EfiSimpleNetworkStarted;\r
+\r
+  Private->Mode.ReceiveFilterSetting = 0;\r
+  Private->Mode.MCastFilterCount = 0;\r
+  ZeroMem( Private->Mode.MCastFilter, sizeof( Private->Mode.MCastFilter ) );\r
+\r
+  if ( Private->Snp.WaitForPacket != NULL )\r
+  {\r
+    gBS->CloseEvent( Private->Snp.WaitForPacket );\r
+    Private->Snp.WaitForPacket = NULL;\r
+  }\r
+\r
+  if ( Private->BpfFd != 0 )\r
+  {\r
+    Private->UnixThunk->Close( Private->BpfFd );\r
+    Private->BpfFd = 0;\r
+  }\r
+\r
+  if ( Private->ReadBuffer != NULL )\r
+  {\r
+    FreePool( Private->ReadBuffer );\r
+    Private->CurrentReadPointer = Private->EndReadPointer = Private->ReadBuffer = NULL;\r
+  }\r
+\r
+  return( Success );\r
 }\r
 \r
 /**\r
@@ -1342,17 +1342,17 @@ UnixSnpShutdown(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpReceiveFilters(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN UINT32                                                       EnableBits,\r
-       IN UINT32                                                       DisableBits,\r
-       IN BOOLEAN                                                      ResetMcastFilter,\r
-       IN UINTN                                                        McastFilterCount OPTIONAL,\r
-       IN EFI_MAC_ADDRESS*                                     McastFilter OPTIONAL\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN UINT32              EnableBits,\r
+  IN UINT32              DisableBits,\r
+  IN BOOLEAN              ResetMcastFilter,\r
+  IN UINTN              McastFilterCount OPTIONAL,\r
+  IN EFI_MAC_ADDRESS*          McastFilter OPTIONAL\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private;\r
+  UNIX_SNP_PRIVATE_DATA*        Private;\r
 \r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
 \r
 //  ReturnValue = GlobalData->NtNetUtilityTable.SetReceiveFilter (\r
 //                                                Instance->InterfaceInfo.InterfaceIndex,\r
@@ -1361,8 +1361,8 @@ UnixSnpReceiveFilters(
 //                                                McastFilter\r
 //                                                );\r
 \r
-       // For now, just succeed...\r
-       return( EFI_SUCCESS );\r
+  // For now, just succeed...\r
+  return( EFI_SUCCESS );\r
 }\r
 \r
 /**\r
@@ -1379,12 +1379,12 @@ UnixSnpReceiveFilters(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpStationAddress(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      Reset,\r
-       IN EFI_MAC_ADDRESS*                                     NewMacAddr OPTIONAL\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              Reset,\r
+  IN EFI_MAC_ADDRESS*          NewMacAddr OPTIONAL\r
+  )\r
 {\r
-       return( EFI_UNSUPPORTED );\r
+  return( EFI_UNSUPPORTED );\r
 }\r
 \r
 /**\r
@@ -1409,13 +1409,13 @@ UnixSnpStationAddress(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpStatistics(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      Reset,\r
-       IN OUT UINTN*                                           StatisticsSize OPTIONAL,\r
-       OUT EFI_NETWORK_STATISTICS*                     StatisticsTable OPTIONAL\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              Reset,\r
+  IN OUT UINTN*            StatisticsSize OPTIONAL,\r
+  OUT EFI_NETWORK_STATISTICS*      StatisticsTable OPTIONAL\r
+  )\r
 {\r
-       return( EFI_UNSUPPORTED );\r
+  return( EFI_UNSUPPORTED );\r
 }\r
 \r
 /**\r
@@ -1440,13 +1440,13 @@ UnixSnpStatistics(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpMcastIptoMac(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      Ipv6,\r
-       IN EFI_IP_ADDRESS*                                      Ip,\r
-       OUT EFI_MAC_ADDRESS*                            Mac\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              Ipv6,\r
+  IN EFI_IP_ADDRESS*          Ip,\r
+  OUT EFI_MAC_ADDRESS*        Mac\r
+  )\r
 {\r
-       return( EFI_UNSUPPORTED );\r
+  return( EFI_UNSUPPORTED );\r
 }\r
 \r
 \r
@@ -1469,14 +1469,14 @@ UnixSnpMcastIptoMac(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpNvdata(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN BOOLEAN                                                      ReadOrWrite,\r
-       IN UINTN                                                        Offset,\r
-       IN UINTN                                                        BufferSize,\r
-       IN OUT VOID*                                            Buffer\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN BOOLEAN              ReadOrWrite,\r
+  IN UINTN              Offset,\r
+  IN UINTN              BufferSize,\r
+  IN OUT VOID*            Buffer\r
+  )\r
 {\r
-       return( EFI_UNSUPPORTED );\r
+  return( EFI_UNSUPPORTED );\r
 }\r
 \r
 \r
@@ -1504,22 +1504,22 @@ UnixSnpNvdata(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpGetStatus(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       OUT UINT32*                                                     InterruptStatus,\r
-       OUT VOID**                                                      TxBuffer\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  OUT UINT32*              InterruptStatus,\r
+  OUT VOID**              TxBuffer\r
+  )\r
 {\r
-       if ( TxBuffer != NULL )\r
-       {\r
-               *( ( UINT8 ** ) TxBuffer ) = ( UINT8 * ) 1;\r
-       }\r
+  if ( TxBuffer != NULL )\r
+  {\r
+    *( ( UINT8 ** ) TxBuffer ) = ( UINT8 * ) 1;\r
+  }\r
 \r
-       if ( InterruptStatus != NULL )\r
-       {\r
-               *InterruptStatus = EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT;\r
-       }\r
+  if ( InterruptStatus != NULL )\r
+  {\r
+    *InterruptStatus = EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT;\r
+  }\r
 \r
-       return( EFI_SUCCESS );\r
+  return( EFI_SUCCESS );\r
 }\r
 \r
 \r
@@ -1556,56 +1556,56 @@ UnixSnpGetStatus(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpTransmit(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       IN UINTN                                                        HeaderSize,\r
-       IN UINTN                                                        BufferSize,\r
-       IN VOID*                                                        Buffer,\r
-       IN EFI_MAC_ADDRESS*                                     SrcAddr OPTIONAL,\r
-       IN EFI_MAC_ADDRESS*                                     DestAddr OPTIONAL,\r
-       IN UINT16*                                                      Protocol OPTIONAL\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  IN UINTN              HeaderSize,\r
+  IN UINTN              BufferSize,\r
+  IN VOID*              Buffer,\r
+  IN EFI_MAC_ADDRESS*          SrcAddr OPTIONAL,\r
+  IN EFI_MAC_ADDRESS*          DestAddr OPTIONAL,\r
+  IN UINT16*              Protocol OPTIONAL\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private;\r
-       EthernetHeader*                                         EnetHeader;\r
-       INTN                                                            Result;\r
-\r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
-\r
-       if ( This->Mode->State < EfiSimpleNetworkStarted )\r
-       {\r
-               return( EFI_NOT_STARTED );\r
-       }\r
-\r
-       if ( HeaderSize != 0 )\r
-       {\r
-               if ( ( DestAddr == NULL ) || ( Protocol == NULL ) || ( HeaderSize != This->Mode->MediaHeaderSize ) )\r
-               {\r
-                       return( EFI_INVALID_PARAMETER );\r
-               }\r
-\r
-               if ( SrcAddr == NULL )\r
-               {\r
-                       SrcAddr = &This->Mode->CurrentAddress;\r
-               }\r
-\r
-               EnetHeader = ( EthernetHeader * ) Buffer;\r
-\r
-               CopyMem( EnetHeader->DstAddr, DestAddr, NET_ETHER_ADDR_LEN );\r
-               CopyMem( EnetHeader->SrcAddr, SrcAddr, NET_ETHER_ADDR_LEN );\r
-\r
-               EnetHeader->Type = HTONS( *Protocol );\r
-       }\r
-\r
-       Result = Private->UnixThunk->Write( Private->BpfFd, Buffer, BufferSize );\r
-\r
-       if ( Result < 0 )\r
-       {\r
-               return( EFI_DEVICE_ERROR );\r
-       }\r
-       else\r
-       {\r
-               return( EFI_SUCCESS );\r
-       }\r
+  UNIX_SNP_PRIVATE_DATA*        Private;\r
+  EthernetHeader*            EnetHeader;\r
+  INTN                Result;\r
+\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
+\r
+  if ( This->Mode->State < EfiSimpleNetworkStarted )\r
+  {\r
+    return( EFI_NOT_STARTED );\r
+  }\r
+\r
+  if ( HeaderSize != 0 )\r
+  {\r
+    if ( ( DestAddr == NULL ) || ( Protocol == NULL ) || ( HeaderSize != This->Mode->MediaHeaderSize ) )\r
+    {\r
+      return( EFI_INVALID_PARAMETER );\r
+    }\r
+\r
+    if ( SrcAddr == NULL )\r
+    {\r
+      SrcAddr = &This->Mode->CurrentAddress;\r
+    }\r
+\r
+    EnetHeader = ( EthernetHeader * ) Buffer;\r
+\r
+    CopyMem( EnetHeader->DstAddr, DestAddr, NET_ETHER_ADDR_LEN );\r
+    CopyMem( EnetHeader->SrcAddr, SrcAddr, NET_ETHER_ADDR_LEN );\r
+\r
+    EnetHeader->Type = HTONS( *Protocol );\r
+  }\r
+\r
+  Result = Private->UnixThunk->Write( Private->BpfFd, Buffer, BufferSize );\r
+\r
+  if ( Result < 0 )\r
+  {\r
+    return( EFI_DEVICE_ERROR );\r
+  }\r
+  else\r
+  {\r
+    return( EFI_SUCCESS );\r
+  }\r
 }\r
 \r
 /**\r
@@ -1641,116 +1641,116 @@ UnixSnpTransmit(
 EFI_STATUS\r
 EFIAPI\r
 UnixSnpReceive(\r
-       IN EFI_SIMPLE_NETWORK_PROTOCOL*         This,\r
-       OUT UINTN*                                                      HeaderSize OPTIONAL,\r
-       IN OUT UINTN*                                           BuffSize,\r
-       OUT VOID*                                                       Buffer,\r
-       OUT EFI_MAC_ADDRESS*                            SourceAddr OPTIONAL,\r
-       OUT EFI_MAC_ADDRESS*                            DestinationAddr OPTIONAL,\r
-       OUT UINT16*                                                     Protocol OPTIONAL\r
-       )\r
+  IN EFI_SIMPLE_NETWORK_PROTOCOL*    This,\r
+  OUT UINTN*              HeaderSize OPTIONAL,\r
+  IN OUT UINTN*            BuffSize,\r
+  OUT VOID*              Buffer,\r
+  OUT EFI_MAC_ADDRESS*        SourceAddr OPTIONAL,\r
+  OUT EFI_MAC_ADDRESS*        DestinationAddr OPTIONAL,\r
+  OUT UINT16*              Protocol OPTIONAL\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private;\r
-       struct bpf_hdr*                                         BpfHeader;\r
-       EthernetHeader*                                         EnetHeader;\r
-       EFI_STATUS                                                      Status = EFI_SUCCESS;\r
-       INTN                                                            Result;\r
-\r
-       if ( This->Mode->State < EfiSimpleNetworkStarted )\r
-       {\r
-               return( EFI_NOT_STARTED );\r
-       }\r
-\r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
-\r
-       //\r
-       // Do we have any remaining packets from the previous read?\r
-       //\r
-       if ( Private->CurrentReadPointer >= Private->EndReadPointer )\r
-       {\r
-               Result = Private->UnixThunk->Read( Private->BpfFd, Private->ReadBuffer, Private->ReadBufferSize );\r
-\r
-               if ( Result < 0 )\r
-               {\r
-                       Result = Private->UnixThunk->GetErrno();\r
-\r
-                       //\r
-                       // EAGAIN means that there's no I/O outstanding against this file descriptor.\r
-                       //\r
-                       if ( Result == EAGAIN )\r
-                       {\r
-                               return( EFI_NOT_READY );\r
-                       }\r
-                       else\r
-                       {\r
-                               return( EFI_DEVICE_ERROR );\r
-                       }\r
-               }\r
-\r
-               if ( Result == 0 )\r
-               {\r
-                       return( EFI_NOT_READY );\r
-               }\r
-\r
-               Private->CurrentReadPointer = Private->ReadBuffer;\r
-               Private->EndReadPointer = Private->CurrentReadPointer + Result;\r
-       }\r
-\r
-       BpfHeader = Private->CurrentReadPointer;\r
-       EnetHeader = Private->CurrentReadPointer + BpfHeader->bh_hdrlen;\r
-\r
-       if ( BpfHeader->bh_caplen > *BuffSize )\r
-       {\r
-               *BuffSize = BpfHeader->bh_caplen;\r
-               return( EFI_BUFFER_TOO_SMALL );\r
-       }\r
-\r
-       CopyMem( Buffer, EnetHeader, BpfHeader->bh_caplen );\r
-       *BuffSize = BpfHeader->bh_caplen;\r
-\r
-       if ( HeaderSize != NULL )\r
-       {\r
-               *HeaderSize = sizeof( EthernetHeader );\r
-       }\r
-\r
-       if ( DestinationAddr != NULL )\r
-       {\r
-               ZeroMem( DestinationAddr, sizeof( EFI_MAC_ADDRESS ) );\r
-               CopyMem( DestinationAddr, EnetHeader->DstAddr, NET_ETHER_ADDR_LEN );\r
-       }\r
-\r
-       if ( SourceAddr != NULL )\r
-       {\r
-               ZeroMem( SourceAddr, sizeof( EFI_MAC_ADDRESS ) );\r
-               CopyMem( SourceAddr, EnetHeader->SrcAddr, NET_ETHER_ADDR_LEN );\r
-       }\r
-\r
-       if ( Protocol != NULL )\r
-       {\r
-               *Protocol = NTOHS( EnetHeader->Type );\r
-       }\r
-\r
-       Private->CurrentReadPointer += BPF_WORDALIGN( BpfHeader->bh_hdrlen + BpfHeader->bh_caplen );\r
-\r
-       return( Status );\r
+  UNIX_SNP_PRIVATE_DATA*        Private;\r
+  struct bpf_hdr*            BpfHeader;\r
+  EthernetHeader*            EnetHeader;\r
+  EFI_STATUS              Status = EFI_SUCCESS;\r
+  INTN                Result;\r
+\r
+  if ( This->Mode->State < EfiSimpleNetworkStarted )\r
+  {\r
+    return( EFI_NOT_STARTED );\r
+  }\r
+\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( This );\r
+\r
+  //\r
+  // Do we have any remaining packets from the previous read?\r
+  //\r
+  if ( Private->CurrentReadPointer >= Private->EndReadPointer )\r
+  {\r
+    Result = Private->UnixThunk->Read( Private->BpfFd, Private->ReadBuffer, Private->ReadBufferSize );\r
+\r
+    if ( Result < 0 )\r
+    {\r
+      Result = Private->UnixThunk->GetErrno();\r
+\r
+      //\r
+      // EAGAIN means that there's no I/O outstanding against this file descriptor.\r
+      //\r
+      if ( Result == EAGAIN )\r
+      {\r
+        return( EFI_NOT_READY );\r
+      }\r
+      else\r
+      {\r
+        return( EFI_DEVICE_ERROR );\r
+      }\r
+    }\r
+\r
+    if ( Result == 0 )\r
+    {\r
+      return( EFI_NOT_READY );\r
+    }\r
+\r
+    Private->CurrentReadPointer = Private->ReadBuffer;\r
+    Private->EndReadPointer = Private->CurrentReadPointer + Result;\r
+  }\r
+\r
+  BpfHeader = Private->CurrentReadPointer;\r
+  EnetHeader = Private->CurrentReadPointer + BpfHeader->bh_hdrlen;\r
+\r
+  if ( BpfHeader->bh_caplen > *BuffSize )\r
+  {\r
+    *BuffSize = BpfHeader->bh_caplen;\r
+    return( EFI_BUFFER_TOO_SMALL );\r
+  }\r
+\r
+  CopyMem( Buffer, EnetHeader, BpfHeader->bh_caplen );\r
+  *BuffSize = BpfHeader->bh_caplen;\r
+\r
+  if ( HeaderSize != NULL )\r
+  {\r
+    *HeaderSize = sizeof( EthernetHeader );\r
+  }\r
+\r
+  if ( DestinationAddr != NULL )\r
+  {\r
+    ZeroMem( DestinationAddr, sizeof( EFI_MAC_ADDRESS ) );\r
+    CopyMem( DestinationAddr, EnetHeader->DstAddr, NET_ETHER_ADDR_LEN );\r
+  }\r
+\r
+  if ( SourceAddr != NULL )\r
+  {\r
+    ZeroMem( SourceAddr, sizeof( EFI_MAC_ADDRESS ) );\r
+    CopyMem( SourceAddr, EnetHeader->SrcAddr, NET_ETHER_ADDR_LEN );\r
+  }\r
+\r
+  if ( Protocol != NULL )\r
+  {\r
+    *Protocol = NTOHS( EnetHeader->Type );\r
+  }\r
+\r
+  Private->CurrentReadPointer += BPF_WORDALIGN( BpfHeader->bh_hdrlen + BpfHeader->bh_caplen );\r
+\r
+  return( Status );\r
 }\r
 \r
 \r
 VOID\r
 EFIAPI\r
 UnixSnpWaitForPacketNotify(\r
-       IN EFI_EVENT                                            Event,\r
-       IN VOID*                                                        Context\r
-       )\r
+  IN EFI_EVENT            Event,\r
+  IN VOID*              Context\r
+  )\r
 {\r
-       UNIX_SNP_PRIVATE_DATA*                          Private;\r
+  UNIX_SNP_PRIVATE_DATA*        Private;\r
 \r
-       Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( Context );\r
+  Private = UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS( Context );\r
 \r
-       if ( Private->Snp.Mode->State < EfiSimpleNetworkStarted )\r
-       {\r
-               return;\r
-       }\r
+  if ( Private->Snp.Mode->State < EfiSimpleNetworkStarted )\r
+  {\r
+    return;\r
+  }\r
 }\r
 \r
 \r
@@ -1768,24 +1768,24 @@ UnixSnpWaitForPacketNotify(
 **/\r
 EFI_STATUS\r
 InitializeUnixSnpDriver(\r
-       IN EFI_HANDLE                           ImageHandle,\r
-       IN EFI_SYSTEM_TABLE*            SystemTable\r
-       )\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE*    SystemTable\r
+  )\r
 {\r
-       EFI_STATUS                                              Status;\r
-\r
-       //\r
-       // Install the Driver Protocols\r
-       //\r
-\r
-       Status = EfiLibInstallDriverBindingComponentName2(\r
-                                       ImageHandle,\r
-                                       SystemTable,\r
-                                       &gUnixSnpDriverBinding,\r
-                                       ImageHandle,\r
-                                       &gUnixSnpDriverComponentName,\r
-                                       &gUnixSnpDriverComponentName2\r
-                                       );\r
-\r
-       return( Status );\r
+  EFI_STATUS            Status;\r
+\r
+  //\r
+  // Install the Driver Protocols\r
+  //\r
+\r
+  Status = EfiLibInstallDriverBindingComponentName2(\r
+          ImageHandle,\r
+          SystemTable,\r
+          &gUnixSnpDriverBinding,\r
+          ImageHandle,\r
+          &gUnixSnpDriverComponentName,\r
+          &gUnixSnpDriverComponentName2\r
+          );\r
+\r
+  return( Status );\r
 }\r
index 9f0a34a28d1470b1e983d8cc878f2d8ff95875f4..532119afa46d72ba878419c5693a7ea601e39f76 100644 (file)
@@ -46,33 +46,33 @@ Abstract:
 \r
 typedef struct\r
 {\r
-       UINT32                                                          Signature;\r
+  UINT32                Signature;\r
 \r
-       EFI_UNIX_THUNK_PROTOCOL*                        UnixThunk;\r
+  EFI_UNIX_THUNK_PROTOCOL*      UnixThunk;\r
 \r
-       EFI_HANDLE                                                      DeviceHandle;\r
-       EFI_DEVICE_PATH_PROTOCOL*                       DevicePath;\r
+  EFI_HANDLE              DeviceHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL*      DevicePath;\r
 \r
-       EFI_MAC_ADDRESS                                         MacAddress;\r
+  EFI_MAC_ADDRESS            MacAddress;\r
 \r
-       CHAR8*                                                          InterfaceName;\r
-       INTN                                                            ReadBufferSize;\r
-       VOID*                                                           ReadBuffer;\r
-       //\r
-       // Two walking pointers to manage the multiple packets that can be returned\r
-       // in a single read.\r
-       //\r
-       VOID*                                                           CurrentReadPointer;\r
-       VOID*                                                           EndReadPointer;\r
+  CHAR8*                InterfaceName;\r
+  INTN                ReadBufferSize;\r
+  VOID*                ReadBuffer;\r
+  //\r
+  // Two walking pointers to manage the multiple packets that can be returned\r
+  // in a single read.\r
+  //\r
+  VOID*                CurrentReadPointer;\r
+  VOID*                EndReadPointer;\r
 \r
-       INTN                                                            BpfFd;\r
+  INTN                BpfFd;\r
 \r
-       EFI_SIMPLE_NETWORK_PROTOCOL                     Snp;\r
-       EFI_SIMPLE_NETWORK_MODE                         Mode;\r
+  EFI_SIMPLE_NETWORK_PROTOCOL      Snp;\r
+  EFI_SIMPLE_NETWORK_MODE        Mode;\r
 } UNIX_SNP_PRIVATE_DATA;\r
 \r
 #define UNIX_SNP_PRIVATE_DATA_FROM_SNP_THIS(a) \\r
-                       CR( a, UNIX_SNP_PRIVATE_DATA, Snp, UNIX_SNP_PRIVATE_DATA_SIGNATURE )\r
+      CR( a, UNIX_SNP_PRIVATE_DATA, Snp, UNIX_SNP_PRIVATE_DATA_SIGNATURE )\r
 \r
 extern EFI_DRIVER_BINDING_PROTOCOL    gUnixSnpDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL    gUnixSnpDriverComponentName;\r
@@ -153,4 +153,4 @@ UnixSnpDriverBindingStop (
   IN  EFI_HANDLE                   *ChildHandleBuffer\r
   );\r
 \r
-#endif // _UNIX_SNP_H_\r
+#endif  // _UNIX_SNP_H_\r