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

Timestamp:

Jan 31, 2007 9:52:32 PM (18 years ago)

Author:

vboxsync

Message:

several small fixes merged from upstream

File:

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

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

@@ -56 +56 @@
 
 #ifdef VBOX
-#define VBE_DISPI_MAX_BPP               32
-#endif
-
-#ifdef VBOX
 #define VBE_DISPI_MAX_XRES              16384
 #define VBE_DISPI_MAX_YRES              16384
 #else
-#define VBE_DISPI_MAX_XRES              1024
-#define VBE_DISPI_MAX_YRES              768
-#endif
+#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
@@ -85 +82 @@
 #define VBE_DISPI_DISABLED              0x00
 #define VBE_DISPI_ENABLED               0x01
-#ifdef VBOX
 #define VBE_DISPI_GETCAPS               0x02
 #define VBE_DISPI_8BIT_DAC              0x20
-#endif
 #define VBE_DISPI_LFB_ENABLED           0x40
 #define VBE_DISPI_NOCLEARMEM            0x80
@@ -141 +136 @@
     void (*get_offsets)(struct VGAState *s,                             \
                         uint32_t *pline_offset,                         \
-                        uint32_t *pstart_addr);                         \
+                        uint32_t *pstart_addr,                          \
+                        uint32_t *pline_compare);                       \
     void (*get_resolution)(struct VGAState *s,                          \
                         int *pwidth,                                    \
@@ -175 +171 @@
 struct VGAState;
 typedef int FNGETBPP(struct VGAState *s);
-typedef void FNGETOFFSETS(struct VGAState *s, uint32_t *pline_offset, uint32_t *pstart_addr);
+typedef void FNGETOFFSETS(struct VGAState *s, uint32_t *pline_offset, uint32_t *pstart_addr, uint32_t *pline_compare);
 typedef void FNGETRESOLUTION(struct VGAState *s, int *pwidth, int *pheight);
 typedef unsigned int FNRGBTOPIXEL(unsigned int r, unsigned int g, unsigned b);