notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cue support wip
[picodrive.git]
/
Pico
/
cd
/
Area.c
diff --git
a/Pico/cd/Area.c
b/Pico/cd/Area.c
index
4eab260
..
b949a14
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,7
+124,7
@@
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));
{
Pico_mcd->m.audio_offset = mp3_get_offset();
memset(buff, 0, sizeof(buff));
@@
-153,6
+153,8
@@
PICO_INTERNAL int PicoCdSaveState(void *file)
if (carthw_chunks != NULL)
{
carthw_state_chunk *chwc;
if (carthw_chunks != NULL)
{
carthw_state_chunk *chwc;
+ if (PicoStateProgressCB)
+ PicoStateProgressCB("Saving.. cart hw state");
for (chwc = carthw_chunks; chwc->ptr != NULL; chwc++)
CHECKED_WRITE(chwc->chunk, chwc->size, chwc->ptr);
}
for (chwc = carthw_chunks; chwc->ptr != NULL; chwc++)
CHECKED_WRITE(chwc->chunk, chwc->size, chwc->ptr);
}
@@
-195,7
+197,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))
@@
-203,7
+206,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])
@@
-267,7
+270,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?
@@
-294,7
+297,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)
@@
-302,7
+306,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])