rainbow: removed esp.h

src/boards/esp.h

@@ -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

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;

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

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" />

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>