notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
32x drc functional on ARM, random adjustments
[picodrive.git]
/
pico
/
memory.c
diff --git
a/pico/memory.c
b/pico/memory.c
index
6281501
..
9967f5c
100644
(file)
--- a/
pico/memory.c
+++ b/
pico/memory.c
@@
-957,7
+957,7
@@
static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
if (xcycles >= timer_b_next_oflow) \
\r
ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2
\r
\r
if (xcycles >= timer_b_next_oflow) \
\r
ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2
\r
\r
-static u32
MEMH_FUNC
ym2612_read_local_z80(void)
\r
+static u32 ym2612_read_local_z80(void)
\r
{
\r
int xcycles = z80_cyclesDone() << 8;
\r
\r
{
\r
int xcycles = z80_cyclesDone() << 8;
\r
\r
@@
-1055,14
+1055,14
@@
void ym2612_unpack_state(void)
// -----------------------------------------------------------------
\r
// z80 memhandlers
\r
\r
// -----------------------------------------------------------------
\r
// z80 memhandlers
\r
\r
-static unsigned char
MEMH_FUNC
z80_md_vdp_read(unsigned short a)
\r
+static unsigned char z80_md_vdp_read(unsigned short a)
\r
{
\r
// TODO?
\r
elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);
\r
return 0xff;
\r
}
\r
\r
{
\r
// TODO?
\r
elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);
\r
return 0xff;
\r
}
\r
\r
-static unsigned char
MEMH_FUNC
z80_md_bank_read(unsigned short a)
\r
+static unsigned char z80_md_bank_read(unsigned short a)
\r
{
\r
unsigned int addr68k;
\r
unsigned char ret;
\r
{
\r
unsigned int addr68k;
\r
unsigned char ret;
\r
@@
-1076,13
+1076,13
@@
static unsigned char MEMH_FUNC z80_md_bank_read(unsigned short a)
return ret;
\r
}
\r
\r
return ret;
\r
}
\r
\r
-static void
MEMH_FUNC
z80_md_ym2612_write(unsigned int a, unsigned char data)
\r
+static void z80_md_ym2612_write(unsigned int a, unsigned char data)
\r
{
\r
if (PicoOpt & POPT_EN_FM)
\r
emustatus |= ym2612_write_local(a, data, 1) & 1;
\r
}
\r
\r
{
\r
if (PicoOpt & POPT_EN_FM)
\r
emustatus |= ym2612_write_local(a, data, 1) & 1;
\r
}
\r
\r
-static void
MEMH_FUNC
z80_md_vdp_br_write(unsigned int a, unsigned char data)
\r
+static void z80_md_vdp_br_write(unsigned int a, unsigned char data)
\r
{
\r
// TODO: allow full VDP access
\r
if ((a&0xfff9) == 0x7f11) // 7f11 7f13 7f15 7f17
\r
{
\r
// TODO: allow full VDP access
\r
if ((a&0xfff9) == 0x7f11) // 7f11 7f13 7f15 7f17
\r
@@
-1103,7
+1103,7
@@
static void MEMH_FUNC z80_md_vdp_br_write(unsigned int a, unsigned char data)
elprintf(EL_ANOMALY, "z80 invalid w8 [%06x] %02x", a, data);
\r
}
\r
\r
elprintf(EL_ANOMALY, "z80 invalid w8 [%06x] %02x", a, data);
\r
}
\r
\r
-static void
MEMH_FUNC
z80_md_bank_write(unsigned int a, unsigned char data)
\r
+static void z80_md_bank_write(unsigned int a, unsigned char data)
\r
{
\r
unsigned int addr68k;
\r
\r
{
\r
unsigned int addr68k;
\r
\r