From 252c66984135647caa2e7aaa53b6a3e9aaa0356c Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Thu, 27 Apr 2006 11:58:07 +0000
Subject: [PATCH] Remove unused members in vga and svga (Volker) Change PANIC
 to ERROR in keyboard port 64 handler

---
 bochs/iodev/keyboard.cc    | 11 ++++++-----
 bochs/iodev/svga_cirrus.cc |  8 +-------
 bochs/iodev/svga_cirrus.h  |  3 +--
 bochs/iodev/vga.h          |  3 +--
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/bochs/iodev/keyboard.cc b/bochs/iodev/keyboard.cc
index 1deec6a6a..d1ce094ac 100644
--- a/bochs/iodev/keyboard.cc
+++ b/bochs/iodev/keyboard.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: keyboard.cc,v 1.114 2006-04-16 10:12:32 vruppert Exp $
+// $Id: keyboard.cc,v 1.115 2006-04-27 11:58:07 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -109,7 +109,7 @@ void bx_keyb_c::resetinternals(bx_bool powerup)
 
 void bx_keyb_c::init(void)
 {
-  BX_DEBUG(("Init $Id: keyboard.cc,v 1.114 2006-04-16 10:12:32 vruppert Exp $"));
+  BX_DEBUG(("Init $Id: keyboard.cc,v 1.115 2006-04-27 11:58:07 sshwarts Exp $"));
   Bit32u   i;
 
   DEV_register_irq(1, "8042 Keyboard controller");
@@ -648,13 +648,14 @@ void bx_keyb_c::write(Bit32u address, Bit32u value, unsigned io_len)
                 (unsigned) value));
             return;
           }
-          BX_PANIC(("unsupported io write to keyboard port %x, value = %x",
+          BX_ERROR(("unsupported io write to keyboard port %x, value = %x",
             (unsigned) address, (unsigned) value));
           break;
-        }
+      }
       break;
 
-    default: BX_PANIC(("unknown address in bx_keyb_c::write()"));
+    default:
+      BX_PANIC(("unknown address in bx_keyb_c::write()"));
   }
 }
 
diff --git a/bochs/iodev/svga_cirrus.cc b/bochs/iodev/svga_cirrus.cc
index ece4d4da7..9992aaae7 100644
--- a/bochs/iodev/svga_cirrus.cc
+++ b/bochs/iodev/svga_cirrus.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: svga_cirrus.cc,v 1.30 2006-03-07 21:11:19 sshwarts Exp $
+// $Id: svga_cirrus.cc,v 1.31 2006-04-27 11:58:07 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // Copyright (c) 2004 Makoto Suzuki (suzu)
@@ -237,7 +237,6 @@ bx_svga_cirrus_c::bx_svga_cirrus_c() : bx_vga_c ()
 {
   put("CLVGA");
   vidmem = NULL;
-  tilemem = NULL;
 }
 
 bx_svga_cirrus_c::~bx_svga_cirrus_c()
@@ -245,9 +244,6 @@ bx_svga_cirrus_c::~bx_svga_cirrus_c()
   if (vidmem != NULL) {
     delete [] vidmem;
   }
-  if (tilemem != NULL) {
-    delete [] tilemem;
-  }
 }
 
 void bx_svga_cirrus_c::init(void)
@@ -327,8 +323,6 @@ void bx_svga_cirrus_c::svga_init_members()
   // memory allocation.
   if (BX_CIRRUS_THIS vidmem == NULL)
     BX_CIRRUS_THIS vidmem = new Bit8u[CIRRUS_VIDEO_MEMORY_BYTES];
-  if (BX_CIRRUS_THIS tilemem == NULL)
-    BX_CIRRUS_THIS tilemem = new Bit8u[X_TILESIZE * Y_TILESIZE * 4];
 
   // set some registers.
 
diff --git a/bochs/iodev/svga_cirrus.h b/bochs/iodev/svga_cirrus.h
index 4cbfb1004..df2df9cda 100644
--- a/bochs/iodev/svga_cirrus.h
+++ b/bochs/iodev/svga_cirrus.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: svga_cirrus.h,v 1.7 2006-03-07 21:11:20 sshwarts Exp $
+// $Id: svga_cirrus.h,v 1.8 2006-04-27 11:58:07 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // Copyright (c) 2004 Makoto Suzuki (suzu)
@@ -202,7 +202,6 @@ private:
   unsigned svga_dispbpp;
 
   Bit8u *vidmem;
-  Bit8u *tilemem;
   Bit32u bank_base[2];
   Bit32u bank_limit[2];
   Bit32u memsize;
diff --git a/bochs/iodev/vga.h b/bochs/iodev/vga.h
index 22894aaf8..c6812ac04 100644
--- a/bochs/iodev/vga.h
+++ b/bochs/iodev/vga.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: vga.h,v 1.52 2006-03-07 21:11:20 sshwarts Exp $
+// $Id: vga.h,v 1.53 2006-04-27 11:58:07 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -272,7 +272,6 @@ protected:
     bx_bool  vga_tile_updated[BX_NUM_X_TILES][BX_NUM_Y_TILES];
     Bit8u vga_memory[256 * 1024];
     Bit8u text_snapshot[128 * 1024]; // current text snapshot
-    Bit8u rgb[3 * 256];
     Bit8u tile[X_TILESIZE * Y_TILESIZE * 4]; /**< Currently allocates the tile as large as needed. */
     Bit16u charmap_address;
     bx_bool x_dotclockdiv2;