vbox的更動 7774 路徑 trunk/src/VBox/Devices/Graphics

時間撮記:

2008-4-7 下午03:07:29 (17 年 以前)

作者:

vboxsync

訊息:

Moved the LOGO_* defines and LOGOHDR to a common header instead of keeping duplicates around the place.

位置:

trunk/src/VBox/Devices/Graphics

檔案:

• DevVGA.cpp (修改) (5 筆差異)
• DevVGA.h (修改) (1 筆差異)

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

@@ -93 +93 @@
 #include <VBox/VBoxGuest.h>
 #include <VBox/VBoxVideo.h>
+#include <VBox/bioslogo.h>
 
 #if defined(VBE_NEW_DYN_LIST) && defined(IN_RING3) && !defined(VBOX_DEVICE_STRUCT_TESTCASE)
@@ -108 +109 @@
 *******************************************************************************/
 /* "Press F12 to select boot device." bitmap. */
-static const uint8_t g_abLogoF12BootText[] = 
+static const uint8_t g_abLogoF12BootText[] =
 {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5381 +5382 @@
      * Register I/O Port for the BIOS Logo.
      */
-    rc = PDMDevHlpIOPortRegister(pDevIns, VBE_LOGO_PORT, 1, NULL, vbeIOPortWriteCMDLogo, vbeIOPortReadCMDLogo, NULL, NULL, "BIOS Logo");
+    rc = PDMDevHlpIOPortRegister(pDevIns, LOGO_IO_PORT, 1, NULL, vbeIOPortWriteCMDLogo, vbeIOPortReadCMDLogo, NULL, NULL, "BIOS Logo");
     if (VBOX_FAILURE(rc))
         return rc;
@@ -5388 +5389 @@
      * Construct the logo header.
      */
-    LOGOHDR LogoHdr = { LOGO_HDR_MAGIC, 0, 0, 0, 0, 0 };
-
-    rc = CFGMR3QueryU8(pCfgHandle, "FadeIn", &LogoHdr.u8FadeIn);
+    LOGOHDR LogoHdr = { LOGO_HDR_MAGIC, 0, 0, 0, 0, 0, 0 };
+
+    rc = CFGMR3QueryU8(pCfgHandle, "FadeIn", &LogoHdr.fu8FadeIn);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        LogoHdr.u8FadeIn = 1;
+        LogoHdr.fu8FadeIn = 1;
     else if (VBOX_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"FadeIn\" as integer failed"));
 
-    rc = CFGMR3QueryU8(pCfgHandle, "FadeOut", &LogoHdr.u8FadeOut);
+    rc = CFGMR3QueryU8(pCfgHandle, "FadeOut", &LogoHdr.fu8FadeOut);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        LogoHdr.u8FadeOut = 1;
+        LogoHdr.fu8FadeOut = 1;
     else if (VBOX_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -5411 +5412 @@
                                 N_("Configuration error: Querying \"LogoTime\" as integer failed"));
 
-    rc = CFGMR3QueryU8(pCfgHandle, "ShowBootMenu", &LogoHdr.u8ShowBootMenu);
+    rc = CFGMR3QueryU8(pCfgHandle, "ShowBootMenu", &LogoHdr.fu8ShowBootMenu);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        LogoHdr.u8ShowBootMenu = 0;
+        LogoHdr.fu8ShowBootMenu = 0;
     else if (VBOX_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

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

@@ -385 +385 @@
 #endif /* VBE_NEW_DYN_LIST */
 
-/** The extra port which is used to show the BIOS logo.
- * @remark duplicated in logo.c. */
-#define VBE_LOGO_PORT        0x3b8
-
-/** The BIOS logo fade in/fade out steps.
- * @remark duplicated in logo.c. */
-#define LOGO_SHOW_STEPS      64
-
-/** The BIOS boot menu text position. */
-#define LOGO_F12TEXT_X       340
-#define LOGO_F12TEXT_Y       455
-
-/** Width and height of the "Press F12 to select boot device." bitmap.
-    Anything that exceeds the limit of F12BootText below is filled with
-    background. */
-#define LOGO_F12TEXT_WIDTH   286
-#define LOGO_F12TEXT_HEIGHT  12
-
-/** The BIOS logo commands.
- * @remark duplicated in logo.c. */
-#define LOGO_IMAGE_DEFAULT   0
-#define LOGO_IMAGE_EXTERNAL  1
-
-#define LOGO_MAX_WIDTH       640
-#define LOGO_MAX_HEIGHT      480
-
-#define LOGO_CMD_NOP         0
-#define LOGO_CMD_SET_OFFSET  0x100
-#define LOGO_CMD_SET_X       0x200
-#define LOGO_CMD_SET_Y       0x300
-#define LOGO_CMD_SET_WIDTH   0x400
-#define LOGO_CMD_SET_HEIGHT  0x500
-#define LOGO_CMD_SET_DEPTH   0x600
-#define LOGO_CMD_SET_PALSIZE 0x700
-#define LOGO_CMD_SET_DEFAULT 0x800
-#define LOGO_CMD_SET_PAL     0x900
-#define LOGO_CMD_SHOW_BMP    0xA00
-#define LOGO_CMD_SHOW_TEXT   0xB00
-#define LOGO_CMD_CLS         0xC00
-
-/**
- * PC Bios logo data structure.
- */
-#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
-{
-    /** Signature (LOGO_HDR_MAGIC/0x66BB). */
-    uint16_t        u16Signature;
-    /** Fade in - boolean. */
-    uint8_t         u8FadeIn;
-    /** Fade out - boolean. */
-    uint8_t         u8FadeOut;
-    /** Logo time (msec). */
-    uint16_t        u16LogoMillies;
-    /** Show setup - boolean. */
-    uint8_t         u8ShowBootMenu;
-    /** Logo file size. */
-    uint32_t        cbLogo;
-} LOGOHDR, *PLOGOHDR;
-#pragma pack()
-
-/** The value of the LOGOHDR::u16Signature field. */
-#define LOGO_HDR_MAGIC      0x66BB
-
-/** The value which will switch you the default logo. */
-#define LOGO_DEFAULT_LOGO   0xFFFF
-
 #if !defined(VBOX) || defined(IN_RING3)
 static inline int c6_to_8(int v)