From 48bb9719a6fd0f07dd686b2de79aed15c19746c6 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Mon, 27 Feb 2006 09:37:58 +0000
Subject: [PATCH] - fixed number of initializers for ATA options if
 BX_MAX_ATA_CHANNEL < 4 - changed ask_param() method argument to param pointer
 (fixes win32 cdrom dialog)

---
 bochs/config.cc           |  8 ++++----
 bochs/gui/gui.cc          | 10 +++++-----
 bochs/gui/siminterface.cc | 13 ++++++-------
 bochs/gui/siminterface.h  |  4 ++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/bochs/config.cc b/bochs/config.cc
index a29c319bd..3afdfcfdb 100755
--- a/bochs/config.cc
+++ b/bochs/config.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: config.cc,v 1.86 2006-02-26 22:36:01 vruppert Exp $
+// $Id: config.cc,v 1.87 2006-02-27 09:37:58 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -982,13 +982,13 @@ void bx_init_options()
     { "First HD/CD on channel 3",
     "Second HD/CD on channel 3" }
     };
-  Bit16u ata_default_ioaddr1[BX_MAX_ATA_CHANNEL] = {
+  Bit16u ata_default_ioaddr1[4] = {
     0x1f0, 0x170, 0x1e8, 0x168 
   };
-  Bit16u ata_default_ioaddr2[BX_MAX_ATA_CHANNEL] = {
+  Bit16u ata_default_ioaddr2[4] = {
     0x3f0, 0x370, 0x3e0, 0x360 
   };
-  Bit8u ata_default_irq[BX_MAX_ATA_CHANNEL] = { 
+  Bit8u ata_default_irq[4] = { 
     14, 15, 11, 9 
   };
 
diff --git a/bochs/gui/gui.cc b/bochs/gui/gui.cc
index 83db2240d..9df50c235 100644
--- a/bochs/gui/gui.cc
+++ b/bochs/gui/gui.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: gui.cc,v 1.91 2006-02-24 22:35:46 vruppert Exp $
+// $Id: gui.cc,v 1.92 2006-02-27 09:37:58 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -318,18 +318,18 @@ bx_gui_c::cdromD_handler(void)
     // a dialog asking what disk image you want to switch to.
     // This code handles the first cdrom only. The cdrom drives #2, #3 and
     // #4 are handled in the win32 runtime dialog.
-    bx_param_c *cdrom = SIM->get_first_cdrom ();
+    bx_param_c *cdrom = SIM->get_first_cdrom();
     if (cdrom == NULL)
       return;  // no cdrom found
-    int ret = SIM->ask_param (cdrom->get_id ());
+    int ret = SIM->ask_param(cdrom);
     if (ret > 0) {
-      BX_GUI_THIS update_drive_status_buttons ();
+      BX_GUI_THIS update_drive_status_buttons();
     }
     return;
   }
   BX_GUI_THIS cdromD_status =
     DEV_hd_set_cd_media_status(handle, !BX_GUI_THIS cdromD_status);
-  BX_GUI_THIS update_drive_status_buttons ();
+  BX_GUI_THIS update_drive_status_buttons();
 }
 
   void
diff --git a/bochs/gui/siminterface.cc b/bochs/gui/siminterface.cc
index 1b753e372..f7dada52c 100644
--- a/bochs/gui/siminterface.cc
+++ b/bochs/gui/siminterface.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: siminterface.cc,v 1.121 2006-02-26 19:11:20 vruppert Exp $
+// $Id: siminterface.cc,v 1.122 2006-02-27 09:37:58 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // See siminterface.h for description of the siminterface concept.
@@ -95,7 +95,7 @@ public:
   virtual void get_notify_callback (bxevent_handler *func, void **arg);
   virtual BxEvent* sim_to_ci_event (BxEvent *event);
   virtual int log_msg (const char *prefix, int level, const char *msg);
-  virtual int ask_param(bx_id which);
+  virtual int ask_param(bx_param_c *param);
   virtual int ask_param(const char *pname);
   // ask the user for a pathname
   virtual int ask_filename (char *filename, int maxlen, char *prompt, char *the_default, int flags);
@@ -634,15 +634,14 @@ bx_real_sim_c::log_msg (const char *prefix, int level, const char *msg)
 // send it to the CI, and wait for the response.  The CI will call the
 // set() method on the parameter if the user changes the value.
 int 
-bx_real_sim_c::ask_param (bx_id param)
+bx_real_sim_c::ask_param(bx_param_c *param)
 {
-  bx_param_c *paramptr = SIM->get_param(param);
-  BX_ASSERT (paramptr != NULL);
+  BX_ASSERT(param != NULL);
   // create appropriate event
   BxEvent event;
   event.type = BX_SYNC_EVT_ASK_PARAM;
-  event.u.param.param = paramptr;
-  sim_to_ci_event (&event);
+  event.u.param.param = param;
+  sim_to_ci_event(&event);
   return event.retcode;
 }
 
diff --git a/bochs/gui/siminterface.h b/bochs/gui/siminterface.h
index d7835a7dd..b04bc48ca 100644
--- a/bochs/gui/siminterface.h
+++ b/bochs/gui/siminterface.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: siminterface.h,v 1.166 2006-02-26 19:11:20 vruppert Exp $
+// $Id: siminterface.h,v 1.167 2006-02-27 09:37:58 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // Intro to siminterface by Bryce Denney:
@@ -1322,7 +1322,7 @@ public:
   virtual int log_msg(const char *prefix, int level, const char *msg) {return -1;}
 
   // tell the CI to ask the user for the value of a parameter.
-  virtual int ask_param(bx_id param) {return -1;}
+  virtual int ask_param(bx_param_c *param) {return -1;}
   virtual int ask_param(const char *pname) {return -1;}
 
   // ask the user for a pathname