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

- renamed update_floppy_status_buttons() to update_drive_status_buttons() since

Browse Source 
it handles the cdrom status too
This commit is contained in:
Volker Ruppert 2002-03-17 20:57:54 +00:00
parent 6518957fe4
commit 8263d15e76
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/gui/gui.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: gui.cc,v 1.38 2002-03-16 11:30:06 vruppert Exp $
// $Id: gui.cc,v 1.39 2002-03-17 20:57:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -154,7 +154,7 @@ bx_gui_c::init(int argc, char **argv, unsigned tilewidth, unsigned tileheight)
}
void
bx_gui_c::update_floppy_status_buttons (void) {
bx_gui_c::update_drive_status_buttons (void) {
BX_GUI_THIS floppyA_status =
bx_devices.floppy->get_media_status (0)
&& bx_options.floppya.Oinitial_status->get ();
@ -198,7 +198,7 @@ bx_gui_c::floppyA_handler(void)
{
BX_GUI_THIS floppyA_status = !BX_GUI_THIS floppyA_status;
bx_devices.floppy->set_media_status(0, BX_GUI_THIS floppyA_status);
BX_GUI_THIS update_floppy_status_buttons ();
BX_GUI_THIS update_drive_status_buttons ();
}
void
@ -206,7 +206,7 @@ bx_gui_c::floppyB_handler(void)
{
BX_GUI_THIS floppyB_status = !BX_GUI_THIS floppyB_status;
bx_devices.floppy->set_media_status(1, BX_GUI_THIS floppyB_status);
BX_GUI_THIS update_floppy_status_buttons ();
BX_GUI_THIS update_drive_status_buttons ();
}
void
@ -214,7 +214,7 @@ bx_gui_c::cdromD_handler(void)
{
BX_GUI_THIS cdromD_status =
bx_devices.hard_drive->set_cd_media_status(!BX_GUI_THIS cdromD_status);
BX_GUI_THIS update_floppy_status_buttons ();
BX_GUI_THIS update_drive_status_buttons ();
}
void

4
bochs/gui/gui.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: gui.h,v 1.25 2002-03-16 11:30:06 vruppert Exp $
// $Id: gui.h,v 1.26 2002-03-17 20:57:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -55,7 +55,7 @@ public:
static void init(int argc, char **argv,
unsigned x_tilesize, unsigned y_tilesize);
void update_floppy_status_buttons (void);
void update_drive_status_buttons (void);
static void mouse_enabled_changed (Boolean val);
static void mouse_enabled_changed_specific (Boolean val);
static void exit(void);

6
bochs/iodev/harddrv.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: harddrv.cc,v 1.50 2002-02-12 16:03:00 cbothamy Exp $
// $Id: harddrv.cc,v 1.51 2002-03-17 20:57:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -128,7 +128,7 @@ bx_hard_drive_c::~bx_hard_drive_c(void)
bx_hard_drive_c::init(bx_devices_c *d, bx_cmos_c *cmos)
{
BX_HD_THIS devices = d;
BX_DEBUG(("Init $Id: harddrv.cc,v 1.50 2002-02-12 16:03:00 cbothamy Exp $"));
BX_DEBUG(("Init $Id: harddrv.cc,v 1.51 2002-03-17 20:57:54 vruppert Exp $"));
/* HARD DRIVE 0 */
@ -1010,7 +1010,7 @@ BX_DEBUG(("IO write to %04x = %02x", (unsigned) address, (unsigned) value));
#endif
BX_HD_THIS s[1].cdrom.ready = 0;
bx_options.cdromd.Oinserted->set(BX_EJECTED);
bx_gui.update_floppy_status_buttons();
bx_gui.update_drive_status_buttons();
}
raise_interrupt();
} else { // Load the disc

14
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.90 2002-03-14 20:14:47 vruppert Exp $
// $Id: main.cc,v 1.91 2002-03-17 20:57:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -180,19 +180,19 @@ bx_param_handler (bx_param_c *param, int set, Bit32s val)
case BXP_CDROM_INSERTED:
if ((set) && (SIM->get_init_done ())) {
bx_devices.hard_drive->set_cd_media_status(val == BX_INSERTED);
bx_gui.update_floppy_status_buttons ();
bx_gui.update_drive_status_buttons ();
}
break;
case BXP_FLOPPYA_STATUS:
if ((set) && (SIM->get_init_done ())) {
bx_devices.floppy->set_media_status(0, val == BX_INSERTED);
bx_gui.update_floppy_status_buttons ();
bx_gui.update_drive_status_buttons ();
}
break;
case BXP_FLOPPYB_STATUS:
if ((set) && (SIM->get_init_done ())) {
bx_devices.floppy->set_media_status(1, val == BX_INSERTED);
bx_gui.update_floppy_status_buttons ();
bx_gui.update_drive_status_buttons ();
}
break;
default:
@ -215,7 +215,7 @@ char *bx_param_string_handler (bx_param_string_c *param, int set, char *val, int
if (SIM->get_init_done ()) {
if (empty) {
bx_devices.floppy->set_media_status(0, 0);
bx_gui.update_floppy_status_buttons ();
bx_gui.update_drive_status_buttons ();
} else {
if (!SIM->get_param_num(BXP_FLOPPYA_TYPE)->get_enabled()) {
BX_ERROR(("Cannot add a floppy drive at runtime"));
@ -239,7 +239,7 @@ char *bx_param_string_handler (bx_param_string_c *param, int set, char *val, int
if (SIM->get_init_done ()) {
if (empty) {
bx_devices.floppy->set_media_status(1, 0);
bx_gui.update_floppy_status_buttons ();
bx_gui.update_drive_status_buttons ();
} else {
if (!SIM->get_param_num(BXP_FLOPPYB_TYPE)->get_enabled ()) {
BX_ERROR(("Cannot add a floppy drive at runtime"));
@ -279,7 +279,7 @@ char *bx_param_string_handler (bx_param_string_c *param, int set, char *val, int
if (SIM->get_init_done ()) {
if (empty) {
bx_devices.hard_drive->set_cd_media_status(0);
bx_gui.update_floppy_status_buttons ();
bx_gui.update_drive_status_buttons ();
} else {
if (!SIM->get_param_num(BXP_CDROM_PRESENT)->get ()) {
BX_ERROR(("Cannot add a cdrom drive at runtime"));