From a3061f55d6149e92ea1e173f79815811394a97c3 Mon Sep 17 00:00:00 2001 From: Andrea Odetti Date: Fri, 19 Apr 2019 21:13:00 +0100 Subject: [PATCH] Fix new Joystick interface. Signed-off-by: Andrea Odetti --- source/linux/interface.h | 2 +- source/linux/paddle.cpp | 4 +--- test/TestCPU6502/dummy.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/source/linux/interface.h b/source/linux/interface.h index cbbbb5d8..54f3b085 100644 --- a/source/linux/interface.h +++ b/source/linux/interface.h @@ -23,7 +23,7 @@ BYTE KeybReadFlag(); BYTE __stdcall JoyReadButton(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG uExecutedCycles); BYTE __stdcall JoyReadPosition(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG uExecutedCycles); -BYTE __stdcall JoyResetPosition(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG uExecutedCycles); +void JoyResetPosition(ULONG uExecutedCycles); // Speaker diff --git a/source/linux/paddle.cpp b/source/linux/paddle.cpp index 4d11ee6f..c1832490 100644 --- a/source/linux/paddle.cpp +++ b/source/linux/paddle.cpp @@ -85,10 +85,8 @@ BYTE __stdcall JoyReadPosition(WORD pc, WORD address, BYTE bWrite, BYTE d, ULONG return MemReadFloatingBus(nPdlCntrActive, uExecutedCycles); } -BYTE __stdcall JoyResetPosition(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG uExecutedCycles) +void JoyResetPosition(ULONG uExecutedCycles) { CpuCalcCycles(uExecutedCycles); g_nJoyCntrResetCycle = g_nCumulativeCycles; - - return MemReadFloatingBus(uExecutedCycles); } diff --git a/test/TestCPU6502/dummy.cpp b/test/TestCPU6502/dummy.cpp index 5c8f3bfb..fa63f7dd 100644 --- a/test/TestCPU6502/dummy.cpp +++ b/test/TestCPU6502/dummy.cpp @@ -23,7 +23,7 @@ BYTE KeybReadFlag() { return 0; } BYTE __stdcall JoyReadButton(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG nCyclesLeft) { return 0; } BYTE __stdcall JoyReadPosition(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG nCyclesLeft) { return 0; } -BYTE __stdcall JoyResetPosition(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG nCyclesLeft) { return 0; } +void JoyResetPosition(ULONG nCyclesLeft) { } // Speaker