Changeset 7760 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA.h

Timestamp:

Apr 5, 2008 2:42:19 PM (17 years ago)

Author:

vboxsync

Message:

Shot at the alignment problem.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.h (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * VBox VGA/VESA device
  */
@@ -317 +317 @@
     uint16_t                    Padding7[2];    /**< Alignment padding. */
 #endif
-    /** Current logo command. */
-    uint16_t                    LogoCommand;
     /** Current logo data offset. */
     uint32_t                    offLogoData;
-    /** Bitmap image to use. */
-    uint8_t                     BmpImage;
     /** The size of the BIOS logo data. */
     uint32_t                    cbLogo;
     /** The BIOS logo data. */
-    uint8_t                     *pu8Logo;
+    R3PTRTYPE(uint8_t *)        pu8Logo;
     /** The name of the logo file. */
-    char                        *pszLogoFile;
+    R3PTRTYPE(char *)           pszLogoFile;
+    /** Current logo command. */
+    uint16_t                    LogoCommand;
+    /** Bitmap image to use. */
+    uint8_t                     BmpImage;
+    uint8_t                     Padding8;       /**< Alignment padding. */
     /** Logo X. */
-    uint16_t                     LogoX;
+    uint16_t                    LogoX;
     /** Logo Y. */
-    uint16_t                     LogoY;
+    uint16_t                    LogoY;
     /** Logo width. */
-    uint16_t                     LogoWidth;
+    uint16_t                    LogoWidth;
     /** Logo height. */
-    uint16_t                     LogoHeight;
+    uint16_t                    LogoHeight;
     /** Logo depth. */
-    uint16_t                     LogoDepth;
+    uint16_t                    LogoDepth;
+    /** Palette size. */
+    uint16_t                    PalSize;
     /** Palette data. */
-    uint32_t                     Palette[256];
-    /** Palette size. */
-    uint16_t                     PalSize;
-
+    uint32_t                    Palette[256];
 #endif /* VBOX */
 } VGAState;
@@ -428 +428 @@
  * PC Bios logo data structure.
  */
-#pragma pack(2) /* pack(2) is important! (seems that bios compiled with pack(2)...) */
+#pragma pack(2) /* pack(2) is important! (seems that bios compiled with pack(2)...) */ /** @todo r=bird: add 3 uint8_t's before cbLogo and it'll be just fine. */
 typedef struct LOGOHDR
 {