some cleanup

Author: DistroHopper39B

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

@@ -637,3 +637,16 @@ AppleTVInitializeBootDevices(VOID)
 
     return (DiskCount != 0);
 }
+
+UCHAR
+AppleTVGetFloppyCount(VOID)
+{
+    /* No floppy drive present */
+    return 0;
+}
+
+UCHAR
+DriveMapGetBiosDriveNumber(PCSTR DeviceName)
+{
+    return 0;
+}

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

@@ -13,18 +13,12 @@
 
 /* GENERAL FUNCTIONS *********************************************************/
 
-UCHAR
-AppleTVGetFloppyCount(VOID)
-{
-    /* No floppy drive present */
-    return 0;
-}
-
 VOID
 AppleTVGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize)
 {
     /* No EBDA on EFI-based Apple TV */
 }
+
 VOID
 AppleTVHwIdle(VOID)
 {
@@ -37,26 +31,14 @@ AppleTVBeep(VOID)
     /* No beeper speaker support */
 }
 
-UCHAR
-DriveMapGetBiosDriveNumber(PCSTR DeviceName)
-{
-    return 0;
-}
-
-BOOLEAN
-PxeInit(VOID)
-{
-    return FALSE;
-}
-
 VOID
 ChainLoadBiosBootSectorCode(UCHAR BootDrive, ULONG BootPartition)
 {
     // Not supported
 }
 
 VOID
-DiskStopFloppyMotor()
+DiskStopFloppyMotor(VOID)
 {
     // Not supported
 }
@@ -101,19 +83,6 @@ AppleTVVideoHideShowTextCursor(BOOLEAN Show)
     // We don't have a cursor
 }
 
-VIDEODISPLAYMODE
-AppleTVVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init)
-{
-    // We only have one display mode
-    return VideoTextMode;
-}
-
-BOOLEAN
-AppleTVVideoIsPaletteFixed(VOID)
-{
-    return FALSE;
-}
-
 VOID
 AppleTVVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue)
 {

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

@@ -170,4 +170,17 @@ AppleTVVideoScrollUp(VOID)
 
     for (PixelCount = 0; PixelCount < Video->Width * CHAR_HEIGHT; PixelCount++)
         *Dst++ = BgColor;
+}
+
+VIDEODISPLAYMODE
+AppleTVVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init)
+{
+    // We only have one display mode
+    return VideoTextMode;
+}
+
+BOOLEAN
+AppleTVVideoIsPaletteFixed(VOID)
+{
+    return FALSE;
 }

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

@@ -13,10 +13,6 @@
 #include <debug.h>
 DBG_DEFAULT_CHANNEL(HWDETECT);
 
-/* GLOBALS *******************************************************************/
-
-extern PMACH_BOOTARGS BootArgs; // from eax register; see appletventry.S
-
 /* FUNCTIONS *****************************************************************/
 
 VOID
@@ -31,7 +27,7 @@ MachInit(const char *CmdLine)
     if (BootArgs->Version != 1
         && BootArgs->Revision != 4)
     {
-        ERR("This is not an Apple TV!\n");
+        ERR("BootArgs struct missing or damaged; this probably isn't an Apple TV!\n");
 
         _disable();
         __halt();
@@ -72,15 +68,12 @@ MachInit(const char *CmdLine)
 
     /*
      * If we are booting in text mode, enable screen debugging
-     * Enabling this can be achieved by holding Cmd/Win-V or S at startup
+     * Text mode can be enabled by holding Windows/Command-V or Command-S at startup
      * or adding '-v' or '-s' to the 'Kernel Flags' key in com.apple.Boot.plist
      */
     if (BootArgs->Video.DisplayMode == DISPLAY_MODE_TEXT)
     {
-        // Clear screen
         AppleTVVideoClearScreen(COLOR_BLACK);
-        
-        // Enable screen debug
         DebugEnableScreenPort();
     }
 

boot/freeldr/freeldr/include/arch/appletv/boot_args.h

@@ -61,4 +61,4 @@ typedef struct ALIGNED(4) {
     UINT8 __reserved2[7];
 } MACH_BOOTARGS, *PMACH_BOOTARGS;
 
-extern PMACH_BOOTARGS BootArgs;
+extern PMACH_BOOTARGS BootArgs; // from eax register; see appletventry.S