From 5473b8722dca28cc3e9a65cf4b6fa3cca7e61ab9 Mon Sep 17 00:00:00 2001 From: cam900 Date: Mon, 6 Jun 2022 19:52:13 +0900 Subject: [PATCH] Fix compile, Remove unused include --- src/engine/platform/fmsharedbase.h | 31 +++++++++++++++--------------- src/engine/platform/ym2610b.h | 1 - 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/engine/platform/fmsharedbase.h b/src/engine/platform/fmsharedbase.h index 355b05c23..2555d2676 100644 --- a/src/engine/platform/fmsharedbase.h +++ b/src/engine/platform/fmsharedbase.h @@ -23,21 +23,6 @@ #include "../dispatch.h" #include -#define rWrite(a,v) if (!skipRegisterWrites) {pendingWrites[a]=v;} -#define immWrite(a,v) if (!skipRegisterWrites) {writes.push_back(QueuedWrite(a,v)); if (dumpWrites) {addWrite(a,v);} } -#define urgentWrite(a,v) if (!skipRegisterWrites) { \ - if (writes.empty()) { \ - writes.push_back(QueuedWrite(a,v)); \ - } else if (writes.size()>16 || writes.front().addrOrVal) { \ - writes.push_back(QueuedWrite(a,v)); \ - } else { \ - writes.push_front(QueuedWrite(a,v)); \ - } \ - if (dumpWrites) { \ - addWrite(a,v); \ - } \ -} - class DivPlatformFMBase: public DivDispatch { protected: const bool isOutput[8][4]={ @@ -75,8 +60,24 @@ class DivPlatformFMBase: public DivDispatch { short pendingWrites[512]; DivPlatformFMBase(): + DivDispatch(), lastBusy(0), delay(0) {} }; +#define rWrite(a,v) if (!skipRegisterWrites) {pendingWrites[a]=v;} +#define immWrite(a,v) if (!skipRegisterWrites) {writes.push_back(QueuedWrite(a,v)); if (dumpWrites) {addWrite(a,v);} } +#define urgentWrite(a,v) if (!skipRegisterWrites) { \ + if (writes.empty()) { \ + writes.push_back(QueuedWrite(a,v)); \ + } else if (writes.size()>16 || writes.front().addrOrVal) { \ + writes.push_back(QueuedWrite(a,v)); \ + } else { \ + writes.push_front(QueuedWrite(a,v)); \ + } \ + if (dumpWrites) { \ + addWrite(a,v); \ + } \ +} + #endif diff --git a/src/engine/platform/ym2610b.h b/src/engine/platform/ym2610b.h index 0d1dca2b7..fefb06929 100644 --- a/src/engine/platform/ym2610b.h +++ b/src/engine/platform/ym2610b.h @@ -21,7 +21,6 @@ #define _YM2610B_H #include "ym2610.h" #include "../macroInt.h" -#include #include "sound/ymfm/ymfm_opn.h"