X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pandora%2Femu.c;h=a9a21193a7dbd1ea030682c6c6cd7bf2d638d6a5;hb=9b8ad40b4854013fa97627e706327d9a174a4fa9;hp=55cb371fd3673a4cdf84655627e47cfe057da9d3;hpb=2c60056042e94007286e3e0e1789f4c9a78b7731;p=libpicofe.git diff --git a/pandora/emu.c b/pandora/emu.c index 55cb371..a9a2119 100644 --- a/pandora/emu.c +++ b/pandora/emu.c @@ -1,4 +1,4 @@ -// (c) Copyright 2006-2008 notaz, All rights reserved. +// (c) Copyright 2006-2009 notaz, All rights reserved. // Free for non-commercial use. // For commercial use, separate licencing terms must be obtained. @@ -6,12 +6,6 @@ #include #include #include -#include -#include -#include -#include -#include - #include #include "../common/arm_utils.h" @@ -19,7 +13,6 @@ #include "../common/emu.h" #include "../common/menu.h" #include "../common/config.h" -#include "../common/common.h" #include "../common/input.h" #include "../linux/sndout_oss.h" #include "asm_utils.h" @@ -40,28 +33,16 @@ #endif -int select_exits = 0; - static short __attribute__((aligned(4))) sndBuffer[2*44100/50]; -static struct timeval noticeMsgTime = { 0, 0 }; // when started showing static int osd_fps_x; unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer -int reset_timing = 0; #define PICO_PEN_ADJUST_X 4 #define PICO_PEN_ADJUST_Y 2 static int pico_pen_x = 0, pico_pen_y = 240/2; -static void emu_msg_cb(const char *msg); -static void emu_msg_tray_open(void); - - -void emu_noticeMsgUpdated(void) -{ - gettimeofday(¬iceMsgTime, 0); -} -int emu_getMainDir(char *dst, int len) +int plat_get_root_dir(char *dst, int len) { extern char **g_argv; int j; @@ -76,49 +57,7 @@ int emu_getMainDir(char *dst, int len) return j + 1; } -void emu_Init(void) -{ - // make temp buffer for alt renderer - PicoDraw2FB = malloc((8+320)*(8+240+8)); - if (!PicoDraw2FB) - { - printf("PicoDraw2FB == 0\n"); - } - - // make dirs for saves, cfgs, etc. - mkdir("mds", 0777); - mkdir("srm", 0777); - mkdir("brm", 0777); - mkdir("cfg", 0777); - - PicoInit(); - PicoMessage = emu_msg_cb; - PicoMCDopenTray = emu_msg_tray_open; - PicoMCDcloseTray = menu_loop_tray; -} - - -void emu_Deinit(void) -{ - // save SRAM - if((currentConfig.EmuOpt & 1) && SRam.changed) { - emu_SaveLoadGame(0, 1); - SRam.changed = 0; - } - - if (!(currentConfig.EmuOpt & 0x20)) { - config_writelrom(PicoConfigFile); -#ifndef NO_SYNC - sync(); -#endif - } - - free(PicoDraw2FB); - - PicoExit(); -} - -void emu_prepareDefaultConfig(void) +void pemu_prep_defconfig(void) { memset(&defaultConfig, 0, sizeof(defaultConfig)); defaultConfig.EmuOpt = 0x8f | 0x00600; // | <- confirm_save, cd_leds @@ -171,7 +110,7 @@ static void textOut16(int x, int y, const char *text) } -void osd_text(int x, int y, const char *text) +static void osd_text(int x, int y, const char *text) { int len = strlen(text)*8; @@ -183,7 +122,7 @@ void osd_text(int x, int y, const char *text) p = (int *) ((unsigned char *) g_screen_ptr+x+g_screen_width*(y+h)); for (i = len; i; i--, p++) *p = 0xe0e0e0e0; } - emu_textOut8(x, y, text); + emu_text_out8(x, y, text); } else { int *p, i, h; x &= ~1; // align x @@ -192,7 +131,7 @@ void osd_text(int x, int y, const char *text) p = (int *) ((unsigned short *) g_screen_ptr+x+g_screen_width*(y+h)); for (i = len; i; i--, p++) *p = 0;//(*p>>2)&0x39e7; } - textOut16(x, y, text); + text_out16(x, y, text); } } @@ -428,95 +367,6 @@ static void vidResetMode(void) } -static void emu_msg_cb(const char *msg) -{ -/* - if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) { - // 8-bit renderers - gp2x_memset_all_buffers(g_screen_width*(g_screen_height-16), 0xe0, g_screen_width*16); - osd_text(4, g_screen_height-16, msg); - gp2x_memcpy_all_buffers((char *)g_screen_ptr+g_screen_width*(g_screen_height-16), - g_screen_width*(g_screen_height-16), g_screen_width*16); - } else { - // 16bit accurate renderer - gp2x_memset_all_buffers(g_screen_width*(g_screen_height-16)*2, 0, g_screen_width*16*2); - osd_text(4, g_screen_height-16, msg); - gp2x_memcpy_all_buffers((char *)g_screen_ptr+g_screen_width*(g_screen_height-16)*2, - g_screen_width*(g_screen_height-16)*2, g_screen_width*16*2); - } - gettimeofday(¬iceMsgTime, 0); - noticeMsgTime.tv_sec -= 2; -*/ - /* assumption: emu_msg_cb gets called only when something slow is about to happen */ - reset_timing = 1; -} - -static void emu_state_cb(const char *str) -{ - clearArea(0); - blit("", str); -} - -static void emu_msg_tray_open(void) -{ - strcpy(noticeMsg, "CD tray opened"); - gettimeofday(¬iceMsgTime, 0); -} - -#if 0 -static void RunEventsPico(unsigned int events, unsigned int gp2x_keys) -{ - int ret, px, py, lim_x; - static int pdown_frames = 0; - - emu_RunEventsPico(events); - - if (pico_inp_mode == 0) return; - - // for F200 - ret = gp2x_touchpad_read(&px, &py); - if (ret >= 0) - { - if (ret > 35000) - { - if (pdown_frames++ > 5) - PicoPad[0] |= 0x20; - - pico_pen_x = px; - pico_pen_y = py; - if (!(Pico.video.reg[12]&1)) { - pico_pen_x -= 32; - if (pico_pen_x < 0) pico_pen_x = 0; - if (pico_pen_x > 248) pico_pen_x = 248; - } - if (pico_pen_y > 224) pico_pen_y = 224; - } - else - pdown_frames = 0; - - //if (ret == 0) - // PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000; - } - - PicoPad[0] &= ~0x0f; // release UDLR - if (gp2x_keys & GP2X_UP) pico_pen_y--; - if (gp2x_keys & GP2X_DOWN) pico_pen_y++; - if (gp2x_keys & GP2X_LEFT) pico_pen_x--; - if (gp2x_keys & GP2X_RIGHT) pico_pen_x++; - - lim_x = (Pico.video.reg[12]&1) ? 319 : 255; - if (pico_pen_y < 8) pico_pen_y = 8; - if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; - if (pico_pen_x < 0) pico_pen_x = 0; - if (pico_pen_x > lim_x-PICO_PEN_ADJUST_X) pico_pen_x = lim_x-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); -} -#endif - static void update_volume(int has_changed, int is_up) { static int prev_frame = 0, wait_frames = 0; @@ -551,108 +401,6 @@ static void update_volume(int has_changed, int is_up) } } -static void RunEvents(unsigned int which) -{ - if (which & 0x1800) // save or load (but not both) - { - int do_it = 1; - if ( emu_checkSaveFile(state_slot) && - (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load - (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save -#if 0 - unsigned long keys; - blit("", (which & 0x1000) ? "LOAD STATE? (Y=yes, X=no)" : "OVERWRITE SAVE? (Y=yes, X=no)"); - while ( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) ) - usleep(50*1024); - if (keys & GP2X_X) do_it = 0; - while ( gp2x_joystick_read(1) & (GP2X_X|GP2X_Y) ) // wait for release - usleep(50*1024); - clearArea(0); -#endif - } - if (do_it) { - osd_text(4, g_screen_height-16, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME"); - PicoStateProgressCB = emu_state_cb; - //gp2x_memcpy_all_buffers(g_screen_ptr, 0, g_screen_width*g_screen_height*2); - emu_SaveLoadGame((which & 0x1000) >> 12, 0); - PicoStateProgressCB = NULL; - } - - reset_timing = 1; - } - if (which & 0x0400) // switch renderer - { - if ( PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; } - else if (!(currentConfig.EmuOpt&0x80)) PicoOpt|= 0x10; - else currentConfig.EmuOpt &= ~0x80; - - vidResetMode(); - - if (PicoOpt&0x10) { - strcpy(noticeMsg, " 8bit fast renderer"); - } else if (currentConfig.EmuOpt&0x80) { - strcpy(noticeMsg, "16bit accurate renderer"); - } else { - strcpy(noticeMsg, " 8bit accurate renderer"); - } - - gettimeofday(¬iceMsgTime, 0); - } - if (which & 0x0300) - { - if(which&0x0200) { - state_slot -= 1; - if(state_slot < 0) state_slot = 9; - } else { - state_slot += 1; - if(state_slot > 9) state_slot = 0; - } - sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE"); - gettimeofday(¬iceMsgTime, 0); - } - if (which & 0x0080) { - engineState = PGS_Menu; - } -} - -static void updateKeys(void) -{ - unsigned int allActions[2] = { 0, 0 }, events; - static unsigned int prevEvents = 0; - - /* FIXME: combos, player2 */ - allActions[0] = in_update(); - - PicoPad[0] = allActions[0] & 0xfff; - PicoPad[1] = allActions[1] & 0xfff; - - if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]); - if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]); - - events = (allActions[0] | allActions[1]) >> 16; - - // volume is treated in special way and triggered every frame - if (events & 0x6000) - update_volume(1, events & 0x2000); - - 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(); - - prevEvents = (allActions[0] | allActions[1]) >> 16; -} - static void updateSound(int len) { @@ -672,7 +420,7 @@ static void SkipFrame(int do_audio) } -void emu_forcedFrame(int opts) +void pemu_forced_frame(int opts) { int po_old = PicoOpt; int eo_old = currentConfig.EmuOpt; @@ -706,9 +454,8 @@ void emu_forcedFrame(int opts) currentConfig.EmuOpt = eo_old; } -void emu_platformDebugCat(char *str) +void plat_debug_cat(char *str) { - // nothing } static void simpleWait(int thissec, int lim_time) @@ -727,7 +474,7 @@ static void simpleWait(int thissec, int lim_time) } } -void emu_startSound(void) +void pemu_sound_start(void) { static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0; int target_fps = Pico.m.pal ? 50 : 60; @@ -755,17 +502,16 @@ void emu_startSound(void) } } -void emu_endSound(void) +void pemu_sound_stop(void) { } -/* wait until we can write more sound */ -void emu_waitSound(void) +void pemu_sound_wait(void) { // don't need to do anything, writes will block by themselves } -void emu_Loop(void) +void pemu_loop(void) { char fpsbuff[24]; // fps count c string struct timeval tval; // timing @@ -788,7 +534,7 @@ void emu_Loop(void) target_frametime = 1000000/target_fps; reset_timing = 1; - emu_startSound(); + pemu_sound_start(); // prepare CD buffer if (PicoAHW & PAHW_MCD) PicoCDBufferInit(); @@ -895,7 +641,7 @@ void emu_Loop(void) // it is quite common for this implementation to leave 1 fame unfinished // when second changes, but we don't want buffer to starve. if(PsndOut && pframes_done < target_fps && pframes_done > target_fps-5) { - updateKeys(); + emu_update_input(); SkipFrame(1); pframes_done++; } @@ -910,7 +656,7 @@ void emu_Loop(void) if (currentConfig.Frameskip >= 0) // frameskip enabled { for(i = 0; i < currentConfig.Frameskip; i++) { - updateKeys(); + emu_update_input(); SkipFrame(1); pframes_done++; frames_done++; if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled gettimeofday(&tval, 0); @@ -931,12 +677,12 @@ void emu_Loop(void) reset_timing = 1; continue; } - updateKeys(); + emu_update_input(); SkipFrame(tval.tv_usec < lim_time+target_frametime*2); pframes_done++; frames_done++; continue; } - updateKeys(); + emu_update_input(); PicoFrame(); // check time @@ -969,26 +715,20 @@ void emu_Loop(void) frames_done++; frames_shown++; } - emu_changeFastForward(0); + emu_set_fastforward(0); if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); // save SRAM - if((currentConfig.EmuOpt & 1) && SRam.changed) { + if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) { + /* FIXME: plat_status_msg_busy_first */ emu_state_cb("Writing SRAM/BRAM.."); - emu_SaveLoadGame(0, 1); + emu_save_load_game(0, 1); SRam.changed = 0; } // if in 8bit mode, generate 16bit image for menu background if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) - emu_forcedFrame(POPT_EN_SOFTSCALE); -} - - -void emu_ResetGame(void) -{ - PicoReset(); - reset_timing = 1; + pemu_forced_frame(POPT_EN_SOFTSCALE); }