** Further investigate framebuffer info structure

Author: HBelusca

boot/freeldr/freeldr/arch/vidfb.c

@@ -33,28 +33,20 @@ typedef ULONG RGBQUAD; // , COLORREF;
 
 /* GLOBALS ********************************************************************/
 
-typedef struct _FRAMEBUFFER_INFO
+typedef struct _FRAMEBUFFER_DATA
 {
     ULONG_PTR BaseAddress;
     ULONG BufferSize;
 
-    /* Horizontal and Vertical resolution in pixels */
-    ULONG ScreenWidth;
-    ULONG ScreenHeight;
-
-    /* Number of pixel elements per video memory line */
-    ULONG PixelsPerScanLine; // aka. "Pitch" or "ScreenStride", but Stride is in bytes or bits...
-    ULONG BitsPerPixel;      // aka. "PixelStride".
-
-    /* Physical format of the pixel for BPP > 8, specified by bit-mask */
-    PIXEL_BITMASK PixelMasks;
+    /* Framebuffer characteristics */
+    FRAMEBUFFER_INFO;
 
 /** Calculated values */
 
     ULONG BytesPerPixel;
-    ULONG Delta;             // aka. "Pitch": actual size in bytes of a scanline.
+    ULONG Delta;    // aka. "Pitch": actual size in bytes of a scanline.
 
-    /* Calculated number of bits from the masks above */
+    /* Calculated number of bits from pixel masks */
     UCHAR RedMaskSize;
     UCHAR GreenMaskSize;
     UCHAR BlueMaskSize;
@@ -65,9 +57,9 @@ typedef struct _FRAMEBUFFER_INFO
     UCHAR GreenMaskPosition;
     UCHAR BlueMaskPosition;
     UCHAR ReservedMaskPosition;
-} FRAMEBUFFER_INFO, *PFRAMEBUFFER_INFO;
+} FRAMEBUFFER_DATA, *PFRAMEBUFFER_DATA;
 
-static FRAMEBUFFER_INFO framebufInfo = {0};
+static FRAMEBUFFER_DATA framebufInfo = {0};
 static CM_FRAMEBUF_DEVICE_DATA FrameBufferData = {0};
 
 static UINT8 VidpXScale = 1;
@@ -643,7 +635,7 @@ color_scale_component(
 static UINT32 // RescaleColor()
 color_scale_argb(
     _In_ UINT32 Color,
-    _In_ PFRAMEBUFFER_INFO FbInfo)
+    _In_ PFRAMEBUFFER_DATA FbInfo)
 {
     //UINT32 scRsvd  = color_scale_component(GetAValue(Color), FbInfo->ReservedMaskSize);
     UINT32 scRed   = color_scale_component(GetRValue(Color), FbInfo->RedMaskSize);

sdk/include/reactos/drivers/bootvid/framebuf.h

@@ -14,6 +14,46 @@
 extern "C" {
 #endif
 
+/**
+ * @brief
+ * Physical format of an RGB pixel, specified with per-component bit-masks.
+ * A bit being set defines those used for the given color component, such
+ * as Red, Green, Blue, or Reserved.
+ *
+ * @note
+ * Supports up to 32 bits-per-pixel deep pixels.
+ **/
+typedef struct _PIXEL_BITMASK
+{
+    ULONG RedMask;
+    ULONG GreenMask;
+    ULONG BlueMask;
+    ULONG ReservedMask;
+} PIXEL_BITMASK, *PPIXEL_BITMASK;
+
+/**
+ * @brief   Framebuffer characteristics.
+ **/
+typedef struct _FRAMEBUFFER_INFO
+{
+    /* The framebuffer size is obtained by:
+     * FrameBufferSize = ScreenHeight * PixelsPerScanLine * BytesPerPixel */
+    // ULONG BufferSize;
+
+    /* Horizontal and Vertical resolution in pixels */
+    ULONG ScreenWidth;
+    ULONG ScreenHeight;
+
+    /* Number of pixel elements per video memory line. Related to
+     * the number of bytes per scan-line (pitch/screen stride) via:
+     * Pitch = PixelsPerScanLine * BytesPerPixel */
+    ULONG PixelsPerScanLine; ///< Pitch/stride in pixels
+    ULONG BitsPerPixel;      ///< Pixel depth
+
+    /* Pixel physical format for BPP > 8 */
+    PIXEL_BITMASK PixelMasks;
+} FRAMEBUFFER_INFO, *PFRAMEBUFFER_INFO;
+
 /**
  * @brief   Framebuffer-specific video device configuration data.
  *
@@ -35,31 +75,11 @@ typedef struct _CM_FRAMEBUF_DEVICE_DATA
 {
     CM_VIDEO_DEVICE_DATA;
 
-    /* Absolute offset from the start of the video RAM of the framebuffer
-     * to be displayed on the monitor. The framebuffer size is obtained by:
-     * FrameBufferSize = ScreenHeight * PixelsPerScanLine * BytesPerPixel */
+    /* Absolute offset from the start of the video RAM
+     * of the framebuffer to be displayed */
     ULONG FrameBufferOffset;
 
-    /* Horizontal and Vertical resolution in pixels */
-    ULONG ScreenWidth;
-    ULONG ScreenHeight;
-
-    /* Number of pixel elements per video memory line. Related to
-     * the number of bytes per scan-line (pitch/screen stride) via:
-     * Pitch = PixelsPerScanLine * BytesPerPixel */
-    ULONG PixelsPerScanLine; ///< Pitch/stride in pixels
-    ULONG BitsPerPixel;      ///< Pixel depth
-
-    /* Pixel physical format for BPP > 8, specified by bit-masks.
-     * A bit being set defines those used for the given color component,
-     * such as Red, Green, Blue, or Reserved. */
-    struct /*_PIXEL_BITMASK*/
-    {
-        ULONG RedMask;
-        ULONG GreenMask;
-        ULONG BlueMask;
-        ULONG ReservedMask;
-    } PixelMasks; /*PIXEL_BITMASK, *PPIXEL_BITMASK*/
+    FRAMEBUFFER_INFO; ///< Framebuffer characteristics
 
 } CM_FRAMEBUF_DEVICE_DATA, *PCM_FRAMEBUF_DEVICE_DATA;