Uthernet2 as a Card.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
jvernet · Dec 3, 2021 · 6e42274 · 6e42274
2 parents 9439b1b + 3128fdb
commit 6e42274
Show file tree

Hide file tree

Showing 7 changed files with 862 additions and 801 deletions.
diff --git a/source/CardManager.cpp b/source/CardManager.cpp
@@ -41,6 +41,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "SerialComms.h"
 #include "SNESMAX.h"
 #include "VidHD.h"
+#include "linux/network/uthernet2.h"
 
 void CardManager::InsertInternal(UINT slot, SS_CARDTYPE type)
 {
@@ -92,7 +93,7 @@ void CardManager::InsertInternal(UINT slot, SS_CARDTYPE type)
 		m_slot[slot] = new DummyCard(type, slot);
 		break;
 	case CT_Uthernet2:
-		m_slot[slot] = new DummyCard(type, slot);
+		m_slot[slot] = new Uthernet2(slot);
 		break;
 	case CT_FourPlay:
 		m_slot[slot] = new FourPlayCard(slot);

diff --git a/source/frontends/common2/utils.cpp b/source/frontends/common2/utils.cpp
@@ -2,8 +2,6 @@
 #include "frontends/common2/utils.h"
 #include "frontends/common2/programoptions.h"
 
-#include "linux/network/uthernet2.h"
-
 #include "SaveState.h"
 
 #include "Common.h"
@@ -62,20 +60,6 @@ namespace common2
     }
   }
 
-  void LoadUthernet2()
-  {
-    CardManager & cardManager = GetCardMgr();
-    for (UINT slot = SLOT1; slot < NUM_SLOTS; slot++)
-    {
-      if (cardManager.QuerySlot(slot) == CT_Uthernet2)
-      {
-        // AppleWin does not know anything about this
-        registerUthernet2(slot);
-        break;
-      }
-    }
-  }
-
   void InitialiseEmulator()
   {
 #ifdef RIFF_SPKR
@@ -92,7 +76,6 @@ namespace common2
 
     GetVideo().SetVidHD(false);
     LoadConfiguration();
-    LoadUthernet2();
     SetCurrentCLK6502();
     GetAppleWindowTitle();
     GetFrame().FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES | DRAW_DISK_STATUS);
@@ -131,7 +114,6 @@ namespace common2
     MB_Destroy();
     DSUninit();
 
-    unRegisterUthernet2();
     tfe_shutdown();
 
     if (cardManager.QuerySlot(SLOT7) == CT_GenericHDD)

diff --git a/source/frontends/sdl/imgui/sdlsettings.cpp b/source/frontends/sdl/imgui/sdlsettings.cpp
@@ -331,6 +331,8 @@ namespace sa2
                 if (ImGui::Selectable(getCardName(card).c_str(), isSelected))
                 {
                   SetExpansionMemType(card);
+                  CreateLanguageCard();
+                  MemInitializeIO();
                 }
                 if (isSelected)
                 {

diff --git a/source/frontends/sdl/imgui/settingshelper.cpp b/source/frontends/sdl/imgui/settingshelper.cpp
@@ -3,6 +3,7 @@
 #include "Registry.h"
 #include "Harddisk.h"
 #include "Core.h"
+#include "Memory.h"
 #include "Debugger/Debug.h"
 
 #include "Tfe/tfe.h"
@@ -102,8 +103,8 @@ namespace
       {3, {CT_Empty, CT_Uthernet, CT_Uthernet2, CT_VidHD}},
       {4, {CT_Empty, CT_MockingboardC, CT_MouseInterface, CT_Phasor, CT_Uthernet2}},
       {5, {CT_Empty, CT_MockingboardC, CT_Z80, CT_SAM, CT_Disk2, CT_FourPlay, CT_SNESMAX, CT_Uthernet2}},
-      {6, {CT_Empty, CT_Disk2}},
-      {7, {CT_Empty, CT_GenericHDD}},
+      {6, {CT_Empty, CT_Disk2, CT_Uthernet2}},
+      {7, {CT_Empty, CT_GenericHDD, CT_Uthernet2}},
     };
 
     const std::vector<SS_CARDTYPE> expansionCards =
@@ -183,19 +184,11 @@ namespace sa2
       }
     };
 
-    if (card == CT_Uthernet2)
-    {
-      // only 1 Uthernet2 allowed
-      for (size_t s = SLOT1; s < NUM_SLOTS; ++s)
-      {
-        if (cardManager.QuerySlot(s) == card)
-        {
-          cardManager.Insert(s, CT_Empty);
-        }
-      }
-    }
-
     cardManager.Insert(slot, card);
+
+    // keep everything consistent
+    // a bit of a heavy call, but nothing simpler is available now
+    MemInitializeIO();
   }
 
   void setVideoStyle(Video & video, const VideoStyle_e style, const bool enabled)

diff --git a/source/frontends/sdl/main.cpp b/source/frontends/sdl/main.cpp
@@ -7,7 +7,6 @@
 #include "StdAfx.h"
 #include "linux/benchmark.h"
 #include "linux/context.h"
-#include "linux/network/uthernet2.h"
 
 #include "frontends/common2/fileregistry.h"
 #include "frontends/common2/utils.h"
@@ -143,7 +142,6 @@ void run_sdl(int argc, const char * argv [])
 
       eventTimer.tic();
       sa2::writeAudio();
-      processEventsUthernet2(5);
       frame->ProcessEvents(quit);
       eventTimer.toc();