From: notaz Date: Sat, 5 Jul 2008 23:10:24 +0000 (+0000) Subject: FAMEC idle loops, PSP port sync, minor adjustments X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a091e48251d061ad06ffd12dfe205cbb42c78df;p=libpicofe.git FAMEC idle loops, PSP port sync, minor adjustments git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@525 be3aeb3a-fb24-0410-a615-afba39da0efa --- diff --git a/common/emu.c b/common/emu.c index 1d57e22..44e15a6 100644 --- a/common/emu.c +++ b/common/emu.c @@ -43,6 +43,7 @@ int state_slot = 0; int config_slot = 0, config_slot_current = 0; char lastRomFile[512]; int kb_combo_keys = 0, kb_combo_acts = 0; // keys and actions which need button combos +int pico_inp_mode = 0; unsigned char *movie_data = NULL; static int movie_size = 0; @@ -971,3 +972,60 @@ int emu_SaveLoadGame(int load, int sram) } } +void emu_changeFastForward(int set_on) +{ + static void *set_PsndOut = NULL; + static int set_Frameskip, set_EmuOpt, is_on = 0; + + if (set_on && !is_on) { + set_PsndOut = PsndOut; + set_Frameskip = currentConfig.Frameskip; + set_EmuOpt = currentConfig.EmuOpt; + PsndOut = NULL; + currentConfig.Frameskip = 8; + currentConfig.EmuOpt &= ~4; + currentConfig.EmuOpt |= 0x40000; + is_on = 1; + strcpy(noticeMsg, "FAST FORWARD "); + emu_noticeMsgUpdated(); + } + else if (!set_on && is_on) { + PsndOut = set_PsndOut; + currentConfig.Frameskip = set_Frameskip; + currentConfig.EmuOpt = set_EmuOpt; + PsndRerate(1); + is_on = 0; + } +} + +void emu_RunEventsPico(unsigned int events) +{ + if (events & (1 << 3)) { + pico_inp_mode++; + if (pico_inp_mode > 2) pico_inp_mode = 0; + switch (pico_inp_mode) { + case 2: strcpy(noticeMsg, "Input: Pen on Pad "); break; + case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break; + case 0: strcpy(noticeMsg, "Input: Joytick "); + PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000; + break; + } + emu_noticeMsgUpdated(); + } + if (events & (1 << 4)) { + PicoPicohw.page--; + if (PicoPicohw.page < 0) PicoPicohw.page = 0; + sprintf(noticeMsg, "Page %i ", PicoPicohw.page); + emu_noticeMsgUpdated(); + } + if (events & (1 << 5)) { + PicoPicohw.page++; + if (PicoPicohw.page > 6) PicoPicohw.page = 6; + sprintf(noticeMsg, "Page %i ", PicoPicohw.page); + emu_noticeMsgUpdated(); + } +} + + + + diff --git a/common/emu.h b/common/emu.h index 922633a..ac75dd0 100644 --- a/common/emu.h +++ b/common/emu.h @@ -36,6 +36,7 @@ extern int config_slot, config_slot_current; extern unsigned char *movie_data; extern char lastRomFile[512]; extern int kb_combo_keys, kb_combo_acts; // keys and actions which need button combos +extern int pico_inp_mode; int emu_ReloadRom(void); @@ -53,6 +54,8 @@ void emu_textOut16(int x, int y, const char *text); char *emu_makeRomId(void); void emu_findKeyBindCombos(void); void emu_forcedFrame(int opts); +void emu_changeFastForward(int set_on); +void emu_RunEventsPico(unsigned int events); extern const char * const keyNames[]; void emu_prepareDefaultConfig(void); diff --git a/gp2x/emu.c b/gp2x/emu.c index 14080a5..19f3c67 100644 --- a/gp2x/emu.c +++ b/gp2x/emu.c @@ -55,7 +55,7 @@ int reset_timing = 0; #define PICO_PEN_ADJUST_X 4 #define PICO_PEN_ADJUST_Y 2 -static int pico_pen_x = 320/2, pico_pen_y = 240/2, pico_inp_mode = 0; +static int pico_pen_x = 320/2, pico_pen_y = 240/2; static void emu_msg_cb(const char *msg); static void emu_msg_tray_open(void); @@ -436,31 +436,10 @@ static void emu_msg_tray_open(void) static void RunEventsPico(unsigned int events, unsigned int gp2x_keys) { - if (events & (1 << 3)) { - pico_inp_mode++; - if (pico_inp_mode > 2) pico_inp_mode = 0; - switch (pico_inp_mode) { - case 2: strcpy(noticeMsg, "Input: Pen on Pad "); break; - case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break; - case 0: strcpy(noticeMsg, "Input: Joytick "); - PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000; - break; - } - gettimeofday(¬iceMsgTime, 0); - } - if (events & (1 << 4)) { - PicoPicohw.page--; - if (PicoPicohw.page < 0) PicoPicohw.page = 0; - sprintf(noticeMsg, "Page %i ", PicoPicohw.page); - gettimeofday(¬iceMsgTime, 0); - } - if (events & (1 << 5)) { - PicoPicohw.page++; - if (PicoPicohw.page > 6) PicoPicohw.page = 6; - sprintf(noticeMsg, "Page %i ", PicoPicohw.page); - gettimeofday(¬iceMsgTime, 0); - } - if (pico_inp_mode != 0) { + emu_RunEventsPico(events); + + if (pico_inp_mode != 0) + { PicoPad[0] &= ~0x0f; // release UDLR if (gp2x_keys & GP2X_UP) { pico_pen_y--; if (pico_pen_y < 0) pico_pen_y = 0; } if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 239-PICO_PEN_ADJUST_Y) pico_pen_y = 239-PICO_PEN_ADJUST_Y; } @@ -512,31 +491,6 @@ static void update_volume(int has_changed, int is_up) } } -static void change_fast_forward(int set_on) -{ - static void *set_PsndOut = NULL; - static int set_Frameskip, set_EmuOpt, is_on = 0; - - if (set_on && !is_on) { - set_PsndOut = PsndOut; - set_Frameskip = currentConfig.Frameskip; - set_EmuOpt = currentConfig.EmuOpt; - PsndOut = NULL; - currentConfig.Frameskip = 8; - currentConfig.EmuOpt &= ~4; - is_on = 1; - } - else if (!set_on && is_on) { - PsndOut = set_PsndOut; - currentConfig.Frameskip = set_Frameskip; - currentConfig.EmuOpt = set_EmuOpt; - PsndRerate(1); - update_volume(0, 0); - reset_timing = 1; - is_on = 0; - } -} - static void RunEvents(unsigned int which) { if (which & 0x1800) // save or load (but not both) @@ -668,14 +622,16 @@ static void updateKeys(void) if (events & 0x6000) update_volume(1, events & 0x2000); - if ((events ^ prevEvents) & 0x40) - change_fast_forward(events & 0x40); + if ((events ^ prevEvents) & 0x40) { + emu_changeFastForward(events & 0x40); + update_volume(0, 0); + reset_timing = 1; + } events &= ~prevEvents; if (PicoAHW == PAHW_PICO) RunEventsPico(events, keys); - if (events) RunEvents(events); if (movie_data) emu_updateMovie(); @@ -1044,7 +1000,7 @@ void emu_Loop(void) frames_done++; frames_shown++; } - change_fast_forward(0); + emu_changeFastForward(0); if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); diff --git a/gp2x/menu.c b/gp2x/menu.c index a0b913a..a9b0825 100644 --- a/gp2x/menu.c +++ b/gp2x/menu.c @@ -432,8 +432,8 @@ rescan: // ------------ debug menu ------------ char *debugString(void); -void PicoDrawShowSpriteStats(unsigned short *screen); -void PicoDrawShowPalette(unsigned short *screen); +void PicoDrawShowSpriteStats(unsigned short *screen, int stride); +void PicoDrawShowPalette(unsigned short *screen, int stride); static void draw_main_debug(void) { @@ -477,8 +477,10 @@ static void debug_menu_loop(void) { case 0: draw_main_debug(); break; case 1: draw_frame_debug(); break; - case 2: PicoDrawShowSpriteStats(gp2x_screen); break; - case 3: PicoDrawShowPalette(gp2x_screen); break; + case 2: gp2x_pd_clone_buffer2(); + PicoDrawShowSpriteStats(gp2x_screen, 320); break; + case 3: memset(gp2x_screen, 0, 320*240*2); + PicoDrawShowPalette(gp2x_screen, 320); break; } menu_flip(); @@ -1186,7 +1188,7 @@ menu_entry opt_entries[] = { { NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1, 1 }, { NULL, MB_RANGE, MA_OPT_SCALING, ¤tConfig.scaling, 0, 0, 3, 1, 1 }, - { "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 }, + { "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 }, { "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x002, 0, 0, 1, 1 }, { NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1, 1 }, { "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x004, 0, 0, 1, 1 }, diff --git a/linux/port_config.h b/linux/port_config.h index 21e5b32..5ccbacb 100644 --- a/linux/port_config.h +++ b/linux/port_config.h @@ -15,7 +15,7 @@ #define SIMPLE_WRITE_SOUND 0 #define mix_32_to_16l_stereo_lvl mix_32_to_16l_stereo -#define EL_LOGMASK (EL_ANOMALY|EL_STATUS|EL_SRAMIO|EL_EEPROM|EL_UIO)//|EL_VDPDMA|EL_HVCNT|EL_ASVDP)//|EL_SVP) +#define EL_LOGMASK (EL_ANOMALY|EL_STATUS|EL_SRAMIO|EL_EEPROM|EL_UIO|EL_IDLE)//|EL_VDPDMA|EL_HVCNT|EL_ASVDP)//|EL_SVP) // EL_VDPDMA|EL_ASVDP|EL_SR) // |EL_BUSREQ|EL_Z80BNK) //#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__) diff --git a/psp/Makefile b/psp/Makefile index c89f1d6..69505e3 100644 --- a/psp/Makefile +++ b/psp/Makefile @@ -43,6 +43,8 @@ OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pi # Pico - carthw OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \ ../../Pico/carthw/svp/ssp16.o +# Pico - Pico +OBJS += ../../Pico/Pico/Pico.o ../../Pico/Pico/Memory.o ../../Pico/Pico/xpcm.o endif # Pico - sound diff --git a/psp/emu.c b/psp/emu.c index 09b5d46..bdf6a6e 100644 --- a/psp/emu.c +++ b/psp/emu.c @@ -39,6 +39,9 @@ int engineState = PGS_Menu; static unsigned int noticeMsgTime = 0; int reset_timing = 0; // do we need this? +#define PICO_PEN_ADJUST_X 4 +#define PICO_PEN_ADJUST_Y 2 +static int pico_pen_x = 320/2, pico_pen_y = 240/2; static void sound_init(void); static void sound_deinit(void); @@ -122,7 +125,7 @@ void emu_prepareDefaultConfig(void) { memset(&defaultConfig, 0, sizeof(defaultConfig)); defaultConfig.EmuOpt = 0x1d | 0x680; // | <- confirm_save, cd_leds, acc rend - defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX; + defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX|POPT_ACC_SPRITES; defaultConfig.s_PsndRate = 22050; defaultConfig.s_PicoRegion = 0; // auto defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP @@ -164,7 +167,7 @@ void emu_setDefaultConfig(void) extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count); -extern void (*amips_clut_f)(unsigned short *dst, unsigned char *src, unsigned short *pal, int count) = NULL; +static void (*amips_clut_f)(unsigned short *dst, unsigned char *src, unsigned short *pal, int count) = NULL; struct Vertex { @@ -265,12 +268,11 @@ static void do_pal_update(int allow_sh, int allow_as) localPal[0x80|i]=(unsigned short)t; } localPal[0xe0] = 0; + localPal[0xf0] = 0x001f; } else if (allow_as && (rendstatus & PDRAW_ACC_SPRITES)) { - memcpy32(localPal+0x40, localPal, 0x40); - memcpy32(localPal+0x80, localPal, 0x40); - memcpy32(localPal+0xc0, localPal, 0x40); + memcpy32((int *)(void *)(localPal+0x80), (void *)localPal, 0x40/2); } } @@ -340,7 +342,7 @@ static void blitscreen_clut(void) if (dynamic_palette) { - if (!blit_16bit_mode) { + if (!blit_16bit_mode) { // the current mode is not 16bit sceGuTexMode(GU_PSM_5650, 0, 0, 0); sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 512*240); @@ -407,6 +409,21 @@ static void cd_leds(void) *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; } +static void draw_pico_ptr(void) +{ + unsigned char *p = (unsigned char *)VRAM_STUFF + 16; + + // only if pen enabled and for 8bit mode + if (pico_inp_mode == 0 || blit_16bit_mode) return; + + p += 512 * (pico_pen_y + PICO_PEN_ADJUST_Y); + p += pico_pen_x + PICO_PEN_ADJUST_X; + p[ -1] = 0xe0; p[ 0] = 0xf0; p[ 1] = 0xe0; + p[ 511] = 0xf0; p[ 512] = 0xf0; p[ 513] = 0xf0; + p[1023] = 0xe0; p[1024] = 0xf0; p[1025] = 0xe0; +} + + #if 0 static void dbg_text(void) { @@ -438,6 +455,9 @@ void blit1(void) memset32((int *)pd, 0xe0e0e0e0, 320/4); } + if (PicoAHW & PAHW_PICO) + draw_pico_ptr(); + blitscreen_clut(); } @@ -502,6 +522,7 @@ static void vidResetMode(void) PicoScanEnd = EmuScanSlowEnd; localPal[0xe0] = 0; + localPal[0xf0] = 0x001f; Pico.m.dirtyPal = 1; blit_16bit_mode = dynamic_palette = 0; @@ -693,7 +714,7 @@ void emu_forcedFrame(int opts) int eo_old = currentConfig.EmuOpt; PicoOpt &= ~0x10; - PicoOpt |= opts|POPT_ACC_SPRITES + PicoOpt |= opts|POPT_ACC_SPRITES; currentConfig.EmuOpt |= 0x80; vidResetMode(); @@ -714,6 +735,29 @@ void emu_forcedFrame(int opts) } +static void RunEventsPico(unsigned int events, unsigned int keys) +{ + emu_RunEventsPico(events); + + if (pico_inp_mode != 0) + { + PicoPad[0] &= ~0x0f; // release UDLR + if (keys & BTN_UP) { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; } + if (keys & BTN_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; } + if (keys & BTN_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; } + if (keys & BTN_RIGHT) { + int lim = (Pico.video.reg[12]&1) ? 319 : 255; + pico_pen_x++; + if (pico_pen_x > lim-PICO_PEN_ADJUST_X) + pico_pen_x = lim-PICO_PEN_ADJUST_X; + } + PicoPicohw.pen_pos[0] = pico_pen_x; + if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4; + PicoPicohw.pen_pos[0] += 0x3c; + PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y); + } +} + static void RunEvents(unsigned int which) { if (which & 0x1800) // save or load (but not both) @@ -822,7 +866,15 @@ static void updateKeys(void) events = (allActions[0] | allActions[1]) >> 16; + if ((events ^ prevEvents) & 0x40) { + emu_changeFastForward(events & 0x40); + reset_timing = 1; + } + events &= ~prevEvents; + + if (PicoAHW == PAHW_PICO) + RunEventsPico(events, keys); if (events) RunEvents(events); if (movie_data) emu_updateMovie(); @@ -1030,6 +1082,8 @@ void emu_Loop(void) } + emu_changeFastForward(0); + if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); if (PsndOut != NULL) { diff --git a/psp/main.c b/psp/main.c index 952f80e..4c7eef6 100644 --- a/psp/main.c +++ b/psp/main.c @@ -10,6 +10,7 @@ #include "mp3.h" #include "../common/menu.h" #include "../common/emu.h" +#include "../common/config.h" #include "../common/lprintf.h" #include "version.h" diff --git a/psp/menu.c b/psp/menu.c index 1c1b5df..966dee4 100644 --- a/psp/menu.c +++ b/psp/menu.c @@ -62,8 +62,6 @@ static unsigned long wait_for_input(unsigned int interesting, int is_key_config) else if (repeats == 4) wait = 2; else if (repeats == 6) wait = 1; - for (i = 0; i < wait && inp_prev == gp2x_joystick_read(1); i++) { - for (i = 0; i < wait && inp_prev == psp_pad_read(1); i++) { if (i == 0) repeats++; psp_msleep(30); @@ -439,8 +437,10 @@ static char *romsel_loop(char *curr_path) // ------------ debug menu ------------ char *debugString(void); +void PicoDrawShowSpriteStats(unsigned short *screen, int stride); +void PicoDrawShowPalette(unsigned short *screen, int stride); -static void draw_debug(void) +static void draw_main_debug(void) { char *p, *str = debugString(); int len, line; @@ -457,15 +457,49 @@ static void draw_debug(void) if (*p == 0) break; p++; str = p; } - menu_draw_end(); +} + +static void draw_frame_debug(void) +{ + char layer_str[48] = "layers: "; + if (PicoDrawMask & PDRAW_LAYERB_ON) memcpy(layer_str + 8, "B", 1); + if (PicoDrawMask & PDRAW_LAYERA_ON) memcpy(layer_str + 10, "A", 1); + if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6); + if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6); + + memset(psp_screen, 0, 512*272*2); + emu_forcedFrame(0); + smalltext_out16(4, 264, layer_str, 0xffff); } static void debug_menu_loop(void) { - int ret = 0; - draw_debug(); - while (!(ret & (BTN_X|BTN_CIRCLE))) - ret = wait_for_input(BTN_X|BTN_CIRCLE, 0); + int inp, mode = 0; + + while (1) + { + switch (mode) + { + case 0: draw_main_debug(); break; + case 1: draw_frame_debug(); break; + case 2: menu_draw_begin(); + PicoDrawShowSpriteStats((unsigned short *)psp_screen+512*16+80, 512); break; + case 3: memset(psp_screen, 0, 512*272*2); + PicoDrawShowPalette(psp_screen, 512); break; + } + menu_draw_end(); + + inp = wait_for_input(BTN_X|BTN_CIRCLE|BTN_L|BTN_R|BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT, 0); + if (inp & (BTN_X|BTN_CIRCLE)) return; + if (inp & BTN_L) { mode--; if (mode < 0) mode = 3; } + if (inp & BTN_R) { mode++; if (mode > 3) mode = 0; } + if (mode == 1) { + if (inp & BTN_LEFT) PicoDrawMask ^= PDRAW_LAYERB_ON; + if (inp & BTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON; + if (inp & BTN_DOWN) PicoDrawMask ^= PDRAW_SPRITES_LOW_ON; + if (inp & BTN_UP) PicoDrawMask ^= PDRAW_SPRITES_HI_ON; + } + } } // ------------ patch/gg menu ------------ @@ -592,7 +626,7 @@ static void draw_savestate_bg(int slot) areaClose(file); } - emu_forcedFrame(); + emu_forcedFrame(0); menu_prepare_bg(1, 0); restore_oldstate(oldstate); @@ -797,12 +831,16 @@ static void draw_kc_sel(int menu_sel) // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE" me_bind_action emuctrl_actions[] = { - { "Load State ", 1<<28 }, - { "Save State ", 1<<27 }, - { "Prev Save Slot ", 1<<25 }, - { "Next Save Slot ", 1<<24 }, - { "Switch Renderer", 1<<26 }, - { NULL, 0 } + { "Load State ", 1<<28 }, + { "Save State ", 1<<27 }, + { "Prev Save Slot ", 1<<25 }, + { "Next Save Slot ", 1<<24 }, + { "Switch Renderer ", 1<<26 }, + { "Fast forward ", 1<<22 }, + { "Pico Next page ", 1<<21 }, + { "Pico Prev page ", 1<<20 }, + { "Pico Switch input", 1<<19 }, + { NULL, 0 } }; static void kc_sel_loop(void) @@ -1065,7 +1103,7 @@ static void menu_opt3_preview(int is_32col) } memset32_uncached(psp_screen, 0, 512*272*2/4); - emu_forcedFrame(); + emu_forcedFrame(0); menu_prepare_bg(1, 0); if (oldstate) restore_oldstate(oldstate); @@ -1176,7 +1214,7 @@ menu_entry opt2_entries[] = { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1, 1 }, { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1, 1 }, { "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1, 1 }, - { "Disable frame limitter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1, 1 }, + { "Disable frame limiter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1, 1 }, { "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1, 0 }, }; @@ -1235,7 +1273,7 @@ static void amenu_loop_options(void) menu_entry opt_entries[] = { { NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1, 1 }, - { "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x0080, 0, 0, 1, 1 }, + { "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x0080, 0, 0, 0, 1 }, { "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1, 1 }, { NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1, 1 }, { "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x0004, 0, 0, 1, 1 }, diff --git a/psp/port_config.h b/psp/port_config.h index 3bd139d..56513c0 100644 --- a/psp/port_config.h +++ b/psp/port_config.h @@ -23,7 +23,7 @@ extern void blit1(void); #define CAN_HANDLE_240_LINES 1 // logging emu events -#define EL_LOGMASK EL_STATUS // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO) // xffff +#define EL_LOGMASK (EL_STATUS|EL_IDLE) // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO) // xffff //#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__) #define dprintf(x...)