From 472a4c5e131af90ccde0c441ea90873b2d2f6109 Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 28 Jan 2023 01:21:41 +0100 Subject: [PATCH] fix warnings in controller module --- src/Bus.cpp | 2 +- src/ControllerPort.cpp | 3 +-- src/ControllerPort.hpp | 2 +- src/controllers/Controller.hpp | 3 ++- src/controllers/StandardController.cpp | 3 --- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Bus.cpp b/src/Bus.cpp index f398852..0ccd0f0 100644 --- a/src/Bus.cpp +++ b/src/Bus.cpp @@ -219,7 +219,7 @@ void Bus::WriteCPU(Word addr, Byte val) return; case 0x4016: - controllerPort.Write(addr, val); + controllerPort.Write(val); break; case 0x4017: diff --git a/src/ControllerPort.cpp b/src/ControllerPort.cpp index ab24829..abc8553 100644 --- a/src/ControllerPort.cpp +++ b/src/ControllerPort.cpp @@ -18,10 +18,9 @@ ControllerPort::~ControllerPort() } } -Byte ControllerPort::Write(Word addr, Byte val) +void ControllerPort::Write(Byte val) { latch.Raw = val; - return 0x00; } Byte ControllerPort::Read(Word addr) diff --git a/src/ControllerPort.hpp b/src/ControllerPort.hpp index c9ccd01..68b4dc8 100644 --- a/src/ControllerPort.hpp +++ b/src/ControllerPort.hpp @@ -15,7 +15,7 @@ public: ControllerPort(); ~ControllerPort(); - Byte Write(Word addr, Byte val); + void Write(Byte val); Byte Read(Word addr); void Tick(); diff --git a/src/controllers/Controller.hpp b/src/controllers/Controller.hpp index 1d23d11..2136515 100644 --- a/src/controllers/Controller.hpp +++ b/src/controllers/Controller.hpp @@ -19,7 +19,8 @@ class Controller friend class ControllerPortViewer; public: - Controller(int outPin) : outPin(outPin) {} + Controller(Byte outPin) : outPin(outPin) {} + virtual ~Controller() {} virtual void OUT(PortLatch latch) = 0; diff --git a/src/controllers/StandardController.cpp b/src/controllers/StandardController.cpp index c06766d..4f33bb0 100644 --- a/src/controllers/StandardController.cpp +++ b/src/controllers/StandardController.cpp @@ -23,8 +23,5 @@ void StandardController::OUT(PortLatch latch) pressed.Buttons.Left = Input::IsKeyDown(GLFW_KEY_A); pressed.Buttons.Right = Input::IsKeyDown(GLFW_KEY_D); - if (pressed.Raw == 0xFF) - volatile int dkjf = 3; - outRegister = pressed.Raw; }