From fa03e8dc555e1936d232063f3a2c96b320032c55 Mon Sep 17 00:00:00 2001
From: Adrian Conlon <Adrian.conlon@gmail.com>
Date: Sun, 22 Oct 2017 21:31:20 +0100
Subject: [PATCH] Simplify I/O port event handling.

Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
---
 inc/InputOutput.h            |  9 ++++-----
 inc/PortEventArgs.h          | 18 ------------------
 src/EightBit.vcxproj         |  1 -
 src/EightBit.vcxproj.filters |  3 ---
 src/InputOutput.cpp          | 12 ++++--------
 5 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 inc/PortEventArgs.h

diff --git a/inc/InputOutput.h b/inc/InputOutput.h
index b9bd36e..be22bd3 100644
--- a/inc/InputOutput.h
+++ b/inc/InputOutput.h
@@ -4,7 +4,6 @@
 #include <array>
 
 #include "Signal.h"
-#include "PortEventArgs.h"
 
 namespace EightBit {
 	class InputOutput {
@@ -18,11 +17,11 @@ namespace EightBit {
 		uint8_t readOutputPort(uint8_t port) { return output[port]; }
 		void writeOutputPort(uint8_t port, uint8_t value);
 
-		Signal<PortEventArgs> ReadingPort;
-		Signal<PortEventArgs> ReadPort;
+		Signal<uint8_t> ReadingPort;
+		Signal<uint8_t> ReadPort;
 
-		Signal<PortEventArgs> WritingPort;
-		Signal<PortEventArgs> WrittenPort;
+		Signal<uint8_t> WritingPort;
+		Signal<uint8_t> WrittenPort;
 
 	protected:
 		void OnReadingPort(uint8_t port);
diff --git a/inc/PortEventArgs.h b/inc/PortEventArgs.h
deleted file mode 100644
index 5783618..0000000
--- a/inc/PortEventArgs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-namespace EightBit {
-	class PortEventArgs {
-	public:
-		PortEventArgs(uint8_t port)
-		: m_port(port) {}
-
-		uint8_t getPort() const {
-			return m_port;
-		}
-
-	private:
-		uint8_t m_port;
-	};
-}
\ No newline at end of file
diff --git a/src/EightBit.vcxproj b/src/EightBit.vcxproj
index ac4d859..b9c05b1 100644
--- a/src/EightBit.vcxproj
+++ b/src/EightBit.vcxproj
@@ -143,7 +143,6 @@
     <ClInclude Include="..\inc\InputOutput.h" />
     <ClInclude Include="..\inc\IntelProcessor.h" />
     <ClInclude Include="..\inc\Memory.h" />
-    <ClInclude Include="..\inc\PortEventArgs.h" />
     <ClInclude Include="..\inc\Processor.h" />
     <ClInclude Include="..\inc\Ram.h" />
     <ClInclude Include="..\inc\Register.h" />
diff --git a/src/EightBit.vcxproj.filters b/src/EightBit.vcxproj.filters
index 8482fc9..d5a32a2 100644
--- a/src/EightBit.vcxproj.filters
+++ b/src/EightBit.vcxproj.filters
@@ -35,9 +35,6 @@
     <ClInclude Include="..\inc\InputOutput.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\inc\PortEventArgs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\inc\Bus.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/src/InputOutput.cpp b/src/InputOutput.cpp
index 1f1e347..7d853b0 100644
--- a/src/InputOutput.cpp
+++ b/src/InputOutput.cpp
@@ -15,21 +15,17 @@ void EightBit::InputOutput::writeOutputPort(uint8_t port, uint8_t value) {
 }
 
 void EightBit::InputOutput::OnReadingPort(uint8_t port) {
-	PortEventArgs event(port);
-	ReadingPort.fire(event);
+	ReadingPort.fire(port);
 }
 
 void EightBit::InputOutput::OnReadPort(uint8_t port) {
-	PortEventArgs event(port);
-	ReadPort.fire(event);
+	ReadPort.fire(port);
 }
 
 void EightBit::InputOutput::OnWritingPort(uint8_t port) {
-	PortEventArgs event(port);
-	WritingPort.fire(event);
+	WritingPort.fire(port);
 }
 
 void EightBit::InputOutput::OnWrittenPort(uint8_t port) {
-	PortEventArgs event(port);
-	WrittenPort.fire(event);
+	WrittenPort.fire(port);
 }