mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused members in vga and svga (Volker)

Browse Source 
Change PANIC to ERROR in keyboard port 64 handler
This commit is contained in:
Stanislav Shwartsman 2006-04-27 11:58:07 +00:00
parent bb1116e569
commit 252c669841
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bochs/iodev/keyboard.cc
View File

@ -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. // Copyright (C) 2002 MandrakeSoft S.A.
@ -109,7 +109,7 @@ void bx_keyb_c::resetinternals(bx_bool powerup)
void bx_keyb_c::init(void) 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; Bit32u i;
DEV_register_irq(1, "8042 Keyboard controller"); 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)); (unsigned) value));
return; 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)); (unsigned) address, (unsigned) value));
break; break;
} }
break; break;
default: BX_PANIC(("unknown address in bx_keyb_c::write()")); default:
BX_PANIC(("unknown address in bx_keyb_c::write()"));
} }
} }

8
bochs/iodev/svga_cirrus.cc
View File

@ -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) // Copyright (c) 2004 Makoto Suzuki (suzu)
@ -237,7 +237,6 @@ bx_svga_cirrus_c::bx_svga_cirrus_c() : bx_vga_c ()
{ {
put("CLVGA"); put("CLVGA");
vidmem = NULL; vidmem = NULL;
tilemem = NULL;
} }
bx_svga_cirrus_c::~bx_svga_cirrus_c() bx_svga_cirrus_c::~bx_svga_cirrus_c()
@ -245,9 +244,6 @@ bx_svga_cirrus_c::~bx_svga_cirrus_c()
if (vidmem != NULL) { if (vidmem != NULL) {
delete [] vidmem; delete [] vidmem;
} }
if (tilemem != NULL) {
delete [] tilemem;
}
} }
void bx_svga_cirrus_c::init(void) void bx_svga_cirrus_c::init(void)
@ -327,8 +323,6 @@ void bx_svga_cirrus_c::svga_init_members()
// memory allocation. // memory allocation.
if (BX_CIRRUS_THIS vidmem == NULL) if (BX_CIRRUS_THIS vidmem == NULL)
BX_CIRRUS_THIS vidmem = new Bit8u[CIRRUS_VIDEO_MEMORY_BYTES]; 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. // set some registers.

3
bochs/iodev/svga_cirrus.h
View File

@ -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) // Copyright (c) 2004 Makoto Suzuki (suzu)
@ -202,7 +202,6 @@ private:
unsigned svga_dispbpp; unsigned svga_dispbpp;
Bit8u *vidmem; Bit8u *vidmem;
Bit8u *tilemem;
Bit32u bank_base[2]; Bit32u bank_base[2];
Bit32u bank_limit[2]; Bit32u bank_limit[2];
Bit32u memsize; Bit32u memsize;

3
bochs/iodev/vga.h
View File

@ -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. // Copyright (C) 2002 MandrakeSoft S.A.
@ -272,7 +272,6 @@ protected:
bx_bool vga_tile_updated[BX_NUM_X_TILES][BX_NUM_Y_TILES]; bx_bool vga_tile_updated[BX_NUM_X_TILES][BX_NUM_Y_TILES];
Bit8u vga_memory[256 * 1024]; Bit8u vga_memory[256 * 1024];
Bit8u text_snapshot[128 * 1024]; // current text snapshot 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. */ Bit8u tile[X_TILESIZE * Y_TILESIZE * 4]; /**< Currently allocates the tile as large as needed. */
Bit16u charmap_address; Bit16u charmap_address;
bx_bool x_dotclockdiv2; bx_bool x_dotclockdiv2;