[FREELDR:APPLETV] Use vidfb for the frame buffer

Author: DistroHopper39B

boot/freeldr/freeldr/appletv.cmake

@@ -37,6 +37,7 @@ list(APPEND APPLETVLDR_ARC_SOURCE
 
 # extra stuff we need
 list(APPEND APPLETVLDR_ARC_SOURCE
+    arch/vidfb.c
     arch/vgafont.c
     arch/drivers/hwide.c
     arch/i386/hwdisk.c

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

@@ -2,12 +2,14 @@
  * PROJECT:     FreeLoader
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     Console routines for the original Apple TV
- * COPYRIGHT:   Copyright 2023 Sylas Hollander ([email protected])
+ * COPYRIGHT:   Authors of xboxcons.c
+                Copyright 2023 Sylas Hollander ([email protected])
  */
 
 /* INCLUDES ******************************************************************/
 
 #include <freeldr.h>
+#include "../../vidfb.h"
 
 /* GLOBALS *******************************************************************/
 
@@ -28,7 +30,7 @@ AppleTVConsPutChar(int c)
     NeedScroll = (CurrentCursorY >= Height);
     if (NeedScroll)
     {
-        AppleTVVideoScrollUp();
+        VidFbScrollUp(CurrentAttr);
         --CurrentCursorY;
     }
 

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

@@ -8,12 +8,11 @@
 /* INCLUDES ******************************************************************/
 
 #include <freeldr.h>
+#include "../../vidfb.h"
 
 /* UEFI support */
 #include <Uefi.h>
 #include <Acpi.h>
-#include <GraphicsOutput.h>
-#include <drivers/bootvid/framebuf.h>
 
 #include <debug.h>
 DBG_DEFAULT_CHANNEL(WARNING);
@@ -409,108 +408,6 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
     }
 }
 
-static VOID
-DetectDisplayController(PCONFIGURATION_COMPONENT_DATA BusKey)
-{
-    PCONFIGURATION_COMPONENT_DATA ControllerKey;
-    PCM_PARTIAL_RESOURCE_LIST PartialResourceList;
-    PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor;
-    PCM_FRAMEBUF_DEVICE_DATA FramebufferData;
-    ULONG Size;
-    
-    PMACH_VIDEO Video = &BootArgs->Video;
-
-    TRACE("\nStructure sizes:\n"
-        "    sizeof(CM_PARTIAL_RESOURCE_LIST)       = %lu\n"
-        "    sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) = %lu\n"
-        "    sizeof(CM_FRAMEBUF_DEVICE_DATA)        = %lu\n\n",
-        sizeof(CM_PARTIAL_RESOURCE_LIST),
-        sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR),
-        sizeof(CM_FRAMEBUF_DEVICE_DATA));
-
-    Size = sizeof(CM_PARTIAL_RESOURCE_LIST) +
-           sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) +
-           sizeof(CM_FRAMEBUF_DEVICE_DATA);
-    PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST);
-    if (PartialResourceList == NULL)
-    {
-        ERR("Failed to allocate resource descriptor\n");
-        return;
-    }
-
-    // Initialize resource descriptor
-    RtlZeroMemory(PartialResourceList, Size);
-    PartialResourceList->Version  = ARC_VERSION;
-    PartialResourceList->Revision = ARC_REVISION;
-    PartialResourceList->Count = 2;
-
-    // Set Memory
-    PartialDescriptor = &PartialResourceList->PartialDescriptors[0];
-    PartialDescriptor->Type = CmResourceTypeMemory;
-    PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive;
-    PartialDescriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE;
-    PartialDescriptor->u.Memory.Start.QuadPart = Video->BaseAddress;
-    PartialDescriptor->u.Memory.Length = (Video->Pitch * Video->Height);
-
-    // Set framebuffer-specific data
-    PartialDescriptor = &PartialResourceList->PartialDescriptors[1];
-    PartialDescriptor->Type = CmResourceTypeDeviceSpecific;
-    PartialDescriptor->ShareDisposition = CmResourceShareUndetermined;
-    PartialDescriptor->Flags = 0;
-    PartialDescriptor->u.DeviceSpecificData.DataSize =
-        sizeof(CM_FRAMEBUF_DEVICE_DATA);
-
-    // Get pointer to framebuffer-specific data
-    FramebufferData = (PVOID)(PartialDescriptor + 1);
-    RtlZeroMemory(FramebufferData, sizeof(*FramebufferData));
-    FramebufferData->Version  = 2;
-    FramebufferData->Revision = 0;
-
-    FramebufferData->VideoClock = 0; // FIXME: Use EDID
-
-    // Horizontal and Vertical resolution in pixels
-    FramebufferData->ScreenWidth  = Video->Width;
-    FramebufferData->ScreenHeight = Video->Height;
-
-    // Number of pixel elements per video memory line
-    FramebufferData->PixelsPerScanLine = (Video->Pitch / 4);
-
-    //
-    // TODO: Investigate display rotation!
-    //
-    // See OpenCorePkg OcConsoleLib/ConsoleGop.c
-    // if ((mGop.Rotation == 90) || (mGop.Rotation == 270))
-    if (FramebufferData->ScreenWidth < FramebufferData->ScreenHeight)
-    {
-        #define SWAP(x, y) { (x) ^= (y); (y) ^= (x); (x) ^= (y); }
-        SWAP(FramebufferData->ScreenWidth, FramebufferData->ScreenHeight);
-        FramebufferData->PixelsPerScanLine = FramebufferData->ScreenWidth;
-        #undef SWAP
-    }
-
-    // Physical format of the pixel
-    // ASSERT(sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL) == 4);
-    // On Apple systems this can just be hardcoded to PixelBlueGreenRedReserved8BitPerColor.
-    FramebufferData->BitsPerPixel = (8 * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
-    *(EFI_PIXEL_BITMASK*)&FramebufferData->PixelInformation = EfiPixelMasks[PixelBlueGreenRedReserved8BitPerColor];
-
-    FldrCreateComponentKey(BusKey,
-                           ControllerClass,
-                           DisplayController,
-                           Output | ConsoleOut,
-                           0,
-                           0xFFFFFFFF,
-                           "Apple TV Framebuffer",
-                           PartialResourceList,
-                           Size,
-                           &ControllerKey);
-
-    // NOTE: Don't add a MonitorPeripheral for now...
-    // We should use EDID data for it.
-
-}
-
-
 static
 VOID
 DetectInternal(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
@@ -550,7 +447,7 @@ DetectInternal(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
     (*BusNumber)++;
 
     // Detect devices that do not belong to "standard" buses
-    DetectDisplayController(BusKey);
+    DetectDisplayController(BusKey, "Apple TV Framebuffer");
 
     //FIXME: Detect more devices
 }

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

@@ -7,6 +7,7 @@
 
 /* INCLUDES *******************************************************************/
 #include <freeldr.h>
+#include "../../vidfb.h"
 
 /* UEFI support */
 #include <Uefi.h>
@@ -24,156 +25,51 @@ UCHAR MachDefaultTextColor = COLOR_GRAY;
 
 /* FUNCTIONS ******************************************************************/
 
-
-static ULONG
-AppleTVVideoAttrToSingleColor(UCHAR Attr)
-{
-    UCHAR Intensity;
-    Intensity = (0 == (Attr & 0x08) ? 127 : 255);
-
-    return 0xff000000 |
-           (0 == (Attr & 0x04) ? 0 : (Intensity << 16)) |
-           (0 == (Attr & 0x02) ? 0 : (Intensity << 8)) |
-           (0 == (Attr & 0x01) ? 0 : Intensity);
-}
-
-static VOID
-AppleTVVideoAttrToColors(UCHAR Attr, ULONG *FgColor, ULONG *BgColor)
-{
-    *FgColor = AppleTVVideoAttrToSingleColor(Attr & 0xf);
-    *BgColor = AppleTVVideoAttrToSingleColor((Attr >> 4) & 0xf);
-}
-
-
-static VOID
-AppleTVVideoClearScreenColor(ULONG Color, BOOLEAN FullScreen)
-{
-    ULONG Delta;
-    ULONG Line, Col;
-    PULONG p;
-    
-    PMACH_VIDEO Video = &BootArgs->Video;
-
-    Delta = (Video->Pitch + 3) & ~ 0x3;
-    for (Line = 0; Line < Video->Height - (FullScreen ? 0 : 2 * TOP_BOTTOM_LINES); Line++)
-    {
-        p = (PULONG) ((char *) Video->BaseAddress + (Line + (FullScreen ? 0 : TOP_BOTTOM_LINES)) * Delta);
-        for (Col = 0; Col < Video->Width; Col++)
-        {
-            *p++ = Color;
-        }
-    }
-}
-
 VOID
 AppleTVVideoClearScreen(UCHAR Attr)
 {
-    ULONG FgColor, BgColor;
-
-    AppleTVVideoAttrToColors(Attr, &FgColor, &BgColor);
-    AppleTVVideoClearScreenColor(BgColor, FALSE);
-}
-
-VOID
-AppleTVVideoOutputChar(UCHAR Char, unsigned X, unsigned Y, ULONG FgColor, ULONG BgColor)
-{
-    PUCHAR FontPtr;
-    PULONG Pixel;
-    UCHAR Mask;
-    unsigned Line;
-    unsigned Col;
-    ULONG Delta;
-    
-    PMACH_VIDEO Video = &BootArgs->Video;
-    
-    Delta = (Video->Pitch + 3) & ~ 0x3;
-    FontPtr = BitmapFont8x16 + Char * 16;
-    Pixel = (PULONG) ((char *) Video->BaseAddress +
-            (Y * CHAR_HEIGHT + TOP_BOTTOM_LINES) *  Delta + X * CHAR_WIDTH * 4);
-
-    for (Line = 0; Line < CHAR_HEIGHT; Line++)
-    {
-        Mask = 0x80;
-        for (Col = 0; Col < CHAR_WIDTH; Col++)
-        {
-            Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? FgColor : BgColor);
-            Mask = Mask >> 1;
-        }
-        Pixel = (PULONG) ((char *) Pixel + Delta);
-    }
+    VidFbClearScreen(Attr);
 }
 
 VOID
 AppleTVVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y)
 {
-    ULONG FgColor = 0;
-    ULONG BgColor = 0;
-    if (Ch != 0)
-    {
-        AppleTVVideoAttrToColors(Attr, &FgColor, &BgColor);
-        AppleTVVideoOutputChar(Ch, X, Y, FgColor, BgColor);
-    }
+    VidFbPutChar(Ch, Attr, X, Y);
 }
 
 VOID
 AppleTVVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth)
 {
-    PMACH_VIDEO Video = &BootArgs->Video;
-    
-    *Width =  Video->Width / CHAR_WIDTH;
-    *Height = (Video->Height - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT;
-    *Depth =  0;
+    VidFbGetDisplaySize(Width, Height, Depth);
 }
 
 ULONG
 AppleTVVideoGetBufferSize(VOID)
 {
-    PMACH_VIDEO Video = &BootArgs->Video;
-    
-    return ((Video->Height - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT * (Video->Width / CHAR_WIDTH) * 2);
+    return VidFbGetBufferSize();
 }
 
 VOID
 AppleTVVideoCopyOffScreenBufferToVRAM(PVOID Buffer)
 {
-    PMACH_VIDEO Video = &BootArgs->Video;
-    PUCHAR OffScreenBuffer = (PUCHAR)Buffer;
-
-    ULONG Col, Line;
-    for (Line = 0; Line < (Video->Height - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT; Line++)
-    {
-        for (Col = 0; Col < Video->Width / CHAR_WIDTH; Col++)
-        {
-            AppleTVVideoPutChar(OffScreenBuffer[0], OffScreenBuffer[1], Col, Line);
-            OffScreenBuffer += 2;
-        }
-    }
+    VidFbCopyOffScreenBufferToVRAM(Buffer);
 }
 
 VOID
-AppleTVVideoScrollUp(VOID)
+AppleTVInitializeVideo(VOID)
 {
     PMACH_VIDEO Video = &BootArgs->Video;
 
-    ULONG BgColor, Dummy;
-    ULONG Delta;
-    Delta = (Video->Pitch + 3) & ~ 0x3;
-    ULONG PixelCount = Video->Width * CHAR_HEIGHT *
-                       (((Video->Height - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT) - 1);
-    PULONG Src = (PULONG)((PUCHAR)Video->BaseAddress + (CHAR_HEIGHT + TOP_BOTTOM_LINES) * Delta);
-    PULONG Dst = (PULONG)((PUCHAR)Video->BaseAddress + TOP_BOTTOM_LINES * Delta);
-
-    AppleTVVideoAttrToColors(ATTR(COLOR_WHITE, COLOR_BLACK), &Dummy, &BgColor);
-
-    while (PixelCount--)
-        *Dst++ = *Src++;
-
-    for (PixelCount = 0; PixelCount < Video->Width * CHAR_HEIGHT; PixelCount++)
-        *Dst++ = BgColor;
+    VidFbInitializeVideo(Video->BaseAddress,
+                            (Video->Pitch * Video->Height),
+                            Video->Width,
+                            Video->Height,
+                            (Video->Pitch / 4),
+                            Video->Depth);
 }
 
 VIDEODISPLAYMODE
-AppleTVVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init)
+AppleTVVideoSetDisplayMode(PCSTR DisplayMode, BOOLEAN Init)
 {
     // We only have one display mode
     return VideoTextMode;

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

@@ -24,6 +24,7 @@ AppleTVPrepareForReactOS(VOID)
 VOID
 MachInit(const char *CmdLine)
 {
+    
     if (BootArgs->Version != 1
         && BootArgs->Revision != 4)
     {
@@ -66,6 +67,8 @@ MachInit(const char *CmdLine)
     MachVtbl.HwDetect = AppleTVHwDetect;
     MachVtbl.HwIdle = AppleTVHwIdle;
 
+    AppleTVInitializeVideo();
+    
     /*
      * If we are booting in text mode, enable screen debugging
      * Text mode can be enabled by holding Windows/Command-V or Command-S at startup