Changeset 38803 in vbox

Timestamp:

Sep 20, 2011 12:07:20 PM (13 years ago)

Author:

vboxsync

Message:

DevVGA.cpp: Fixed warnings on windows.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (23 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -45 +45 @@
 *******************************************************************************/
 
-/* WARNING!!! All defines that affetc VGAState should be placed to DevVGA.h !!!
+/* WARNING!!! All defines that affect VGAState should be placed to DevVGA.h !!!
  *            NEVER place them here as this would lead to VGAState inconsistency
  *            across different .cpp files !!!
@@ -109 +109 @@
 #include <VBox/vmm/pgm.h>
 #ifdef IN_RING3
-#include <iprt/alloc.h>
-#include <iprt/ctype.h>
+# include <iprt/alloc.h>
+# include <iprt/ctype.h>
 #endif /* IN_RING3 */
 #include <iprt/assert.h>
@@ -1505 +1505 @@
 
 /* return true if the palette was modified */
-static int update_palette16(VGAState *s)
-{
-    int full_update, i;
+static bool update_palette16(VGAState *s)
+{
+    bool full_update = false;
+    int i;
     uint32_t v, col, *palette;
 
-    full_update = 0;
     palette = s->last_palette;
     for(i = 0; i < 16; i++) {
@@ -1523 +1523 @@
                               c6_to_8(s->palette[v + 2]));
         if (col != palette[i]) {
-            full_update = 1;
+            full_update = true;
             palette[i] = col;
         }
@@ -1531 +1531 @@
 
 /* return true if the palette was modified */
-static int update_palette256(VGAState *s)
-{
-    int full_update, i;
+static bool update_palette256(VGAState *s)
+{
+    bool full_update = false;
+    int i;
     uint32_t v, col, *palette;
     int wide_dac;
 
-    full_update = 0;
     palette = s->last_palette;
     v = 0;
@@ -1552 +1552 @@
                                   c6_to_8(s->palette[v + 2]));
         if (col != palette[i]) {
-            full_update = 1;
+            full_update = true;
             palette[i] = col;
         }
@@ -1597 +1597 @@
 
 /* update start_addr and line_offset. Return TRUE if modified */
-static int update_basic_params(VGAState *s)
-{
-    int full_update;
+static bool update_basic_params(VGAState *s)
+{
+    bool full_update = false;
     uint32_t start_addr, line_offset, line_compare;
-
-    full_update = 0;
 
     s->get_offsets(s, &line_offset, &start_addr, &line_compare);
@@ -1612 +1610 @@
         s->start_addr = start_addr;
         s->line_compare = line_compare;
-        full_update = 1;
+        full_update = true;
     }
     return full_update;
@@ -1678 +1676 @@
  * - flashing
  */
-static int vga_draw_text(VGAState *s, int full_update, bool fFailOnResize, bool reset_dirty)
+static int vga_draw_text(VGAState *s, bool full_update, bool fFailOnResize, bool reset_dirty)
 {
     int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr;
@@ -1700 +1698 @@
     if (offset != s->font_offsets[0]) {
         s->font_offsets[0] = offset;
-        full_update = 1;
+        full_update = true;
     }
     font_base[0] = s->CTX_SUFF(vram_ptr) + offset;
@@ -1708 +1706 @@
     if (offset != s->font_offsets[1]) {
         s->font_offsets[1] = offset;
-        full_update = 1;
+        full_update = true;
     }
     if (s->plane_updated & (1 << 2)) {
@@ -1714 +1712 @@
            indicates the font may have been modified */
         s->plane_updated = 0;
-        full_update = 1;
+        full_update = true;
     }
     full_update |= update_basic_params(s);
@@ -1762 +1760 @@
         s->last_ch = cheight;
         s->last_cw = cw;
-        full_update = 1;
+        full_update = true;
         if (rc == VINF_VGA_RESIZE_IN_PROGRESS)
             return rc;
@@ -2060 +2058 @@
  * graphic modes
  */
-static int vga_draw_graphic(VGAState *s, int full_update, bool fFailOnResize, bool reset_dirty)
-{
-    int y1, y2, y, update, page_min, page_max, linesize, y_start, double_scan;
+static int vga_draw_graphic(VGAState *s, bool full_update, bool fFailOnResize, bool reset_dirty)
+{
+    int y1, y2, y, page_min, page_max, linesize, y_start, double_scan;
     int width, height, shift_control, line_offset, page0, page1, bwidth, bits;
     int disp_width, multi_run;
@@ -2068 +2066 @@
     uint32_t v, addr1, addr;
     vga_draw_line_func *vga_draw_line;
-    int offsets_changed;
-
-    offsets_changed = update_basic_params(s);
+
+    bool offsets_changed = update_basic_params(s);
 
     full_update |= offsets_changed;
@@ -2082 +2079 @@
     if (shift_control != s->shift_control ||
         double_scan != s->double_scan) {
-        full_update = 1;
+        full_update = true;
         s->shift_control = shift_control;
         s->double_scan = double_scan;
@@ -2149 +2146 @@
         if (rc != VINF_SUCCESS)  /* Return any rc, particularly VINF_VGA_RESIZE_IN_PROGRESS, to the caller. */
             return rc;
-        full_update = 1;
+        full_update = true;
     }
     vga_draw_line = vga_draw_line_table[v * 4 + get_depth_index(s->pDrv->cBits)];
@@ -2184 +2181 @@
         page0 = addr & TARGET_PAGE_MASK;
         page1 = (addr + bwidth - 1) & TARGET_PAGE_MASK;
-        update = full_update | vga_is_dirty(s, page0) | vga_is_dirty(s, page1);
+        bool update = full_update | vga_is_dirty(s, page0) | vga_is_dirty(s, page1);
         if (page1 - page0 > TARGET_PAGE_SIZE) {
             /* if wide line, can use another page */
@@ -2276 +2273 @@
 {
     int rc = VINF_SUCCESS;
-    int full_update, graphic_mode;
+    int graphic_mode;
 
     if (s->pDrv->cBits == 0) {
@@ -2343 +2340 @@
         }
 
-        full_update = 0;
         if (!(s->ar_index & 0x20) || (s->sr[0x01] & 0x20)) {
             graphic_mode = GMODE_BLANK;
@@ -2349 +2345 @@
             graphic_mode = s->gr[6] & 1;
         }
-        if (graphic_mode != s->graphic_mode) {
+        bool full_update = graphic_mode != s->graphic_mode;
+        if (full_update) {
             s->graphic_mode = graphic_mode;
-            full_update = 1;
         }
         switch(graphic_mode) {
@@ -4897 +4893 @@
 
     cbPixelSrc = (s->get_bpp(s) + 7) / 8;
-    s->get_offsets (s, &cbLineSrc, &u32OffsetSrc, &u32Dummy);
+    s->get_offsets(s, &cbLineSrc, &u32OffsetSrc, &u32Dummy);
 
     /* Assume that rendering is performed only on visible part of VRAM.