- remove unused "split" disk mode
- fix value displayed in wx for clock.time0 parameter
This commit is contained in:
Christophe Bothamy
parent
8d8ae28b2f
commit
4942684e51
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: siminterface.h,v 1.104 2003-08-19 00:10:39 cbothamy Exp $
|
||||
// $Id: siminterface.h,v 1.105 2003-08-22 01:00:58 cbothamy Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Before I can describe what this file is for, I have to make the
|
||||
@ -1182,13 +1182,13 @@ enum {
|
||||
#define BX_ATA_MODE_DLL_HD 3
|
||||
#define BX_ATA_MODE_SPARSE 4
|
||||
#define BX_ATA_MODE_VMWARE3 5
|
||||
#define BX_ATA_MODE_SPLIT 6
|
||||
#define BX_ATA_MODE_UNDOABLE 7
|
||||
#define BX_ATA_MODE_GROWING 8
|
||||
#define BX_ATA_MODE_VOLATILE 9
|
||||
#define BX_ATA_MODE_Z_UNDOABLE 10
|
||||
#define BX_ATA_MODE_Z_VOLATILE 11
|
||||
#define BX_ATA_MODE_LAST 11
|
||||
#define BX_ATA_MODE_UNDOABLE 6
|
||||
#define BX_ATA_MODE_GROWING 7
|
||||
#define BX_ATA_MODE_VOLATILE 8
|
||||
#define BX_ATA_MODE_Z_UNDOABLE 9
|
||||
#define BX_ATA_MODE_Z_VOLATILE 10
|
||||
#define BX_ATA_MODE_LAST 10
|
||||
// #define BX_ATA_MODE_SPLIT 6
|
||||
|
||||
#define BX_CLOCK_SYNC_NONE 0
|
||||
#define BX_CLOCK_SYNC_REALTIME 1
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////
|
||||
// $Id: wxmain.cc,v 1.88 2003-08-21 18:26:18 vruppert Exp $
|
||||
// $Id: wxmain.cc,v 1.89 2003-08-22 01:00:58 cbothamy Exp $
|
||||
/////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// wxmain.cc implements the wxWindows frame, toolbar, menus, and dialogs.
|
||||
@ -321,6 +321,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU(ID_Edit_Speed, MyFrame::OnEditSpeed)
|
||||
EVT_MENU(ID_Edit_Sound, MyFrame::OnEditSound)
|
||||
EVT_MENU(ID_Edit_Cmos, MyFrame::OnEditCmos)
|
||||
EVT_MENU(ID_Edit_Clock, MyFrame::OnEditClock)
|
||||
EVT_MENU(ID_Edit_Network, MyFrame::OnEditNet)
|
||||
EVT_MENU(ID_Edit_Keyboard, MyFrame::OnEditKeyboard)
|
||||
EVT_MENU(ID_Edit_Serial_Parallel, MyFrame::OnEditSerialParallel)
|
||||
@ -433,6 +434,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
|
||||
menuEdit->Append( ID_Edit_Speed, "&Speed..." );
|
||||
menuEdit->Append( ID_Edit_Sound, "Sound..." );
|
||||
menuEdit->Append( ID_Edit_Cmos, "&CMOS..." );
|
||||
menuEdit->Append( ID_Edit_Clock, "&Clock..." );
|
||||
menuEdit->Append( ID_Edit_Network, "&Network..." );
|
||||
menuEdit->Append( ID_Edit_Keyboard, "&Keyboard..." );
|
||||
menuEdit->Append( ID_Edit_Serial_Parallel, "&Serial/Parallel..." );
|
||||
@ -642,7 +644,7 @@ void MyFrame::OnEditSpeed(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
ParamDialog dlg (this, -1);
|
||||
dlg.AddParam (SIM->get_param (BXP_IPS));
|
||||
dlg.AddParam (SIM->get_param (BXP_CLOCK_SYNC));
|
||||
dlg.AddParam (SIM->get_param (BXP_REALTIME_PIT));
|
||||
dlg.ShowModal ();
|
||||
}
|
||||
|
||||
@ -661,7 +663,17 @@ void MyFrame::OnEditCmos(wxCommandEvent& WXUNUSED(event))
|
||||
ParamDialog dlg (this, -1);
|
||||
dlg.AddParam (SIM->get_param (BXP_CMOS_IMAGE));
|
||||
dlg.AddParam (SIM->get_param (BXP_CMOS_PATH));
|
||||
dlg.AddParam (SIM->get_param (BXP_CLOCK_TIME0));
|
||||
//dlg.AddParam (SIM->get_param (BXP_CMOS_TIME0));
|
||||
dlg.ShowModal ();
|
||||
}
|
||||
|
||||
void MyFrame::OnEditClock(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
ParamDialog dlg (this, -1);
|
||||
bx_list_c *list = (bx_list_c*) SIM->get_param (BXP_CLOCK);
|
||||
dlg.SetTitle (list->get_name ());
|
||||
for (int i=0; i<list->get_size (); i++)
|
||||
dlg.AddParam (list->get (i));
|
||||
dlg.ShowModal ();
|
||||
}
|
||||
|
||||
@ -1026,6 +1038,7 @@ void MyFrame::simStatusChanged (StatusChange change, bx_bool popupNotify) {
|
||||
menuEdit->Enable( ID_Edit_Speed, canConfigure);
|
||||
menuEdit->Enable( ID_Edit_Sound, canConfigure);
|
||||
menuEdit->Enable( ID_Edit_Cmos, canConfigure);
|
||||
menuEdit->Enable( ID_Edit_Clock, canConfigure);
|
||||
menuEdit->Enable( ID_Edit_Network, canConfigure);
|
||||
menuEdit->Enable( ID_Edit_Keyboard, canConfigure);
|
||||
menuEdit->Enable( ID_Edit_Serial_Parallel, canConfigure);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////
|
||||
// $Id: wxmain.h,v 1.39 2002-12-12 16:31:41 bdenney Exp $
|
||||
// $Id: wxmain.h,v 1.40 2003-08-22 01:00:58 cbothamy Exp $
|
||||
/////////////////////////////////////////////////////////////////
|
||||
// This file defines variables and classes that the wxWindows .cc files
|
||||
// share. It should be included only by wx.cc and wxmain.cc.
|
||||
@ -41,6 +41,7 @@ enum
|
||||
ID_Edit_Speed,
|
||||
ID_Edit_Sound,
|
||||
ID_Edit_Cmos,
|
||||
ID_Edit_Clock,
|
||||
ID_Edit_Network,
|
||||
ID_Edit_Keyboard,
|
||||
ID_Edit_Serial_Parallel,
|
||||
@ -181,6 +182,7 @@ public:
|
||||
void OnEditSpeed(wxCommandEvent& event);
|
||||
void OnEditSound(wxCommandEvent& event);
|
||||
void OnEditCmos(wxCommandEvent& event);
|
||||
void OnEditClock(wxCommandEvent& event);
|
||||
void OnEditNet(wxCommandEvent& event);
|
||||
void OnEditKeyboard(wxCommandEvent& event);
|
||||
void OnEditSerialParallel(wxCommandEvent& event);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: main.cc,v 1.236 2003-08-19 00:10:38 cbothamy Exp $
|
||||
// $Id: main.cc,v 1.237 2003-08-22 01:00:58 cbothamy Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -1352,8 +1352,10 @@ void bx_init_options ()
|
||||
bx_options.clock.Otime0,
|
||||
NULL
|
||||
};
|
||||
#if !BX_WITH_WX
|
||||
bx_options.clock.Osync->set_format ("sync=%s");
|
||||
bx_options.clock.Otime0->set_format (", Initial time=%d");
|
||||
#endif
|
||||
bx_options.clock.Osync->set_ask_format ("Enter Synchronisation method: [%s] ");
|
||||
bx_options.clock.Otime0->set_ask_format ("Enter Initial CMOS time (1:localtime, 2:utc, other:time in seconds): [%d] ");
|
||||
menu = new bx_list_c (BXP_CLOCK, "Clock parameters", "", clock_init_list);
|
||||
@ -2958,9 +2960,9 @@ parse_line_formatted(char *context, int num_params, char *params[])
|
||||
else if (!strcmp(params[i], "mode=vmware3")) {
|
||||
bx_options.atadevice[channel][slave].Omode->set (BX_ATA_MODE_VMWARE3);
|
||||
}
|
||||
else if (!strcmp(params[i], "mode=split")) {
|
||||
bx_options.atadevice[channel][slave].Omode->set (BX_ATA_MODE_SPLIT);
|
||||
}
|
||||
// else if (!strcmp(params[i], "mode=split")) {
|
||||
// bx_options.atadevice[channel][slave].Omode->set (BX_ATA_MODE_SPLIT);
|
||||
// }
|
||||
else if (!strcmp(params[i], "mode=undoable")) {
|
||||
bx_options.atadevice[channel][slave].Omode->set (BX_ATA_MODE_UNDOABLE);
|
||||
}
|
||||
@ -3931,9 +3933,9 @@ bx_write_atadevice_options (FILE *fp, Bit8u channel, Bit8u drive, bx_atadevice_o
|
||||
case BX_ATA_MODE_VMWARE3:
|
||||
fprintf (fp, ", mode=vmware3");
|
||||
break;
|
||||
case BX_ATA_MODE_SPLIT:
|
||||
fprintf (fp, ", mode=split");
|
||||
break;
|
||||
// case BX_ATA_MODE_SPLIT:
|
||||
// fprintf (fp, ", mode=split");
|
||||
// break;
|
||||
case BX_ATA_MODE_UNDOABLE:
|
||||
fprintf (fp, ", mode=undoable");
|
||||
break;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user