Changeset 34399 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 26, 2010 4:30:44 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68170

Message:

Devices/Graphics, Additions: move the VBE I/O port-related definitions into a single shared header file

Location:

trunk/src/VBox/Devices/Graphics

Files:

• BIOS/Makefile.kmk (modified) (2 diffs)
• BIOS/vbe.h (modified) (2 diffs)
• DevVGA.h (modified) (2 diffs)
• DevVGAModes.h (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

@@ -75 +75 @@
 # 2. precompile
 # WARNING! DEBUG is undefined here to keep the image size stable between debug and release builds.
-$$(PATH_VgaBiosBin)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $$(PATH_VgaBiosBin)/vbetables.h $(VBOX_VERSION_STAMP)
+$$(PATH_VgaBiosBin)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $$(PATH_VgaBiosBin)/vbetables.h $(PATH_ROOT)/include/VBox/Hardware/VBoxVideoVBE.h $(VBOX_VERSION_STAMP)
         $(call MSG_TOOL,cpp,VgaBiosBin,$<,$@)
         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P \
@@ -81 +81 @@
                 -DVBOX_VENDOR='"$(VBOX_VENDOR)"' -DVBOX_PRODUCT='"$(VBOX_PRODUCT)"' \
                 -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -UDEBUG \
+                -I$(PATH_ROOT)/include \
                 -o $@ $<
 

trunk/src/VBox/Devices/Graphics/BIOS/vbe.h

@@ -3 +3 @@
 
 #include "vgabios.h"
+
+#include <VBox/Hardware/VBoxVideoVBE.h>
 
 // DISPI helper function
@@ -269 +271 @@
 #define VBE_DIRECTCOLOR_RESERVED_BITS_AVAILABLE          0x02
 
-// GUEST <-> HOST Communication API
-
-// FIXME: either dynamicly ask host for this or put somewhere high in physical memory
-//        like 0xE0000000
-
-
-  #define VBE_DISPI_BANK_ADDRESS          0xA0000
-  #define VBE_DISPI_BANK_SIZE_KB          64
-
-  #define VBE_DISPI_MAX_XRES              1024
-  #define VBE_DISPI_MAX_YRES              768
-
-  #define VBE_DISPI_IOPORT_INDEX          0x01CE
-  #define VBE_DISPI_IOPORT_DATA           0x01CF
-
-  #define VBE_DISPI_INDEX_ID              0x0
-  #define VBE_DISPI_INDEX_XRES            0x1
-  #define VBE_DISPI_INDEX_YRES            0x2
-  #define VBE_DISPI_INDEX_BPP             0x3
-  #define VBE_DISPI_INDEX_ENABLE          0x4
-  #define VBE_DISPI_INDEX_BANK            0x5
-  #define VBE_DISPI_INDEX_VIRT_WIDTH      0x6
-  #define VBE_DISPI_INDEX_VIRT_HEIGHT     0x7
-  #define VBE_DISPI_INDEX_X_OFFSET        0x8
-  #define VBE_DISPI_INDEX_Y_OFFSET        0x9
-
-  #define VBE_DISPI_ID0                   0xB0C0
-  #define VBE_DISPI_ID1                   0xB0C1
-  #define VBE_DISPI_ID2                   0xB0C2
-  #define VBE_DISPI_ID3                   0xB0C3
-  #define VBE_DISPI_ID4                   0xB0C4
-
-  #define VBE_DISPI_DISABLED              0x00
-  #define VBE_DISPI_ENABLED               0x01
-  #define VBE_DISPI_GETCAPS               0x02
-  #define VBE_DISPI_8BIT_DAC              0x20
-  #define VBE_DISPI_LFB_ENABLED           0x40
-  #define VBE_DISPI_NOCLEARMEM            0x80
-
-  #define VBE_DISPI_LFB_PHYSICAL_ADDRESS  0xE0000000
-
   /**
    * VBE Bios Extra Data structure.

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

@@ -58 +58 @@
 #endif
 
+#include <VBox/Hardware/VBoxVideoVBE.h>
+
 #ifdef VBOX_WITH_HGSMI
 # include "HGSMI/HGSMIHost.h"
@@ -71 +73 @@
 /* bochs VBE support */
 #define CONFIG_BOCHS_VBE
-
-#ifdef VBOX
-#define VBE_DISPI_MAX_XRES              16384
-#define VBE_DISPI_MAX_YRES              16384
-#else
-#define VBE_DISPI_MAX_XRES              1600
-#define VBE_DISPI_MAX_YRES              1200
-#endif
-#define VBE_DISPI_MAX_BPP               32
-
-#define VBE_DISPI_INDEX_ID              0x0
-#define VBE_DISPI_INDEX_XRES            0x1
-#define VBE_DISPI_INDEX_YRES            0x2
-#define VBE_DISPI_INDEX_BPP             0x3
-#define VBE_DISPI_INDEX_ENABLE          0x4
-#define VBE_DISPI_INDEX_BANK            0x5
-#define VBE_DISPI_INDEX_VIRT_WIDTH      0x6
-#define VBE_DISPI_INDEX_VIRT_HEIGHT     0x7
-#define VBE_DISPI_INDEX_X_OFFSET        0x8
-#define VBE_DISPI_INDEX_Y_OFFSET        0x9
-#define VBE_DISPI_INDEX_VBOX_VIDEO      0xa
-#define VBE_DISPI_INDEX_NB_SAVED        0xb /* Number of saved registers (vbe_regs array) */
-#define VBE_DISPI_INDEX_NB              0xb /* Total number of VBE registers */
-
-#define VBE_DISPI_ID0                   0xB0C0
-#define VBE_DISPI_ID1                   0xB0C1
-#define VBE_DISPI_ID2                   0xB0C2
-#define VBE_DISPI_ID3                   0xB0C3
-#define VBE_DISPI_ID4                   0xB0C4
-
-#ifdef VBOX
-/* The VBOX interface id. Indicates support for VBE_DISPI_INDEX_VBOX_VIDEO. */
-#define VBE_DISPI_ID_VBOX_VIDEO         0xBE00
-#ifdef VBOX_WITH_HGSMI
-/* The VBOX interface id. Indicates support for VBVA shared memory interface. */
-#define VBE_DISPI_ID_HGSMI              0xBE01
-#endif /* VBOX_WITH_HGSMI */
-/* Indicates support for unrestricted horizontal resolutions (not multiple of 8). */
-#define VBE_DISPI_ID_ANYX               0xBE02
-#endif /* VBOX */
-
-#define VBE_DISPI_DISABLED              0x00
-#define VBE_DISPI_ENABLED               0x01
-#define VBE_DISPI_GETCAPS               0x02
-#define VBE_DISPI_8BIT_DAC              0x20
-#define VBE_DISPI_LFB_ENABLED           0x40
-#define VBE_DISPI_NOCLEARMEM            0x80
-
-#define VBE_DISPI_LFB_PHYSICAL_ADDRESS  0xE0000000
 
 #ifdef CONFIG_BOCHS_VBE

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

@@ -20 +20 @@
 
 #ifdef VBE_NEW_DYN_LIST
+
+#include <VBox/Hardware/VBoxVideoVBE.h>
 
 /* VBE Mode Numbers */
@@ -121 +123 @@
 /* Video memory */
 #define VGAMEM_GRAPH                                     0xA000
-#define VBE_DISPI_BANK_SIZE_KB                           64
-#define VBE_DISPI_LFB_PHYSICAL_ADDRESS                   0xE0000000
 
 /*