X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=237105addc1dbd69f6dd154763db00b8e27dbfdf;hb=e31266dd116b6bea59ce3f2036feeb6725c45a72;hp=77bd83e695fc1bf290347342edb54eb30be8b77c;hpb=f11bad75edc8966e9f84b040163cc86e830c46c6;p=libpicofe.git diff --git a/gp2x/emu.c b/gp2x/emu.c index 77bd83e..237105a 100644 --- a/gp2x/emu.c +++ b/gp2x/emu.c @@ -16,13 +16,15 @@ #include "emu.h" #include "gp2x.h" -#include "usbjoy.h" #include "menu.h" #include "../common/arm_utils.h" #include "../common/fonts.h" #include "../common/emu.h" #include "../common/config.h" +#include "../common/input.h" +#include "../linux/sndout_oss.h" #include "cpuctrl.h" +#include "version.h" #include #include @@ -38,11 +40,8 @@ #endif -int engineState; int select_exits = 0; -char romFileName[PATH_MAX]; - extern int crashed_940; static short __attribute__((aligned(4))) sndBuffer[2*44100/50]; @@ -122,12 +121,8 @@ void emu_Deinit(void) SRam.changed = 0; } - if (!(currentConfig.EmuOpt & 0x20)) { - config_writelrom(PicoConfigFile); -#ifndef NO_SYNC - sync(); -#endif - } + if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG)) + emu_writelrom(); free(PicoDraw2FB); @@ -171,23 +166,24 @@ void emu_prepareDefaultConfig(void) void osd_text(int x, int y, const char *text) { int len = strlen(text)*8; + int *p, i, h, offs; if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) { - int *p, i, h; - x &= ~3; // align x len = (len+3) >> 2; for (h = 0; h < 8; h++) { - p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h)); - for (i = len; i; i--, p++) *p = 0xe0e0e0e0; + offs = (x + g_screen_width * (y+h)) & ~3; + p = (int *) ((char *)g_screen_ptr + offs); + for (i = len; i; i--, p++) + *p = 0xe0e0e0e0; } emu_textOut8(x, y, text); } else { - int *p, i, h; - x &= ~1; // align x len = (len+1) >> 1; for (h = 0; h < 8; h++) { - p = (int *) ((unsigned short *) gp2x_screen+x+320*(y+h)); - for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7; + offs = (x + g_screen_width * (y+h)) & ~1; + p = (int *) ((short *)g_screen_ptr + offs); + for (i = len; i; i--, p++) + *p = (*p >> 2) & 0x39e7; } emu_textOut16(x, y, text); } @@ -204,15 +200,15 @@ static void draw_cd_leds(void) // 8-bit modes unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0; unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0; - *(unsigned int *)((char *)gp2x_screen + 320*2+ 4) = - *(unsigned int *)((char *)gp2x_screen + 320*3+ 4) = - *(unsigned int *)((char *)gp2x_screen + 320*4+ 4) = col_g; - *(unsigned int *)((char *)gp2x_screen + 320*2+12) = - *(unsigned int *)((char *)gp2x_screen + 320*3+12) = - *(unsigned int *)((char *)gp2x_screen + 320*4+12) = col_r; + *(unsigned int *)((char *)g_screen_ptr + 320*2+ 4) = + *(unsigned int *)((char *)g_screen_ptr + 320*3+ 4) = + *(unsigned int *)((char *)g_screen_ptr + 320*4+ 4) = col_g; + *(unsigned int *)((char *)g_screen_ptr + 320*2+12) = + *(unsigned int *)((char *)g_screen_ptr + 320*3+12) = + *(unsigned int *)((char *)g_screen_ptr + 320*4+12) = col_r; } else { // 16-bit modes - unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+4); + unsigned int *p = (unsigned int *)((short *)g_screen_ptr + 320*2+4); unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0; unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0; *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2; @@ -223,7 +219,7 @@ static void draw_cd_leds(void) static void draw_pico_ptr(void) { - unsigned short *p = (unsigned short *)gp2x_screen; + unsigned short *p = (unsigned short *)g_screen_ptr; // only if pen enabled and for 16bit modes if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return; @@ -243,7 +239,7 @@ static void draw_pico_ptr(void) static int EmuScanBegin16(unsigned int num) { if (!(Pico.video.reg[1]&8)) num += 8; - DrawLineDest = (unsigned short *) gp2x_screen + 320 * num; + DrawLineDest = (unsigned short *) g_screen_ptr + g_screen_width * num; return 0; } @@ -251,7 +247,7 @@ static int EmuScanBegin16(unsigned int num) static int EmuScanBegin8(unsigned int num) { if (!(Pico.video.reg[1]&8)) num += 8; - DrawLineDest = (unsigned char *) gp2x_screen + 320 * num; + DrawLineDest = (unsigned char *) g_screen_ptr + g_screen_width * num; return 0; } @@ -276,7 +272,7 @@ static void blit(const char *fps, const char *notice) if (PicoRead16Hook == PicoSVPRead16) memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328); // do actual copy - vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8); + vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8); } else if (!(emu_opt&0x80)) { @@ -330,12 +326,12 @@ static void blit(const char *fps, const char *notice) if (!(PicoOpt&0x10)) { if (!(Pico.video.reg[1]&8)) { if (currentConfig.EmuOpt&0x80) { - DrawLineDest = (unsigned short *) gp2x_screen + 320*8; + DrawLineDest = (unsigned short *) g_screen_ptr + 320*8; } else { - DrawLineDest = (unsigned char *) gp2x_screen + 320*8; + DrawLineDest = (unsigned char *) g_screen_ptr + 320*8; } } else { - DrawLineDest = gp2x_screen; + DrawLineDest = g_screen_ptr; } } } @@ -393,12 +389,12 @@ static void emu_msg_cb(const char *msg) // 8-bit renderers gp2x_memset_all_buffers(320*232, 0xe0, 320*8); osd_text(4, 232, msg); - gp2x_memcpy_all_buffers((char *)gp2x_screen+320*232, 320*232, 320*8); + gp2x_memcpy_all_buffers((char *)g_screen_ptr+320*232, 320*232, 320*8); } else { // 16bit accurate renderer gp2x_memset_all_buffers(320*232*2, 0, 320*8*2); osd_text(4, 232, msg); - gp2x_memcpy_all_buffers((char *)gp2x_screen+320*232*2, 320*232*2, 320*8*2); + gp2x_memcpy_all_buffers((char *)g_screen_ptr+320*232*2, 320*232*2, 320*8*2); } gettimeofday(¬iceMsgTime, 0); noticeMsgTime.tv_sec -= 2; @@ -487,7 +483,7 @@ static void update_volume(int has_changed, int is_up) if (vol > 0) vol--; } wait_frames = 0; - gp2x_sound_volume(vol, vol); + sndout_oss_setvol(vol, vol); currentConfig.volume = vol; } sprintf(noticeMsg, "VOL: %02i", vol); @@ -525,7 +521,7 @@ static void RunEvents(unsigned int which) if (do_it) { osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME"); PicoStateProgressCB = emu_state_cb; - gp2x_memcpy_all_buffers(gp2x_screen, 0, 320*240*2); + gp2x_memcpy_all_buffers(g_screen_ptr, 0, 320*240*2); emu_SaveLoadGame((which & 0x1000) >> 12, 0); PicoStateProgressCB = NULL; } @@ -571,18 +567,18 @@ static void updateKeys(void) { unsigned int keys, keys2, allActions[2] = { 0, 0 }, events; static unsigned int prevEvents = 0; - int joy, i; keys = gp2x_joystick_read(0); - if (keys & GP2X_SELECT) { + if (keys & GP2X_SELECT) engineState = select_exits ? PGS_Quit : PGS_Menu; - // wait until select is released, so menu would not resume game - while (gp2x_joystick_read(1) & GP2X_SELECT) usleep(50*1000); - } keys &= CONFIGURABLE_KEYS; keys2 = keys; +#if 1 + /* FIXME: combos, player2 */ + allActions[0] = in_update(); +#else for (i = 0; i < 32; i++) { if (keys2 & (1 << i)) @@ -610,22 +606,7 @@ static void updateKeys(void) } } } - - // add joy inputs - if (num_of_joys > 0) - { - gp2x_usbjoy_update(); - for (joy = 0; joy < num_of_joys; joy++) { - int btns = gp2x_usbjoy_check2(joy); - for (i = 0; i < 32; i++) { - if (btns & (1 << i)) { - int acts = currentConfig.JoyBinds[joy][i]; - int pl = (acts >> 16) & 1; - allActions[pl] |= acts; - } - } - } - } +#endif PicoPad[0] = allActions[0] & 0xfff; PicoPad[1] = allActions[1] & 0xfff; @@ -662,7 +643,47 @@ static void updateSound(int len) /* avoid writing audio when lagging behind to prevent audio lag */ if (PicoSkipFrame != 2) - gp2x_sound_write(PsndOut, len<<1); + sndout_oss_write(PsndOut, len<<1); +} + +void emu_startSound(void) +{ + static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0; + int target_fps = Pico.m.pal ? 50 : 60; + + PsndOut = NULL; + + // prepare sound stuff + if (currentConfig.EmuOpt & 4) + { + int snd_excess_add; + if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || + ((PicoOpt&0x200) && crashed_940)) { + PsndRerate(Pico.m.frame_count ? 1 : 0); + } + snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps; + printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", + PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal); + sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3); + sndout_oss_setvol(currentConfig.volume, currentConfig.volume); + PicoWriteSound = updateSound; + update_volume(0, 0); + memset(sndBuffer, 0, sizeof(sndBuffer)); + PsndOut = sndBuffer; + PsndRate_old = PsndRate; + PicoOpt_old = PicoOpt; + pal_old = Pico.m.pal; + } +} + +void emu_endSound(void) +{ +} + +/* wait until we can write more sound */ +void emu_waitSound(void) +{ + // don't need to do anything, writes will block by themselves } @@ -695,7 +716,7 @@ void emu_forcedFrame(int opts) clearArea(1); } else vidCpyM2 = vidCpyM2_40col; - vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8); + vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8); vidConvCpyRGB32(localPal, Pico.cram, 0x40); gp2x_video_setpalette(localPal, 0x40); */ @@ -758,11 +779,11 @@ static void tga_dump(void) #define CONV(X) (((X>>1)&0x7fe0)|(X&0x1f)) // 555? for (i = 0; i < 320*240; i++) - if(oldscr[i] != CONV(((unsigned short *)gp2x_screen)[i])) break; + if(oldscr[i] != CONV(((unsigned short *)g_screen_ptr)[i])) break; if (i < 320*240) { for (i = 0; i < 320*240; i++) - oldscr[i] = CONV(((unsigned short *)gp2x_screen)[i]); + oldscr[i] = CONV(((unsigned short *)g_screen_ptr)[i]); sprintf(name, "%05i.tga", Pico.m.frame_count); f = fopen(name, "wb"); if (!f) { printf("!f\n"); exit(1); } @@ -776,8 +797,7 @@ static void tga_dump(void) void emu_Loop(void) { - static int gp2x_old_clock = 200; - static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0; + static int gp2x_old_clock = 200, EmuOpt_old = 0; char fpsbuff[24]; // fps count c string struct timeval tval; // timing int pframes_done, pframes_shown, pthissec; // "period" frames, used for sync @@ -821,29 +841,7 @@ void emu_Loop(void) target_frametime = 1000000/target_fps; reset_timing = 1; - // prepare sound stuff - if (currentConfig.EmuOpt & 4) - { - int snd_excess_add; - if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || - ((PicoOpt&0x200) && crashed_940)) { - PsndRerate(Pico.m.frame_count ? 1 : 0); - } - snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps; - printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", - PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal); - gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3); - gp2x_sound_volume(currentConfig.volume, currentConfig.volume); - PicoWriteSound = updateSound; - update_volume(0, 0); - memset(sndBuffer, 0, sizeof(sndBuffer)); - PsndOut = sndBuffer; - PsndRate_old = PsndRate; - PicoOpt_old = PicoOpt; - pal_old = Pico.m.pal; - } else { - PsndOut = NULL; - } + emu_startSound(); // prepare CD buffer if (PicoAHW & PAHW_MCD) PicoCDBufferInit(); @@ -1045,3 +1043,24 @@ void emu_ResetGame(void) reset_timing = 1; } +const char *plat_get_credits(void) +{ + return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n" + "Credits:\n" + "fDave: Cyclone 68000 core,\n" + " base code of PicoDrive\n" + "Reesy & FluBBa: DrZ80 core\n" + "MAME devs: YM2612 and SN76496 cores\n" + "rlyeh and others: minimal SDK\n" + "Squidge: squidgehack\n" + "Dzz: ARM940 sample\n" + "GnoStiC / Puck2099: USB joy code\n" + "craigix: GP2X hardware\n" + "ketchupgun: skin design\n" + "\n" + "special thanks (for docs, ideas):\n" + " Charles MacDonald, Haze,\n" + " Stephane Dallongeville,\n" + " Lordus, Exophase, Rokas,\n" + " Nemesis, Tasco Deluxe"; +}