[Bochs-cvs] SF.net SVN: bochs:[11012] trunk/bochs/iodev

[<vru...@us...>]

Revision: 11012
          http://bochs.svn.sourceforge.net/bochs/?rev=11012&view=rev
Author:   vruppert
Date:     2012-01-31 18:53:02 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
- removed definitions that already exist in the vgacore files
- minor fixes and cleanups

Modified Paths:
--------------
    trunk/bochs/iodev/vga.cc
    trunk/bochs/iodev/vga.h

Modified: trunk/bochs/iodev/vga.cc
===================================================================
--- trunk/bochs/iodev/vga.cc	2012-01-30 15:29:22 UTC (rev 11011)
+++ trunk/bochs/iodev/vga.cc	2012-01-31 18:53:02 UTC (rev 11012)
@@ -41,8 +41,6 @@
 
 #define LOG_THIS theVga->
 
-#define VGA_TRACE_FEATURE
-
 // Only reference the array if the tile numbers are within the bounds
 // of the array.  If out of bounds, do nothing.
 #define SET_TILE_UPDATED(xtile, ytile, value)                            \
@@ -58,34 +56,8 @@
      BX_VGA_THIS s.vga_tile_updated[(xtile)+(ytile)*BX_VGA_THIS s.num_x_tiles] \
      : 0)
 
-static const Bit16u charmap_offset[8] = {
-  0x0000, 0x4000, 0x8000, 0xc000,
-  0x2000, 0x6000, 0xa000, 0xe000
-};
-
-static const Bit8u ccdat[16][4] = {
-  { 0x00, 0x00, 0x00, 0x00 },
-  { 0xff, 0x00, 0x00, 0x00 },
-  { 0x00, 0xff, 0x00, 0x00 },
-  { 0xff, 0xff, 0x00, 0x00 },
-  { 0x00, 0x00, 0xff, 0x00 },
-  { 0xff, 0x00, 0xff, 0x00 },
-  { 0x00, 0xff, 0xff, 0x00 },
-  { 0xff, 0xff, 0xff, 0x00 },
-  { 0x00, 0x00, 0x00, 0xff },
-  { 0xff, 0x00, 0x00, 0xff },
-  { 0x00, 0xff, 0x00, 0xff },
-  { 0xff, 0xff, 0x00, 0xff },
-  { 0x00, 0x00, 0xff, 0xff },
-  { 0xff, 0x00, 0xff, 0xff },
-  { 0x00, 0xff, 0xff, 0xff },
-  { 0xff, 0xff, 0xff, 0xff },
-};
-
 bx_vga_c *theVga = NULL;
 
-unsigned old_MSL = 0;
-
 int libvga_LTX_plugin_init(plugin_t *plugin, plugintype_t type, int argc, char *argv[])
 {
   if (type == PLUGTYPE_CORE) {
@@ -315,8 +287,6 @@
 
 void bx_vga_c::write(Bit32u address, Bit32u value, unsigned io_len, bx_bool no_log)
 {
-  bx_bool needs_update = 0;
-
   if (io_len == 2) {
 #if BX_USE_VGA_SMF
     bx_vga_c::write_handler_no_log(0, address, value & 0xff, 1);
@@ -351,12 +321,9 @@
             BX_VGA_THIS s.CRTC.reg[BX_VGA_THIS s.CRTC.address] = value;
             if (!BX_VGA_THIS vbe.enabled || (BX_VGA_THIS vbe.bpp == VBE_DISPI_BPP_4)) {
               // Line offset change
-              BX_VGA_THIS s.line_offset = BX_VGA_THIS s.CRTC.reg[0x13] << 1;
-              if (BX_VGA_THIS s.CRTC.reg[0x14] & 0x40) BX_VGA_THIS s.line_offset <<= 2;
-              else if ((BX_VGA_THIS s.CRTC.reg[0x17] & 0x40) == 0) BX_VGA_THIS s.line_offset <<= 1;
-              needs_update = 1;
-              break;
+              bx_vgacore_c::write(address, value, io_len, no_log);
             }
+            break;
           default:
             bx_vgacore_c::write(address, value, io_len, no_log);
         }
@@ -365,11 +332,6 @@
     default:
       bx_vgacore_c::write(address, value, io_len, no_log);
   }
-
-  if (needs_update) {
-    // Mark all video as updated so the changes will go through
-    BX_VGA_THIS redraw_area(0, 0, BX_VGA_THIS s.last_xres, BX_VGA_THIS s.last_yres);
-  }
 }
 
 Bit64s bx_vga_c::vga_param_handler(bx_param_c *param, int set, Bit64s val)
@@ -853,9 +815,8 @@
     return;
   }
 
-  BX_VGA_THIS s.vga_mem_updated = 1;
-
   if (BX_VGA_THIS vbe.enabled) {
+    BX_VGA_THIS s.vga_mem_updated = 1;
     xmax = BX_VGA_THIS vbe.xres;
     ymax = BX_VGA_THIS vbe.yres;
     xt0 = x0 / X_TILESIZE;

Modified: trunk/bochs/iodev/vga.h
===================================================================
--- trunk/bochs/iodev/vga.h	2012-01-30 15:29:22 UTC (rev 11011)
+++ trunk/bochs/iodev/vga.h	2012-01-31 18:53:02 UTC (rev 11012)
@@ -24,25 +24,6 @@
 #ifndef BX_IODEV_VGA_H
 #define BX_IODEV_VGA_H
 
-// Make colour
-#define MAKE_COLOUR(red, red_shiftfrom, red_shiftto, red_mask, \
-                    green, green_shiftfrom, green_shiftto, green_mask, \
-                    blue, blue_shiftfrom, blue_shiftto, blue_mask) \
-( \
- ((((red_shiftto) > (red_shiftfrom)) ? \
-  (red) << ((red_shiftto) - (red_shiftfrom)) : \
-  (red) >> ((red_shiftfrom) - (red_shiftto))) & \
-  (red_mask)) | \
- ((((green_shiftto) > (green_shiftfrom)) ? \
-  (green) << ((green_shiftto) - (green_shiftfrom)) : \
-  (green) >> ((green_shiftfrom) - (green_shiftto))) & \
-  (green_mask)) | \
- ((((blue_shiftto) > (blue_shiftfrom)) ? \
-  (blue) << ((blue_shiftto) - (blue_shiftfrom)) : \
-  (blue) >> ((blue_shiftfrom) - (blue_shiftto))) & \
-  (blue_mask)) \
-)
-
 // Bochs VBE definitions
 
 #define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB  16
@@ -98,9 +79,6 @@
 
 // End Bochs VBE definitions
 
-#define X_TILESIZE 16
-#define Y_TILESIZE 24
-
 #if BX_USE_VGA_SMF
 #  define BX_VGA_SMF  static
 #  define BX_VGA_THIS theVga->

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.