[Bochs-cvs] CVS: bochs bochs.h,1.108,1.109 main.cc,1.184,1.185

[Volker R. <vru...@pr...>]

Update of /cvsroot/bochs/bochs
In directory sc8-pr-cvs1:/tmp/cvs-serv13520

Modified Files:
	bochs.h main.cc 
Log Message:
- changed ne2k presence options from "valid" to "present"


Index: bochs.h
===================================================================
RCS file: /cvsroot/bochs/bochs/bochs.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- bochs.h	15 Nov 2002 18:31:52 -0000	1.108
+++ bochs.h	18 Nov 2002 17:16:07 -0000	1.109
@@ -561,7 +561,7 @@
   } bx_cmos_options;
 
 typedef struct {
-  bx_param_bool_c *Ovalid;
+  bx_param_bool_c *Opresent;
   bx_param_num_c *Oioaddr;
   bx_param_num_c *Oirq;
   bx_param_string_c *Omacaddr;

Index: main.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/main.cc,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- main.cc	18 Nov 2002 02:32:53 -0000	1.184
+++ main.cc	18 Nov 2002 17:16:07 -0000	1.185
@@ -114,7 +114,7 @@
         DEV_mouse_enabled_changed (val!=0);
       }
       break;
-    case BXP_NE2K_VALID:
+    case BXP_NE2K_PRESENT:
       if (set) {
         int enable = (val != 0);
         SIM->get_param (BXP_NE2K_IOADDR)->set_enabled (enable);
@@ -1007,7 +1007,7 @@
   menu->get_options ()->set (menu->SHOW_PARENT);
 
   // NE2K options
-  bx_options.ne2k.Ovalid = new bx_param_bool_c (BXP_NE2K_VALID,
+  bx_options.ne2k.Opresent = new bx_param_bool_c (BXP_NE2K_PRESENT,
       "NE2K is present",
       "to be written",
       0);
@@ -1042,7 +1042,7 @@
       "none", BX_PATHNAME_LEN);
   bx_options.ne2k.Oscript->set_ask_format ("Enter new script name, or 'none': [%s] ");
   bx_param_c *ne2k_init_list[] = {
-    bx_options.ne2k.Ovalid,
+    bx_options.ne2k.Opresent,
     bx_options.ne2k.Oioaddr,
     bx_options.ne2k.Oirq,
     bx_options.ne2k.Omacaddr,
@@ -1053,8 +1053,8 @@
   };
   menu = new bx_list_c (BXP_NE2K, "NE2K Configuration", "", ne2k_init_list);
   menu->get_options ()->set (menu->SHOW_PARENT);
-  bx_options.ne2k.Ovalid->set_handler (bx_param_handler);
-  bx_options.ne2k.Ovalid->set (0);
+  bx_options.ne2k.Opresent->set_handler (bx_param_handler);
+  bx_options.ne2k.Opresent->set (0);
 
   // SB16 options
   bx_options.sb16.Opresent = new bx_param_bool_c (BXP_SB16_PRESENT,
@@ -1326,7 +1326,7 @@
 #endif
 
   // ne2k
-  bx_options.ne2k.Ovalid->reset();
+  bx_options.ne2k.Opresent->reset();
   bx_options.ne2k.Oioaddr->reset();
   bx_options.ne2k.Oirq->reset();
   bx_options.ne2k.Omacaddr->reset();
@@ -3194,7 +3194,7 @@
   else if (!strcmp(params[0], "ne2k")) {
     int tmp[6];
     char tmpchar[6];
-    bx_options.ne2k.Ovalid->set (0);
+    bx_options.ne2k.Opresent->set (0);
     if ((num_params < 4) || (num_params > 7)) {
       PARSE_ERR(("%s: ne2k directive malformed.", context));
       }
@@ -3236,7 +3236,7 @@
           }
         }
       }
-    bx_options.ne2k.Ovalid->set (1);
+    bx_options.ne2k.Opresent->set (1);
     }
 
   else if (!strcmp(params[0], "load32bitOSImage")) {
@@ -3452,7 +3452,7 @@
 int
 bx_write_ne2k_options (FILE *fp, bx_ne2k_options *opt)
 {
-  if (!opt->Ovalid->get ()) {
+  if (!opt->Opresent->get ()) {
     fprintf (fp, "# no ne2k\n");
     return 0;
   }