#include <stdio.h>\r
#include <stdlib.h>\r
#include <sys/time.h>\r
+#include <sys/stat.h>\r
+#include <sys/types.h>\r
#include <linux/limits.h>\r
#include <ctype.h>\r
#include <unistd.h>\r
\r
extern int crashed_940;\r
\r
+static short sndBuffer[2*44100/50];\r
static char noticeMsg[64]; // notice msg to draw\r
static struct timeval noticeMsgTime = { 0, 0 }; // when started showing\r
static int reset_timing, osd_fps_x;\r
// bios_help() ?\r
return 0;\r
} else {\r
+ if (PicoMCD & 1) PicoExitMCD();\r
PicoMCD &= ~1;\r
}\r
\r
}\r
}\r
gettimeofday(¬iceMsgTime, 0);\r
-printf("PicoMCD: %x\n", PicoMCD);\r
+\r
// load SRAM for this ROM\r
if(currentConfig.EmuOpt & 1)\r
emu_SaveLoadGame(1, 1);\r
printf("framebuff == 0\n");\r
}\r
\r
+ // make dirs for saves, cfgs, etc.\r
+ mkdir("mds", 0777);\r
+ mkdir("srm", 0777);\r
+ mkdir("brm", 0777);\r
+ mkdir("cfg", 0777);\r
+\r
PicoInit();\r
\r
// logf = fopen("log.txt", "w");\r
}\r
\r
\r
-static void romfname_ext(char *dst, char *ext)\r
+static void romfname_ext(char *dst, const char *prefix, const char *ext)\r
{\r
char *p;\r
+ int prefix_len = 0;\r
\r
// make save filename\r
for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;\r
- strncpy(dst, p, 511);\r
+ *dst = 0;\r
+ if (prefix) {\r
+ strcpy(dst, prefix);\r
+ prefix_len = strlen(prefix);\r
+ }\r
+ strncpy(dst + prefix_len, p, 511-prefix_len);\r
dst[511-8] = 0;\r
- if(dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;\r
- strcat(dst, ext);\r
+ if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;\r
+ if (ext) strcat(dst, ext);\r
+\r
+ printf("romfname_ext: %s\n", dst);\r
}\r
\r
\r
// set default config\r
memset(¤tConfig, 0, sizeof(currentConfig));\r
currentConfig.lastRomFile[0] = 0;\r
- currentConfig.EmuOpt = 0x1f | 0xc00; // | cd_leds | cd_cdda\r
- currentConfig.PicoOpt = 0x0f | 0x200; // | use_940\r
- currentConfig.PsndRate = 44100;\r
+ currentConfig.EmuOpt = 0x1f | 0x400; // | cd_leds\r
+ currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda\r
+ currentConfig.PsndRate = 22050; // 44100;\r
currentConfig.PicoRegion = 0; // auto\r
currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
currentConfig.Frameskip = -1; // auto\r
strncpy(cfg, PicoConfigFile, 511);\r
cfg[511] = 0;\r
} else {\r
- romfname_ext(cfg, ".pbcfg");\r
+ romfname_ext(cfg, "cfg/", ".pbcfg");\r
+ f = fopen(cfg, "rb");\r
+ if (!f) romfname_ext(cfg, NULL, ".pbcfg");\r
+ else fclose(f);\r
}\r
\r
printf("emu_ReadConfig: %s ", cfg);\r
strncpy(cfg, PicoConfigFile, 511);\r
cfg[511] = 0;\r
} else {\r
- romfname_ext(cfg, ".pbcfg");\r
+ romfname_ext(cfg, "cfg", ".pbcfg");\r
}\r
\r
printf("emu_WriteConfig: %s ", cfg);\r
}\r
\r
\r
-void osd_text(int x, int y, char *text)\r
+void osd_text(int x, int y, const char *text)\r
{\r
int len = strlen(text)*8;\r
\r
// 8-bit modes\r
unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
- *(unsigned int *)((char *)gp2x_screen + 320*2+306) =\r
- *(unsigned int *)((char *)gp2x_screen + 320*3+306) =\r
- *(unsigned int *)((char *)gp2x_screen + 320*4+306) = col_g;\r
- *(unsigned int *)((char *)gp2x_screen + 320*2+312) =\r
- *(unsigned int *)((char *)gp2x_screen + 320*3+312) =\r
- *(unsigned int *)((char *)gp2x_screen + 320*4+312) = col_r;\r
+ *(unsigned int *)((char *)gp2x_screen + 320*2+ 4) =\r
+ *(unsigned int *)((char *)gp2x_screen + 320*3+ 4) =\r
+ *(unsigned int *)((char *)gp2x_screen + 320*4+ 4) = col_g;\r
+ *(unsigned int *)((char *)gp2x_screen + 320*2+12) =\r
+ *(unsigned int *)((char *)gp2x_screen + 320*3+12) =\r
+ *(unsigned int *)((char *)gp2x_screen + 320*4+12) = col_r;\r
} else {\r
// 16-bit modes\r
- unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+306);\r
+ unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+4);\r
unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;\r
unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;\r
- *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
- *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
- *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
+ *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
+ *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
+ *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
}\r
}\r
\r
return 0;\r
}\r
\r
-static int localPal[0x100];\r
+int localPal[0x100];\r
static void (*vidCpyM2)(void *dest, void *src) = NULL;\r
\r
-static void blit(char *fps, char *notice)\r
+static void blit(const char *fps, const char *notice)\r
{\r
int emu_opt = currentConfig.EmuOpt;\r
\r
}\r
\r
\r
-static int check_save_file(void)\r
+static void emu_state_cb(const char *str)\r
{\r
- char saveFname[512];\r
- char ext[16];\r
- FILE *f;\r
-\r
- ext[0] = 0;\r
- if(state_slot > 0 && state_slot < 10) sprintf(ext, ".%i", state_slot);\r
- strcat(ext, ".mds");\r
- if(currentConfig.EmuOpt & 8) strcat(ext, ".gz");\r
-\r
- romfname_ext(saveFname, ext);\r
- if ((f = fopen(saveFname, "rb"))) {\r
- fclose(f);\r
- return 1;\r
- }\r
- return 0;\r
+ clearArea(0);\r
+ blit("", str);\r
}\r
\r
static void RunEvents(unsigned int which)\r
{\r
if(which & 0x1800) { // save or load (but not both)\r
int do_it = 1;\r
- if (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200) && check_save_file()) {\r
+ if (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200) && emu_check_save_file(state_slot)) {\r
unsigned long keys;\r
blit("", "OVERWRITE SAVE? (Y=yes, X=no)");\r
while( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )\r
clearArea(0);\r
}\r
if (do_it) {\r
- blit("", (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");\r
- emu_SaveLoadGame(which & 0x1000, 0);\r
+ osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");\r
+ PicoStateProgressCB = emu_state_cb;\r
+ gp2x_memcpy_all_buffers(gp2x_screen, 0, 320*240*2);\r
+ emu_SaveLoadGame((which & 0x1000) >> 12, 0);\r
+ PicoStateProgressCB = NULL;\r
}\r
\r
reset_timing = 1;\r
state_slot += 1;\r
if(state_slot > 9) state_slot = 0;\r
}\r
- sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, check_save_file() ? "USED" : "FREE");\r
+ sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot) ? "USED" : "FREE");\r
gettimeofday(¬iceMsgTime, 0);\r
}\r
if(which & 0x0080) {\r
prevEvents = (allActions[0] | allActions[1]) >> 16;\r
}\r
\r
-static int snd_excess_add = 0, snd_excess_cnt = 0; // hack\r
\r
-static void updateSound(void)\r
+static void updateSound(int len)\r
{\r
- int len = (PicoOpt&8)?PsndLen*2:PsndLen;\r
-\r
- snd_excess_cnt += snd_excess_add;\r
- if (snd_excess_cnt >= 0x10000) {\r
- snd_excess_cnt -= 0x10000;\r
- if (PicoOpt&8) {\r
- PsndOut[len] = PsndOut[len-2];\r
- PsndOut[len+1] = PsndOut[len-1];\r
- len+=2;\r
- } else {\r
- PsndOut[len] = PsndOut[len-1];\r
- len++;\r
- }\r
- }\r
+ if (PicoOpt&8) len<<=1;\r
\r
gp2x_sound_write(PsndOut, len<<1);\r
}\r
}\r
\r
\r
+void emu_forced_frame(void)\r
+{\r
+ int po_old = PicoOpt;\r
+\r
+ PicoOpt |= 0x10;\r
+ PicoFrameFull();\r
+ PicoOpt = po_old;\r
+\r
+ if (!(Pico.video.reg[12]&1)) {\r
+ vidCpyM2 = vidCpyM2_40col;\r
+ clearArea(1);\r
+ } else vidCpyM2 = vidCpyM2_32col;\r
+\r
+ vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
+ vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
+ gp2x_video_setpalette(localPal, 0x40);\r
+}\r
+\r
static void simpleWait(int thissec, int lim_time)\r
{\r
struct timeval tval;\r
\r
// make sure we are in correct mode\r
vidResetMode();\r
+ Pico.m.dirtyPal = 1;\r
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;\r
find_combos();\r
\r
\r
// prepare sound stuff\r
if(currentConfig.EmuOpt & 4) {\r
+ int snd_excess_add;\r
if(PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || crashed_940) {\r
/* if 940 is turned off, we need it to be put back to sleep */\r
if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {\r
Reset940(1, 2);\r
Pause940(1);\r
}\r
- sound_rerate();\r
+ sound_rerate(1);\r
}\r
//excess_samples = PsndRate - PsndLen*target_fps;\r
- snd_excess_cnt = 0;\r
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);\r
gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);\r
gp2x_sound_volume(currentConfig.volume, currentConfig.volume);\r
PicoWriteSound = updateSound;\r
- PsndOut = calloc((PicoOpt&8) ? (PsndLen*4+4) : (PsndLen*2+2), 1);\r
+ memset(sndBuffer, 0, sizeof(sndBuffer));\r
+ PsndOut = sndBuffer;\r
PsndRate_old = PsndRate;\r
PsndLen_real = PsndLen;\r
PicoOpt_old = PicoOpt;\r
\r
// save SRAM\r
if((currentConfig.EmuOpt & 1) && SRam.changed) {\r
- blit("", "Writing SRAM/BRAM..");\r
+ osd_text(4, 232, "Writing SRAM/BRAM..");\r
emu_SaveLoadGame(0, 1);\r
SRam.changed = 0;\r
}\r
\r
- if (PsndOut != 0) {\r
- free(PsndOut);\r
- PsndOut = 0;\r
- }\r
+ // if in 16bit mode, generate 8it image for menu background\r
+ if (!(PicoOpt&0x10) && (currentConfig.EmuOpt&0x80))\r
+ emu_forced_frame();\r
+\r
+ // for menu bg\r
+ gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);\r
}\r
\r
\r
return gzwrite(file, p, _n);\r
}\r
\r
-typedef unsigned int (*STATE_SL_FUNC)(void *, unsigned int, unsigned int, void *);\r
+static int try_ropen_file(const char *fname)\r
+{\r
+ FILE *f;\r
+\r
+ f = fopen(fname, "rb");\r
+ if (f) {\r
+ fclose(f);\r
+ return 1;\r
+ }\r
+ return 0;\r
+}\r
+\r
+char *emu_GetSaveFName(int load, int is_sram, int slot)\r
+{\r
+ static char saveFname[512];\r
+ char ext[16];\r
+\r
+ if (is_sram)\r
+ {\r
+ romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm");\r
+ if (load) {\r
+ if (try_ropen_file(saveFname)) return saveFname;\r
+ // try in current dir..\r
+ romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm");\r
+ if (try_ropen_file(saveFname)) return saveFname;\r
+ return NULL; // give up\r
+ }\r
+ }\r
+ else\r
+ {\r
+ ext[0] = 0;\r
+ if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
+ strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds");\r
+\r
+ romfname_ext(saveFname, "mds/", ext);\r
+ if (load) {\r
+ if (try_ropen_file(saveFname)) return saveFname;\r
+ romfname_ext(saveFname, NULL, ext);\r
+ if (try_ropen_file(saveFname)) return saveFname;\r
+ if (currentConfig.EmuOpt & 8) {\r
+ ext[0] = 0;\r
+ if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
+ strcat(ext, ".mds");\r
+\r
+ romfname_ext(saveFname, "mds/", ext);\r
+ if (try_ropen_file(saveFname)) return saveFname;\r
+ romfname_ext(saveFname, NULL, ext);\r
+ if (try_ropen_file(saveFname)) return saveFname;\r
+ }\r
+ return NULL;\r
+ }\r
+ }\r
+\r
+ return saveFname;\r
+}\r
+\r
+int emu_check_save_file(int slot)\r
+{\r
+ return emu_GetSaveFName(1, 0, slot) ? 1 : 0;\r
+}\r
+\r
+void emu_set_save_cbs(int gz)\r
+{\r
+ if (gz) {\r
+ areaRead = gzRead2;\r
+ areaWrite = gzWrite2;\r
+ areaEof = (areaeof *) gzeof;\r
+ areaSeek = (areaseek *) gzseek;\r
+ areaClose = (areaclose *) gzclose;\r
+ } else {\r
+ areaRead = (arearw *) fread;\r
+ areaWrite = (arearw *) fwrite;\r
+ areaEof = (areaeof *) feof;\r
+ areaSeek = (areaseek *) fseek;\r
+ areaClose = (areaclose *) fclose;\r
+ }\r
+}\r
\r
int emu_SaveLoadGame(int load, int sram)\r
{\r
int ret = 0;\r
- char saveFname[512];\r
+ char *saveFname;\r
\r
// make save filename\r
- romfname_ext(saveFname, "");\r
- if(sram) strcat(saveFname, (PicoMCD&1) ? ".brm" : ".srm");\r
- else {\r
- if(state_slot > 0 && state_slot < 10) sprintf(saveFname, "%s.%i", saveFname, state_slot);\r
- strcat(saveFname, ".mds");\r
+ saveFname = emu_GetSaveFName(load, sram, state_slot);\r
+ if (saveFname == NULL) {\r
+ strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED ");\r
+ gettimeofday(¬iceMsgTime, 0);\r
+ return -1;\r
}\r
\r
printf("saveLoad (%i, %i): %s\n", load, sram, saveFname);\r
else\r
{\r
void *PmovFile = NULL;\r
- // try gzip first\r
- if(currentConfig.EmuOpt & 8) {\r
- strcat(saveFname, ".gz");\r
+ if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {\r
if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
- areaRead = gzRead2;\r
- areaWrite = gzWrite2;\r
- areaEof = (areaeof *) gzeof;\r
+ emu_set_save_cbs(1);\r
if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
- } else\r
- saveFname[strlen(saveFname)-3] = 0;\r
+ }\r
}\r
- if(!PmovFile) { // gzip failed or was disabled\r
+ else\r
+ {\r
if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {\r
- areaRead = (arearw *) fread;\r
- areaWrite = (arearw *) fwrite;\r
- areaEof = (areaeof *) feof;\r
+ emu_set_save_cbs(0);\r
}\r
}\r
if(PmovFile) {\r
- PmovState(load ? 6 : 5, PmovFile);\r
- strcpy(noticeMsg, load ? "GAME LOADED " : "GAME SAVED ");\r
- if(areaRead == gzRead2)\r
- gzclose(PmovFile);\r
- else fclose ((FILE *) PmovFile);\r
+ ret = PmovState(load ? 6 : 5, PmovFile);\r
+ areaClose(PmovFile);\r
PmovFile = 0;\r
if (!load) sync();\r
else Pico.m.dirtyPal=1;\r
- } else {\r
+ }\r
+ else ret = -1;\r
+ if (!ret)\r
+ strcpy(noticeMsg, load ? "GAME LOADED " : "GAME SAVED ");\r
+ else\r
+ {\r
strcpy(noticeMsg, load ? "LOAD FAILED " : "SAVE FAILED ");\r
ret = -1;\r
}\r
notaz.gp2x.de / picodrive.git / blobdiff