notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sram handling refactored
[picodrive.git]
/
Pico
/
sound
/
ym2612.c
diff --git
a/Pico/sound/ym2612.c
b/Pico/sound/ym2612.c
index
75d5ad3
..
754f496
100644
(file)
--- a/
Pico/sound/ym2612.c
+++ b/
Pico/sound/ym2612.c
@@
-112,7
+112,6
@@
#include <math.h>
\r
\r
#include "ym2612.h"
\r
#include <math.h>
\r
\r
#include "ym2612.h"
\r
-#include "mix.h"
\r
\r
#ifndef EXTERNAL_YM2612
\r
#include <stdlib.h>
\r
\r
#ifndef EXTERNAL_YM2612
\r
#include <stdlib.h>
\r
@@
-125,6
+124,8
@@
extern YM2612 *ym2612_940;
\r
#endif
\r
\r
\r
#endif
\r
\r
+void memset32(int *dest, int c, int count);
\r
+
\r
\r
#ifndef __GNUC__
\r
#pragma warning (disable:4100) // unreferenced formal parameter
\r
\r
#ifndef __GNUC__
\r
#pragma warning (disable:4100) // unreferenced formal parameter
\r
@@
-1701,7
+1702,9
@@
int YM2612Write_(unsigned int a, unsigned int v)
}
\r
\r
addr = ym2612.OPN.ST.address;
\r
}
\r
\r
addr = ym2612.OPN.ST.address;
\r
+#ifndef EXTERNAL_YM2612
\r
ym2612.REGS[addr] = v;
\r
ym2612.REGS[addr] = v;
\r
+#endif
\r
\r
switch( addr & 0xf0 )
\r
{
\r
\r
switch( addr & 0xf0 )
\r
{
\r
@@
-1799,7
+1802,9
@@
int YM2612Write_(unsigned int a, unsigned int v)
}
\r
\r
addr = ym2612.OPN.ST.address | 0x100;
\r
}
\r
\r
addr = ym2612.OPN.ST.address | 0x100;
\r
+#ifndef EXTERNAL_YM2612
\r
ym2612.REGS[addr] = v;
\r
ym2612.REGS[addr] = v;
\r
+#endif
\r
\r
ret = OPNWriteReg(addr, v);
\r
break;
\r
\r
ret = OPNWriteReg(addr, v);
\r
break;
\r
@@
-1868,7
+1873,10
@@
void YM2612PicoStateLoad_(void)
}
\r
\r
\r
}
\r
\r
\r
+#ifndef EXTERNAL_YM2612
\r
void *YM2612GetRegs(void)
\r
{
\r
return ym2612.REGS;
\r
}
\r
void *YM2612GetRegs(void)
\r
{
\r
return ym2612.REGS;
\r
}
\r
+#endif
\r
+
\r