Fix compile, Remove unused include
This commit is contained in:
parent
ebbd9784e6
commit
5473b8722d
|
@ -23,21 +23,6 @@
|
||||||
#include "../dispatch.h"
|
#include "../dispatch.h"
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|
||||||
#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 {
|
class DivPlatformFMBase: public DivDispatch {
|
||||||
protected:
|
protected:
|
||||||
const bool isOutput[8][4]={
|
const bool isOutput[8][4]={
|
||||||
|
@ -75,8 +60,24 @@ class DivPlatformFMBase: public DivDispatch {
|
||||||
short pendingWrites[512];
|
short pendingWrites[512];
|
||||||
|
|
||||||
DivPlatformFMBase():
|
DivPlatformFMBase():
|
||||||
|
DivDispatch(),
|
||||||
lastBusy(0),
|
lastBusy(0),
|
||||||
delay(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
|
#endif
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#define _YM2610B_H
|
#define _YM2610B_H
|
||||||
#include "ym2610.h"
|
#include "ym2610.h"
|
||||||
#include "../macroInt.h"
|
#include "../macroInt.h"
|
||||||
#include <queue>
|
|
||||||
#include "sound/ymfm/ymfm_opn.h"
|
#include "sound/ymfm/ymfm_opn.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue