From 74f0f8cb3c1756b8fbf4100839da2fe1142642d4 Mon Sep 17 00:00:00 2001
From: "contact@brokestudio.fr" <contact@brokestudio.fr>
Date: Thu, 2 Nov 2023 19:19:41 +0100
Subject: [PATCH] rainbow: removed esp.h

---
 src/boards/esp.h              | 21 ---------------------
 src/boards/rainbow.cpp        |  2 +-
 src/boards/rainbow_esp.h      | 10 ++++------
 vc/vc14_fceux.vcxproj         |  1 -
 vc/vc14_fceux.vcxproj.filters |  3 ---
 5 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 src/boards/esp.h

diff --git a/src/boards/esp.h b/src/boards/esp.h
deleted file mode 100644
index 85d8e638..00000000
--- a/src/boards/esp.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _ESP_H_
-#define _ESP_H_
-
-#include "../types.h"
-
-//////////////////////////////////////
-// Abstract ESP firmware interface
-
-class EspFirmware {
-public:
-	virtual ~EspFirmware() = default;
-
-	// Communication pins (don't care about UART details, directly transmit bytes)
-	virtual void rx(uint8 v) = 0;
-	virtual uint8 tx() = 0;
-
-	// General purpose I/O pins
-	virtual bool getDataReadyIO() = 0;
-};
-
-#endif
diff --git a/src/boards/rainbow.cpp b/src/boards/rainbow.cpp
index 16c3bf19..15ce832d 100644
--- a/src/boards/rainbow.cpp
+++ b/src/boards/rainbow.cpp
@@ -197,7 +197,7 @@ static SFORMAT SStateRegs[] =
 	{ 0 }
 };
 
-static EspFirmware *esp = NULL;
+static BrokeStudioFirmware *esp = NULL;
 static bool esp_enable;
 static bool esp_irq_enable;
 static bool has_esp_message_received;
diff --git a/src/boards/rainbow_esp.h b/src/boards/rainbow_esp.h
index f778eb04..3858c687 100644
--- a/src/boards/rainbow_esp.h
+++ b/src/boards/rainbow_esp.h
@@ -13,8 +13,6 @@
 #include <deque>
 #include <thread>
 
-#include "esp.h"
-
 #if defined(_WIN32) || defined(WIN32)
 #include <winsock2.h>
 #else
@@ -71,15 +69,15 @@ struct WorkingFile
 	FileStruct *file;
 };
 
-class BrokeStudioFirmware: public EspFirmware {
+class BrokeStudioFirmware {
 public:
 	BrokeStudioFirmware();
 	~BrokeStudioFirmware();
 
-	void rx(uint8 v) override;
-	uint8 tx() override;
+	void rx(uint8 v);
+	uint8 tx();
 
-	virtual bool getDataReadyIO() override;
+	virtual bool getDataReadyIO();
 
 private:
 	// Defined message types from CPU to ESP
diff --git a/vc/vc14_fceux.vcxproj b/vc/vc14_fceux.vcxproj
index 4bce576c..05521297 100644
--- a/vc/vc14_fceux.vcxproj
+++ b/vc/vc14_fceux.vcxproj
@@ -1022,7 +1022,6 @@ xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)"</Command>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\asm.h" />
-    <ClInclude Include="..\src\boards\RNBW\esp.h" />
     <ClInclude Include="..\src\boards\RNBW\pping.h" />
     <ClInclude Include="..\src\cart.h" />
     <ClInclude Include="..\src\cheat.h" />
diff --git a/vc/vc14_fceux.vcxproj.filters b/vc/vc14_fceux.vcxproj.filters
index 6ee04e29..758c8816 100644
--- a/vc/vc14_fceux.vcxproj.filters
+++ b/vc/vc14_fceux.vcxproj.filters
@@ -1644,9 +1644,6 @@
     <ClInclude Include="..\src\drivers\win\header_editor.h">
       <Filter>drivers\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\boards\RNBW\esp.h">
-      <Filter>boards</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\boards\RNBW\pping.h">
       <Filter>boards</Filter>
     </ClInclude>