From ff6b7429bb03e37e2d44eabcd0d86bd5713d2fc1 Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 25 Nov 2007 16:45:26 +0000 Subject: [PATCH] minor adjustments git-svn-id: file:///home/notaz/opt/svn/PicoDrive@305 be3aeb3a-fb24-0410-a615-afba39da0efa --- Pico/Cart.c | 2 +- platform/psp/Makefile | 9 ++++++++- platform/psp/emu.c | 2 +- platform/psp/psp.c | 5 +++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Pico/Cart.c b/Pico/Cart.c index cf71f24f..6f97a423 100644 --- a/Pico/Cart.c +++ b/Pico/Cart.c @@ -250,7 +250,7 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream) if (block != cso->block_in_buff) { if (read_pos != cso->fpos_in) - { fseek(stream->file, read_pos, SEEK_SET); printf("seek %i\n", read_pos); } + fseek(stream->file, read_pos, SEEK_SET); rret = fread(cso->in_buff, 1, read_len, stream->file); cso->fpos_in = read_pos + rret; if (rret != read_len) { diff --git a/platform/psp/Makefile b/platform/psp/Makefile index d2e0ac20..c2870540 100644 --- a/platform/psp/Makefile +++ b/platform/psp/Makefile @@ -174,6 +174,13 @@ rel: EBOOT.PBP readme.txt mkdir -p PicoDrive/skin/ cp $^ PicoDrive/ cp skin/* PicoDrive/skin/ - zip -9 -r ../../PicoDrive_$(VER).zip PicoDrive + zip -9 -r ../../PicoDrive_psp_$(VER).zip PicoDrive rm -rf PicoDrive +rel_kxploit: readme.txt + mkdir -p PicoDrive/skin/ + cp $^ PicoDrive/ + cp skin/* PicoDrive/skin/ + zip -9 -r ../../PicoDrive_psp_$(VER)_kxploit.zip PicoDrive + zip -9 -r ../../PicoDrive_psp_$(VER)_kxploit.zip PicoDrive% + diff --git a/platform/psp/emu.c b/platform/psp/emu.c index 665e41cc..9c69d88a 100644 --- a/platform/psp/emu.c +++ b/platform/psp/emu.c @@ -33,7 +33,7 @@ int sceAudioOutput2GetRestSample(); char romFileName[PATH_MAX]; unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword.. -int engineState; +int engineState = PGS_Menu; static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos static unsigned int noticeMsgTime = 0; diff --git a/platform/psp/psp.c b/platform/psp/psp.c index cdf26ae2..6b65c2a6 100644 --- a/platform/psp/psp.c +++ b/platform/psp/psp.c @@ -44,7 +44,12 @@ int main() thid = sceKernelCreateThread("pico_main", (SceKernelThreadEntry) pico_main, 32, 0x2000, PSP_THREAD_ATTR_USER, NULL); if (thid >= 0) sceKernelStartThread(thid, 0, 0); +#ifndef GCOV sceKernelExitDeleteThread(0); +#else + while (engineState != PGS_Quit) + sceKernelDelayThread(1024 * 1024); +#endif return 0; } -- 2.39.5