notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: rm overlapped block entry points
[picodrive.git]
/
pico
/
sms.c
diff --git
a/pico/sms.c
b/pico/sms.c
index
8c44d51
..
ac81c2b
100644
(file)
--- a/
pico/sms.c
+++ b/
pico/sms.c
@@
-8,10
+8,8
@@
/*
* TODO:
* - start in a state as if BIOS ran
/*
* TODO:
* - start in a state as if BIOS ran
- * - remaining status flags (OVR/COL)
* - RAM support in mapper
* - region support
* - RAM support in mapper
* - region support
- * - SN76496 DAC-like usage
* - H counter
*/
#include "pico_int.h"
* - H counter
*/
#include "pico_int.h"
@@
-23,7
+21,7
@@
static unsigned char vdp_data_read(void)
struct PicoVideo *pv = &Pico.video;
unsigned char d;
struct PicoVideo *pv = &Pico.video;
unsigned char d;
- d = Pico.vramb[pv->addr];
+ d = Pico
Mem
.vramb[pv->addr];
pv->addr = (pv->addr + 1) & 0x3fff;
pv->pending = 0;
return d;
pv->addr = (pv->addr + 1) & 0x3fff;
pv->pending = 0;
return d;
@@
-31,9
+29,12
@@
static unsigned char vdp_data_read(void)
static unsigned char vdp_ctl_read(void)
{
static unsigned char vdp_ctl_read(void)
{
- unsigned char d = Pico.video.pending_ints << 7;
- Pico.video.pending = 0;
- Pico.video.pending_ints = 0;
+ struct PicoVideo *pv = &Pico.video;
+ unsigned char d;
+
+ d = pv->status | (pv->pending_ints << 7);
+ pv->pending = pv->pending_ints = 0;
+ pv->status = 0;
elprintf(EL_SR, "VDP sr: %02x", d);
return d;
elprintf(EL_SR, "VDP sr: %02x", d);
return d;
@@
-44,10
+45,10
@@
static void vdp_data_write(unsigned char d)
struct PicoVideo *pv = &Pico.video;
if (pv->type == 3) {
struct PicoVideo *pv = &Pico.video;
if (pv->type == 3) {
- Pico.cram[pv->addr & 0x1f] = d;
+ Pico
Mem
.cram[pv->addr & 0x1f] = d;
Pico.m.dirtyPal = 1;
} else {
Pico.m.dirtyPal = 1;
} else {
- Pico.vramb[pv->addr] = d;
+ Pico
Mem
.vramb[pv->addr] = d;
}
pv->addr = (pv->addr + 1) & 0x3fff;
}
pv->addr = (pv->addr + 1) & 0x3fff;
@@
-105,12
+106,12
@@
static unsigned char z80_sms_in(unsigned short a)
break;
case 0xc0: /* I/O port A and B */
break;
case 0xc0: /* I/O port A and B */
- d = ~((Pico
Pad[0] & 0x3f) | (PicoP
ad[1] << 6));
+ d = ~((Pico
In.pad[0] & 0x3f) | (PicoIn.p
ad[1] << 6));
break;
case 0xc1: /* I/O port B and miscellaneous */
d = (Pico.ms.io_ctl & 0x80) | ((Pico.ms.io_ctl << 1) & 0x40) | 0x30;
break;
case 0xc1: /* I/O port B and miscellaneous */
d = (Pico.ms.io_ctl & 0x80) | ((Pico.ms.io_ctl << 1) & 0x40) | 0x30;
- d |= ~(Pico
P
ad[1] >> 2) & 0x0f;
+ d |= ~(Pico
In.p
ad[1] >> 2) & 0x0f;
break;
}
break;
}
@@
-130,8
+131,9
@@
static void z80_sms_out(unsigned short a, unsigned char d)
case 0x40:
case 0x41:
case 0x40:
case 0x41:
- if (PicoOpt & POPT_EN_PSG)
- SN76496Write(d);
+ if ((d & 0x90) == 0x90 && Pico.snd.psg_line < Pico.m.scanline)
+ PsndDoPSG(Pico.m.scanline);
+ SN76496Write(d);
break;
case 0x80:
break;
case 0x80:
@@
-180,7
+182,7
@@
static void xwrite(unsigned int a, unsigned char d)
{
elprintf(EL_IO, "z80 write [%04x] %02x", a, d);
if (a >= 0xc000)
{
elprintf(EL_IO, "z80 write [%04x] %02x", a, d);
if (a >= 0xc000)
- Pico.zram[a & 0x1fff] = d;
+ Pico
Mem
.zram[a & 0x1fff] = d;
if (a >= 0xfff8)
write_bank(a, d);
}
if (a >= 0xfff8)
write_bank(a, d);
}
@@
-195,7
+197,7
@@
void PicoPowerMS(void)
{
int s, tmp;
{
int s, tmp;
- memset(&Pico
.ram,0,(unsigned char *)&Pico.rom - Pico.ram
);
+ memset(&Pico
Mem,0,sizeof(PicoMem)
);
memset(&Pico.video,0,sizeof(Pico.video));
memset(&Pico.m,0,sizeof(Pico.m));
Pico.m.pal = 0;
memset(&Pico.video,0,sizeof(Pico.video));
memset(&Pico.m,0,sizeof(Pico.m));
Pico.m.pal = 0;
@@
-219,11
+221,11
@@
void PicoPowerMS(void)
void PicoMemSetupMS(void)
{
z80_map_set(z80_read_map, 0x0000, 0xbfff, Pico.rom, 0);
void PicoMemSetupMS(void)
{
z80_map_set(z80_read_map, 0x0000, 0xbfff, Pico.rom, 0);
- z80_map_set(z80_read_map, 0xc000, 0xdfff, Pico.zram, 0);
- z80_map_set(z80_read_map, 0xe000, 0xffff, Pico.zram, 0);
+ z80_map_set(z80_read_map, 0xc000, 0xdfff, Pico
Mem
.zram, 0);
+ z80_map_set(z80_read_map, 0xe000, 0xffff, Pico
Mem
.zram, 0);
z80_map_set(z80_write_map, 0x0000, 0xbfff, xwrite, 1);
z80_map_set(z80_write_map, 0x0000, 0xbfff, xwrite, 1);
- z80_map_set(z80_write_map, 0xc000, 0xdfff, Pico.zram, 0);
+ z80_map_set(z80_write_map, 0xc000, 0xdfff, Pico
Mem
.zram, 0);
z80_map_set(z80_write_map, 0xe000, 0xffff, xwrite, 1);
#ifdef _USE_DRZ80
z80_map_set(z80_write_map, 0xe000, 0xffff, xwrite, 1);
#ifdef _USE_DRZ80
@@
-232,8
+234,8
@@
void PicoMemSetupMS(void)
#endif
#ifdef _USE_CZ80
Cz80_Set_Fetch(&CZ80, 0x0000, 0xbfff, (FPTR)Pico.rom);
#endif
#ifdef _USE_CZ80
Cz80_Set_Fetch(&CZ80, 0x0000, 0xbfff, (FPTR)Pico.rom);
- Cz80_Set_Fetch(&CZ80, 0xc000, 0xdfff, (FPTR)Pico.zram);
- Cz80_Set_Fetch(&CZ80, 0xe000, 0xffff, (FPTR)Pico.zram);
+ Cz80_Set_Fetch(&CZ80, 0xc000, 0xdfff, (FPTR)Pico
Mem
.zram);
+ Cz80_Set_Fetch(&CZ80, 0xe000, 0xffff, (FPTR)Pico
Mem
.zram);
Cz80_Set_INPort(&CZ80, z80_sms_in);
Cz80_Set_OUTPort(&CZ80, z80_sms_out);
#endif
Cz80_Set_INPort(&CZ80, z80_sms_in);
Cz80_Set_OUTPort(&CZ80, z80_sms_out);
#endif
@@
-252,13
+254,15
@@
void PicoFrameMS(void)
int lines = is_pal ? 313 : 262;
int cycles_line = is_pal ? 58020 : 58293; /* (226.6 : 227.7) * 256 */
int cycles_done = 0, cycles_aim = 0;
int lines = is_pal ? 313 : 262;
int cycles_line = is_pal ? 58020 : 58293; /* (226.6 : 227.7) * 256 */
int cycles_done = 0, cycles_aim = 0;
- int skip = Pico
S
kipFrame;
+ int skip = Pico
In.s
kipFrame;
int lines_vis = 192;
int hint; // Hint counter
int nmi;
int y;
int lines_vis = 192;
int hint; // Hint counter
int nmi;
int y;
- nmi = (PicoPad[0] >> 7) & 1;
+ PsndStartFrame();
+
+ nmi = (PicoIn.pad[0] >> 7) & 1;
if (!Pico.ms.nmi_state && nmi)
z80_nmi();
Pico.ms.nmi_state = nmi;
if (!Pico.ms.nmi_state && nmi)
z80_nmi();
Pico.ms.nmi_state = nmi;
@@
-295,12
+299,16
@@
void PicoFrameMS(void)
}
}
}
}
+ // 224 because of how it's done for MD...
+ if (y == 224 && PicoIn.sndOut)
+ PsndGetSamplesMS();
+
cycles_aim += cycles_line;
cycles_done += z80_run((cycles_aim - cycles_done) >> 8) << 8;
}
cycles_aim += cycles_line;
cycles_done += z80_run((cycles_aim - cycles_done) >> 8) << 8;
}
- if (P
sndOut
)
- Psnd
GetSamplesMS(
);
+ if (P
icoIn.sndOut && Pico.snd.psg_line < lines
)
+ Psnd
DoPSG(lines - 1
);
}
void PicoFrameDrawOnlyMS(void)
}
void PicoFrameDrawOnlyMS(void)
@@
-314,3
+322,4
@@
void PicoFrameDrawOnlyMS(void)
PicoLineMode4(y);
}
PicoLineMode4(y);
}
+// vim:ts=2:sw=2:expandtab