From d51f6480a0e6d473ce4fe96ed561f395fc563ffc Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Wed, 4 Mar 2020 17:37:34 +0000
Subject: [PATCH] Some fixes for the "multiple NICs" support. - Fixed ne2k
 parameter save function. - For backward compatibility, card #0 defaults to
 PCI if the ne2k is assigned   to at least one PCI slot. - The "bootrom"
 parameter is only valid for the PCI card type.

---
 bochs/config.cc             |  2 ++
 bochs/iodev/network/ne2k.cc | 28 +++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/bochs/config.cc b/bochs/config.cc
index b1f7937a9..e7a092bca 100644
--- a/bochs/config.cc
+++ b/bochs/config.cc
@@ -3090,6 +3090,8 @@ int bx_write_param_list(FILE *fp, bx_list_c *base, const char *optname, bx_bool
       }
       if (optname == NULL) {
         sprintf(bxrcline, "%s: ", base->get_name());
+      } else if (isspace(optname[strlen(optname)-1])) {
+        sprintf(bxrcline, "%s", optname);
       } else {
         sprintf(bxrcline, "%s: ", optname);
       }
diff --git a/bochs/iodev/network/ne2k.cc b/bochs/iodev/network/ne2k.cc
index 152d8f55f..e4dd067df 100644
--- a/bochs/iodev/network/ne2k.cc
+++ b/bochs/iodev/network/ne2k.cc
@@ -76,7 +76,7 @@ void ne2k_init_options(void)
       "Type of NE2K NIC emulation",
       "Type of the NE2K NIC emulation",
       ne2k_types_list,
-      (card==0)?BX_NE2K_TYPE_PCI:BX_NE2K_TYPE_ISA,
+      BX_NE2K_TYPE_ISA,
       BX_NE2K_TYPE_ISA);
     bx_param_num_c *ioaddr = new bx_param_num_c(menu,
       "ioaddr",
@@ -96,12 +96,15 @@ void ne2k_init_options(void)
     deplist = menu->clone();
     deplist->remove("ioaddr");
     deplist->remove("irq");
+    deplist->remove("bootrom");
     enabled->set_dependent_list(deplist);
     deplist = new bx_list_c(NULL);
     deplist->add(ioaddr);
     deplist->add(irq);
-    type->set_dependent_list(deplist, 1);
-    type->set_dependent_bitmap(BX_NE2K_TYPE_PCI, 0);
+    deplist->add(menu->get_by_name("bootrom"));
+    type->set_dependent_list(deplist, 0);
+    type->set_dependent_bitmap(BX_NE2K_TYPE_ISA, 0x3);
+    type->set_dependent_bitmap(BX_NE2K_TYPE_PCI, 0x4);
   }
 }
 
@@ -130,6 +133,7 @@ Bit32s ne2k_options_parser(const char *context, int num_params, char *params[])
     for (int i = first; i < num_params; i++) {
       if (!strncmp(params[i], "type=", 5)) {
         SIM->get_param_enum("type", base)->set_by_name(&params[i][5]);
+        valid |= 0x08;
       } else if (!strncmp(params[i], "ioaddr=", 7)) {
         SIM->get_param_num("ioaddr", base)->set(strtoul(&params[i][7], NULL, 16));
         valid |= 0x01;
@@ -143,14 +147,17 @@ Bit32s ne2k_options_parser(const char *context, int num_params, char *params[])
         }
       }
     }
-    if (SIM->get_param_enum("type", base)->get() == BX_NE2K_TYPE_PCI) {
-      valid |= 0x08;
+    if (((valid & 0x08) == 0) && (card == 0) && SIM->is_pci_device("ne2k")) {
+      SIM->get_param_enum("type", base)->set(BX_NE2K_TYPE_PCI);
+      valid |= 0x10;
+    } else if (SIM->get_param_enum("type", base)->get() == BX_NE2K_TYPE_PCI) {
+      valid |= 0x10;
     }
     if ((valid & 0xc0) == 0) {
       SIM->get_param_bool("enabled", base)->set(1);
     }
     if (valid < 0x80) {
-      if (((valid & 0x08) == 0) && ((valid & 0x03) != 0x03)) {
+      if (((valid & 0x10) == 0) && ((valid & 0x03) != 0x03)) {
         BX_ERROR(("%s: 'ne2k' directive incomplete (ioaddr and irq are required)", context));
         valid |= 0x80;
       }
@@ -170,7 +177,14 @@ Bit32s ne2k_options_parser(const char *context, int num_params, char *params[])
 
 Bit32s ne2k_options_save(FILE *fp)
 {
-  return SIM->write_param_list(fp, (bx_list_c*) SIM->get_param(BXPN_NE2K), NULL, 0);
+  char pname[16], ne2kstr[20];
+
+  for (Bit8u card = 0; card < 4; card++) {
+    sprintf(pname, "%s%d", BXPN_NE2K, card);
+    sprintf(ne2kstr, "ne2k: card=%d, ", card);
+    SIM->write_param_list(fp, (bx_list_c*) SIM->get_param(pname), ne2kstr, 0);
+  }
+  return 0;
 }
 
 // device plugin entry points