mirror of https://github.com/bochs-emu/Bochs
- I should not have used BX_CPU_THIS_PTR to address the kill_bochs_request
field in the cpu object; it should only be used within cpu methods. Instead, use BX_CPU(0)->kill_bochs_request.
This commit is contained in:
parent
54a5e86cc6
commit
5744357ffe
|
@ -1,5 +1,5 @@
|
||||||
/////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////
|
||||||
// $Id: keyboard.cc,v 1.55 2002-04-18 00:22:19 bdenney Exp $
|
// $Id: keyboard.cc,v 1.56 2002-06-23 00:01:01 bdenney Exp $
|
||||||
/////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||||
|
@ -70,7 +70,7 @@ bx_keyb_c::bx_keyb_c(void)
|
||||||
memset( &s, 0, sizeof(s) );
|
memset( &s, 0, sizeof(s) );
|
||||||
BX_KEY_THIS put("KBD");
|
BX_KEY_THIS put("KBD");
|
||||||
BX_KEY_THIS settype(KBDLOG);
|
BX_KEY_THIS settype(KBDLOG);
|
||||||
BX_DEBUG(("Init $Id: keyboard.cc,v 1.55 2002-04-18 00:22:19 bdenney Exp $"));
|
BX_DEBUG(("Init $Id: keyboard.cc,v 1.56 2002-06-23 00:01:01 bdenney Exp $"));
|
||||||
}
|
}
|
||||||
|
|
||||||
bx_keyb_c::~bx_keyb_c(void)
|
bx_keyb_c::~bx_keyb_c(void)
|
||||||
|
@ -110,7 +110,7 @@ bx_keyb_c::resetinternals(Boolean powerup)
|
||||||
void
|
void
|
||||||
bx_keyb_c::init(bx_devices_c *d, bx_cmos_c *cmos)
|
bx_keyb_c::init(bx_devices_c *d, bx_cmos_c *cmos)
|
||||||
{
|
{
|
||||||
BX_DEBUG(("Init $Id: keyboard.cc,v 1.55 2002-04-18 00:22:19 bdenney Exp $"));
|
BX_DEBUG(("Init $Id: keyboard.cc,v 1.56 2002-06-23 00:01:01 bdenney Exp $"));
|
||||||
Bit32u i;
|
Bit32u i;
|
||||||
|
|
||||||
BX_KEY_THIS devices = d;
|
BX_KEY_THIS devices = d;
|
||||||
|
@ -1100,7 +1100,7 @@ bx_keyb_c::periodic( Bit32u usec_delta )
|
||||||
{
|
{
|
||||||
multiple=0;
|
multiple=0;
|
||||||
SIM->periodic ();
|
SIM->periodic ();
|
||||||
if (BX_CPU_THIS_PTR kill_bochs_request) return 0;
|
if (BX_CPU(0)->kill_bochs_request) return 0;
|
||||||
bx_gui.handle_events();
|
bx_gui.handle_events();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue