notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error checking for png
[picodrive.git]
/
Pico
/
cd
/
Area.c
diff --git
a/Pico/cd/Area.c
b/Pico/cd/Area.c
index
c8c1d91
..
8561257
100644
(file)
--- a/
Pico/cd/Area.c
+++ b/
Pico/cd/Area.c
@@
-101,7
+101,7
@@
PICO_INTERNAL int PicoCdSaveState(void *file)
unsigned char buff[0x60];
void *ym2612_regs = YM2612GetRegs();
unsigned char buff[0x60];
void *ym2612_regs = YM2612GetRegs();
- areaWrite("PicoS
MCD
", 1, 8, file);
+ areaWrite("PicoS
EXT
", 1, 8, file);
areaWrite(&PicoVer, 1, 4, file);
memset(buff, 0, sizeof(buff));
areaWrite(&PicoVer, 1, 4, file);
memset(buff, 0, sizeof(buff));
@@
-124,9
+124,8
@@
PICO_INTERNAL int PicoCdSaveState(void *file)
if (PicoOpt&1)
CHECKED_WRITE(CHUNK_FM, 0x200+4, ym2612_regs);
if (PicoOpt&1)
CHECKED_WRITE(CHUNK_FM, 0x200+4, ym2612_regs);
- if (Pico
MCD & 1
)
+ if (Pico
AHW & PAHW_MCD
)
{
{
- Pico_mcd->m.audio_offset = mp3_get_offset();
memset(buff, 0, sizeof(buff));
PicoAreaPackCpu(buff, 1);
if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
memset(buff, 0, sizeof(buff));
PicoAreaPackCpu(buff, 1);
if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
@@
-197,7
+196,8
@@
PICO_INTERNAL int PicoCdLoadState(void *file)
g_read_offs = 0;
CHECKED_READ(8, buff);
g_read_offs = 0;
CHECKED_READ(8, buff);
- if (strncmp((char *)buff, "PicoSMCD", 8)) R_ERROR_RETURN("bad header");
+ if (strncmp((char *)buff, "PicoSMCD", 8) && strncmp((char *)buff, "PicoSEXT", 8))
+ R_ERROR_RETURN("bad header");
CHECKED_READ(4, &ver);
while (!areaEof(file))
CHECKED_READ(4, &ver);
while (!areaEof(file))
@@
-205,7
+205,7
@@
PICO_INTERNAL int PicoCdLoadState(void *file)
CHECKED_READ(1, buff);
CHECKED_READ(4, &len);
if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");
CHECKED_READ(1, buff);
CHECKED_READ(4, &len);
if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");
- if (buff[0] > CHUNK_FM && buff[0] <= CHUNK_MISC_CD && !(Pico
MCD & 1
))
+ if (buff[0] > CHUNK_FM && buff[0] <= CHUNK_MISC_CD && !(Pico
AHW & PAHW_MCD
))
R_ERROR_RETURN("cd chunk in non CD state?");
switch (buff[0])
R_ERROR_RETURN("cd chunk in non CD state?");
switch (buff[0])
@@
-269,7
+269,7
@@
PICO_INTERNAL int PicoCdLoadState(void *file)
breakswitch:;
}
breakswitch:;
}
- if (Pico
MCD & 1
)
+ if (Pico
AHW & PAHW_MCD
)
{
/* after load events */
if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
{
/* after load events */
if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
@@
-279,8
+279,8
@@
PICO_INTERNAL int PicoCdLoadState(void *file)
if (Pico_mcd->s68k_regs[3]&4)
PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]);
#endif
if (Pico_mcd->s68k_regs[3]&4)
PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]);
#endif
- if (
Pico_mcd->m.audio_track > 0 && Pico_mcd->m.audio_track < Pico_mcd->TOC.Last_Track
)
-
mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset
);
+ if (
!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1)
)
+
cdda_start_play(
);
// restore hint vector
*(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
}
// restore hint vector
*(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
}
@@
-296,7
+296,8
@@
int PicoCdLoadStateGfx(void *file)
g_read_offs = 0;
CHECKED_READ(8, buff);
g_read_offs = 0;
CHECKED_READ(8, buff);
- if (strncmp(buff, "PicoSMCD", 8)) R_ERROR_RETURN("bad header");
+ if (strncmp((char *)buff, "PicoSMCD", 8) && strncmp((char *)buff, "PicoSEXT", 8))
+ R_ERROR_RETURN("bad header");
CHECKED_READ(4, &ver);
while (!areaEof(file) && found < 4)
CHECKED_READ(4, &ver);
while (!areaEof(file) && found < 4)
@@
-304,7
+305,7
@@
int PicoCdLoadStateGfx(void *file)
CHECKED_READ(1, buff);
CHECKED_READ(4, &len);
if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");
CHECKED_READ(1, buff);
CHECKED_READ(4, &len);
if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");
- if (buff[0] > CHUNK_FM && buff[0] <= CHUNK_MISC_CD && !(Pico
MCD & 1
))
+ if (buff[0] > CHUNK_FM && buff[0] <= CHUNK_MISC_CD && !(Pico
AHW & PAHW_MCD
))
R_ERROR_RETURN("cd chunk in non CD state?");
switch (buff[0])
R_ERROR_RETURN("cd chunk in non CD state?");
switch (buff[0])