From fc78a4c99313465ba4ba26ff93dd1d10c5a67d64 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 16 May 2018 16:30:28 -0400
Subject: [PATCH] EXI_DeviceEthernet: Make internal members and functions
 private

Previously, the entirety of CEXIETHERNET was exposed publically, which
wasn't necessary. We simply make the thread function part of the
internal interface, which gives it access to internal data members,
while keeping everything else outside of it.
---
 Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp | 2 +-
 Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp  | 2 +-
 Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp | 2 +-
 Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h  | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp
index 59e056c656..6dbed04f20 100644
--- a/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp
+++ b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp
@@ -63,7 +63,7 @@ bool CEXIETHERNET::SendFrame(const u8* frame, u32 size)
   }
 }
 
-static void ReadThreadHandler(CEXIETHERNET* self)
+void CEXIETHERNET::ReadThreadHandler(CEXIETHERNET* self)
 {
   while (!self->readThreadShutdown.IsSet())
   {
diff --git a/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp
index d3b731ae0a..05505af9db 100644
--- a/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp
+++ b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp
@@ -125,7 +125,7 @@ bool CEXIETHERNET::SendFrame(const u8* frame, u32 size)
 }
 
 #ifdef __linux__
-static void ReadThreadHandler(CEXIETHERNET* self)
+void CEXIETHERNET::ReadThreadHandler(CEXIETHERNET* self)
 {
   while (!self->readThreadShutdown.IsSet())
   {
diff --git a/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp
index 58e497a8fb..3e8b4d5442 100644
--- a/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp
+++ b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp
@@ -263,7 +263,7 @@ bool CEXIETHERNET::IsActivated()
   return mHAdapter != INVALID_HANDLE_VALUE;
 }
 
-static void ReadThreadHandler(CEXIETHERNET* self)
+void CEXIETHERNET::ReadThreadHandler(CEXIETHERNET* self)
 {
   while (!self->readThreadShutdown.IsSet())
   {
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
index 393b7ab74d..d6236808df 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
@@ -210,7 +210,7 @@ public:
   void DMARead(u32 addr, u32 size) override;
   void DoState(PointerWrap& p) override;
 
-  // private:
+private:
   struct
   {
     enum
@@ -312,6 +312,7 @@ public:
   std::unique_ptr<u8[]> tx_fifo;
 
   // TAP interface
+  static void ReadThreadHandler(CEXIETHERNET* self);
   bool Activate();
   void Deactivate();
   bool IsActivated();