From 1127447a10b0cdbf0ec921311dfb91b7554351fe Mon Sep 17 00:00:00 2001 From: tomcw Date: Thu, 15 Aug 2024 20:08:38 +0100 Subject: [PATCH] U1, U2: small refactor --- source/Uthernet1.cpp | 3 +-- source/Uthernet2.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source/Uthernet1.cpp b/source/Uthernet1.cpp index b016b45a..d24e64ad 100644 --- a/source/Uthernet1.cpp +++ b/source/Uthernet1.cpp @@ -37,7 +37,6 @@ #include "Tfe/tfesupp.h" #include "Tfe/NetworkBackend.h" #include "Tfe/PCapBackend.h" -#include "../Windows/Win32Frame.h" /* Makros for reading and writing the visible TFE register: */ #define GET_TFE_8( _xxx_ ) \ @@ -1023,7 +1022,7 @@ void Uthernet1::InitializeIO(LPBYTE pCxRomPeripheral) // Interface doesn't exist or user picked an interface that isn't Ethernet! // . So setup as a "null" card: I/O reads from floating bus & writes go to null RegisterIoHandler(m_slot, IO_Null, IO_Null, TfeIoCxxx, TfeIoCxxx, this, NULL); - Win32Frame::GetWin32Frame().FrameMessageBox("Reconfigure the Interface via 'Ethernet Settings'.", "Uthernet 1 interface isn't valid!", MB_ICONEXCLAMATION | MB_SETFOREGROUND); + GetFrame().FrameMessageBox("Uthernet interface isn't valid!\nReconfigure the Interface via 'Ethernet Settings'.", "Uthernet Interface", MB_ICONEXCLAMATION | MB_SETFOREGROUND); } } diff --git a/source/Uthernet2.cpp b/source/Uthernet2.cpp index 6da786ae..31645268 100644 --- a/source/Uthernet2.cpp +++ b/source/Uthernet2.cpp @@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Tfe/DNS.h" #include "W5100.h" #include "../Registry.h" -#include "../Windows/Win32Frame.h" // Virtual DNS // Virtual DNS is an extension to the W5100 @@ -1480,7 +1479,7 @@ void Uthernet2::InitializeIO(LPBYTE pCxRomPeripheral) // Interface doesn't exist or user picked an interface that isn't Ethernet! // . So setup as a "null" card: I/O reads from floating bus & writes go to null RegisterIoHandler(m_slot, IO_Null, IO_Null, IO_Null, IO_Null, this, nullptr); - Win32Frame::GetWin32Frame().FrameMessageBox("Reconfigure the Interface via 'Ethernet Settings'.", "Uthernet II interface isn't valid!", MB_ICONEXCLAMATION | MB_SETFOREGROUND); + GetFrame().FrameMessageBox("Uthernet II interface isn't valid!\nReconfigure the Interface via 'Ethernet Settings'.", "Uthernet Interface", MB_ICONEXCLAMATION | MB_SETFOREGROUND); } }