[APPLETV][FREELDR] Misc code cleanup

Author: DistroHopper39B

boot/freeldr/freeldr/arch/i386/appletv/appletvhw.c

@@ -24,11 +24,12 @@ extern UCHAR PcBiosDiskCount; /* hwdisk.c */
 extern UINT32 FreeldrDescCount; /* appletvmem.c */
 extern BIOS_MEMORY_MAP BiosMap[MAX_BIOS_DESCRIPTORS]; /* appletvmem.c */
 
-extern USHORT WinLdrDetectVersion(VOID);
-
 BOOLEAN AcpiPresent = FALSE;
 
-EFI_SYSTEM_TABLE *GlobalSystemTable;
+static unsigned int delay_count = 1;
+
+PCHAR GetHarddiskIdentifier(UCHAR DriveNumber); /* hwdisk.c */
+USHORT WinLdrDetectVersion(VOID); /* winldr.c */
 
 /* Maximum number of COM and LPT ports */
 #define MAX_COM_PORTS   4
@@ -94,11 +95,6 @@ EFI_SYSTEM_TABLE *GlobalSystemTable;
 #define HZ (100)
 #define LATCH (CLOCK_TICK_RATE / HZ)
 
-static unsigned int delay_count = 1;
-
-PCHAR
-GetHarddiskIdentifier(UCHAR DriveNumber); /* hwdisk.c */
-
 #define SMBIOS_TABLE_GUID \
   { \
     0xeb9d2d31, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
@@ -165,6 +161,7 @@ WaitFor8254Wraparound(VOID)
     while (Delta < 300);
 }
 
+static
 PVOID
 FindUefiVendorTable(EFI_SYSTEM_TABLE *SystemTable, EFI_GUID Guid)
 {
@@ -836,25 +833,29 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
     ULONG                           TableSize;
     USHORT                          WindowsVersion = 0;
     EFI_SYSTEM_TABLE                *SystemTable;
+    EFI_GUID                        Guid;
 
     SystemTable = (EFI_SYSTEM_TABLE *) BootArgs->EfiSystemTable;
 
     // Detect what version of NT we're running
+    // Note: This information should probably be passed into HwDetect
     WindowsVersion = WinLdrDetectVersion();
     ASSERT(WindowsVersion != 0);
 
     if (WindowsVersion >= _WIN32_WINNT_WINXP)
     {
         // Windows XP and later: Use ACPI 2.0 table.
-        Rsdp = FindUefiVendorTable(SystemTable, (EFI_GUID) EFI_ACPI_20_TABLE_GUID);
+        Guid = (EFI_GUID) EFI_ACPI_20_TABLE_GUID;
     }
     else
     {
         // Windows 2000 and earlier: Use ACPI 1.0 table.
-        // Note: This breaks reboot and shutdown on the Apple TV and may be completely broken on newer
+        // Note: This breaks software reboot on the Apple TV and may be completely broken on newer
         // devices.
-        Rsdp = FindUefiVendorTable(SystemTable, (EFI_GUID) ACPI_10_TABLE_GUID);
+        Guid = (EFI_GUID) ACPI_10_TABLE_GUID;
     }
+    
+    Rsdp = FindUefiVendorTable(SystemTable, Guid);
 
     if (Rsdp)
     {
@@ -1093,7 +1094,7 @@ DetectSmBios(VOID)
     // Note: On most hardware, low memory is read-only and must be unlocked using either the
     // EFI Legacy Region Protocol or PAM/MTRR; see UefiSeven/CSMWrap.
     // The Apple TV is a notable exception.
-    memcpy((PVOID) SMBIOS_TABLE_LOW, SmBiosTable, sizeof(SMBIOS_TABLE_HEADER));
+    RtlCopyMemory((PVOID) SMBIOS_TABLE_LOW, SmBiosTable, sizeof(SMBIOS_TABLE_HEADER));
 }
 
 PCONFIGURATION_COMPONENT_DATA

boot/freeldr/freeldr/arch/i386/appletv/appletvmem.c

@@ -26,7 +26,7 @@ AddMemoryDescriptor(
     IN PFN_NUMBER PageCount,
     IN TYPE_OF_MEMORY MemoryType);
 
-// we love statically allocated memory, don't we? :D
+// BIOS/E820 memory map, this is passed to Windows for ACPI support
 BIOS_MEMORY_MAP BiosMap[MAX_BIOS_DESCRIPTORS];
 UINT32 BiosMapNumberOfEntries = 0;
 
@@ -193,6 +193,9 @@ BiosConvertToFreeldrType(BIOS_MEMORY_TYPE MemoryType)
     {
         case BiosMemoryUsable:
             return LoaderFree;
+        // FIXME: does this break real hardware?
+        case BiosMemoryAcpiReclaim:
+            return LoaderFirmwareTemporary;
         case BiosMemoryReserved:
             return LoaderFirmwarePermanent;
         default:
@@ -208,8 +211,8 @@ BiosAddMemoryRegion(PBIOS_MEMORY_MAP MemoryMap,
                     UINT64 Size,
                     BIOS_MEMORY_TYPE Type)
 {
-    UINT32 x = *BiosNumberOfEntries;
-    if (x == MAX_BIOS_DESCRIPTORS)
+    UINT32 NumEntries = *BiosNumberOfEntries;
+    if (NumEntries == MAX_BIOS_DESCRIPTORS)
     {
         ERR("Too many entries!\n");
         FrLdrBugCheckWithMessage(
@@ -219,17 +222,17 @@ BiosAddMemoryRegion(PBIOS_MEMORY_MAP MemoryMap,
             "Cannot create more than 80 BIOS memory descriptors!");
     }
     // Add on to existing entry if we can
-    if ((x > 0)
-        && (MemoryMap[x - 1].BaseAddress + MemoryMap[x - 1].Length == Start)
-        && (MemoryMap[x - 1].Type == Type))
+    if ((NumEntries > 0)
+        && (MemoryMap[NumEntries - 1].BaseAddress + MemoryMap[NumEntries - 1].Length == Start)
+        && (MemoryMap[NumEntries - 1].Type == Type))
     {
-        MemoryMap[x - 1].Length += Size;
+        MemoryMap[NumEntries - 1].Length += Size;
     }
     else
     {
-        MemoryMap[x].BaseAddress    = Start;
-        MemoryMap[x].Length         = Size;
-        MemoryMap[x].Type           = Type;
+        MemoryMap[NumEntries].BaseAddress   = Start;
+        MemoryMap[NumEntries].Length        = Size;
+        MemoryMap[NumEntries].Type          = Type;
         (*BiosNumberOfEntries)++;
     }
 }
@@ -301,16 +304,10 @@ AppleTVMemGetMemoryMap(ULONG *MemoryMapSize)
     BiosConvertToFreeldrMap(BiosMapPtr,
                             BiosMapNumberOfEntries);
 
-    // reserve some ranges to prevent windows bugs
-    SetMemory(FreeldrMemMap, 0x000000, 0x01000, LoaderFirmwarePermanent); // Realmode IVT / BDA
-    SetMemory(FreeldrMemMap, 0x0A0000, 0x50000, LoaderFirmwarePermanent); // Video memory
-    SetMemory(FreeldrMemMap, 0x0F0000, 0x10000, LoaderSpecialMemory); // ROM
-    SetMemory(FreeldrMemMap, 0xFFF000, 0x01000, LoaderSpecialMemory); // unusable memory (do we really need this?)
+    // The first page should be reserved.
+    SetMemory(FreeldrMemMap, 0x000000, 0x01000, LoaderSpecialMemory); // Realmode IVT / BDA
 
     *MemoryMapSize = PcMemFinalizeMemoryMap(FreeldrMemMap);
-    
-    // Prevent BootArgs from being overwritten (can this even happen?)
-    SetMemory(FreeldrMemMap, (ULONG_PTR)BootArgs, sizeof(MACH_BOOTARGS), LoaderFirmwareTemporary);
-    
+        
     return FreeldrMemMap;
 }