X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=f8b4e65e3b3a1232b753bf9999635edb4605a827;hb=e31266dd116b6bea59ce3f2036feeb6725c45a72;hp=7dbac5045b16871e603b5a5489971e4993716037;hpb=36f6fd5afec3bd982c715f6d39d5712dacb237cd;p=libpicofe.git diff --git a/common/emu.c b/common/emu.c index 7dbac50..f8b4e65 100644 --- a/common/emu.c +++ b/common/emu.c @@ -16,37 +16,45 @@ #include "lprintf.h" #include "config.h" #include "common.h" +#include "plat.h" -#include -#include -#include +#include +#include +#include #include +void *g_screen_ptr; + +#if !SCREEN_SIZE_FIXED +int g_screen_width = SCREEN_WIDTH; +int g_screen_height = SCREEN_HEIGHT; +#endif + char *PicoConfigFile = "config.cfg"; currentConfig_t currentConfig, defaultConfig; -int rom_loaded = 0; char noticeMsg[64] = { 0, }; int state_slot = 0; int config_slot = 0, config_slot_current = 0; -char loadedRomFName[512] = { 0, }; int kb_combo_keys = 0, kb_combo_acts = 0; // keys and actions which need button combos int pico_inp_mode = 0; +int engineState = PGS_Menu; + +/* TODO: len checking */ +char rom_fname_reload[512] = { 0, }; +char rom_fname_loaded[512] = { 0, }; +int rom_loaded = 0; unsigned char *movie_data = NULL; static int movie_size = 0; -// provided by platform code: -extern void emu_noticeMsgUpdated(void); -extern int emu_getMainDir(char *dst, int len); -extern void menu_romload_prepare(const char *rom_name); -extern void menu_romload_end(void); - // utilities -static void strlwr_(char* string) +static void strlwr_(char *string) { - while ( (*string++ = (char)tolower(*string)) ); + char *p; + for (p = string; *p; p++) + *p = (char)tolower(*p); } static int try_rfn_cut(char *fname) @@ -345,6 +353,7 @@ int emu_ReloadRom(char *rom_fname) return 0; } get_ext(rom_fname, ext); + lprintf("gmv loaded for %s\n", rom_fname); } else if (!strcmp(ext, ".pat")) { @@ -407,7 +416,9 @@ int emu_ReloadRom(char *rom_fname) rom_loaded = 0; if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) { - sprintf(menuErrorMsg, "PicoCartLoad() failed."); + if (ret == 2) sprintf(menuErrorMsg, "Out of memory"); + else if (ret == 3) sprintf(menuErrorMsg, "Read failed"); + else sprintf(menuErrorMsg, "PicoCartLoad() failed."); lprintf("%s\n", menuErrorMsg); goto fail2; } @@ -487,8 +498,8 @@ int emu_ReloadRom(char *rom_fname) if (currentConfig.EmuOpt & EOPT_USE_SRAM) emu_SaveLoadGame(1, 1); - strncpy(loadedRomFName, rom_fname, sizeof(loadedRomFName)-1); - loadedRomFName[sizeof(loadedRomFName)-1] = 0; + strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1); + rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0; rom_loaded = 1; return 1; @@ -513,8 +524,8 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext) int prefix_len = 0; // make save filename - p = loadedRomFName+strlen(loadedRomFName)-1; - for (; p >= loadedRomFName && *p != PATH_SEP_C; p--); p++; + p = rom_fname_loaded + strlen(rom_fname_loaded) - 1; + for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++; *dst = 0; if (prefix) { int len = emu_getMainDir(dst, 512); @@ -522,7 +533,7 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext) prefix_len = len + strlen(prefix); } #ifdef UIQ3 - else p = loadedRomFName; // backward compatibility + else p = rom_fname_loaded; // backward compatibility #endif strncpy(dst + prefix_len, p, 511-prefix_len); dst[511-8] = 0; @@ -665,54 +676,46 @@ int emu_WriteConfig(int is_game) } -#ifndef UIQ3 -void emu_textOut8(int x, int y, const char *text) +void emu_writelrom(void) { - int i,l,len=strlen(text); - unsigned char *screen = (unsigned char *)SCREEN_BUFFER + x + y*SCREEN_WIDTH; + char cfg[512]; + make_config_cfg(cfg); + config_writelrom(cfg); +#ifndef NO_SYNC + sync(); +#endif +} - /* always using built-in font */ - for (i = 0; i < len; i++) - { - for (l=0;l<8;l++) - { - unsigned char fd = fontdata8x8[((text[i])*8)+l]; - if (fd&0x80) screen[l*SCREEN_WIDTH+0]=0xf0; - if (fd&0x40) screen[l*SCREEN_WIDTH+1]=0xf0; - if (fd&0x20) screen[l*SCREEN_WIDTH+2]=0xf0; - if (fd&0x10) screen[l*SCREEN_WIDTH+3]=0xf0; - if (fd&0x08) screen[l*SCREEN_WIDTH+4]=0xf0; - if (fd&0x04) screen[l*SCREEN_WIDTH+5]=0xf0; - if (fd&0x02) screen[l*SCREEN_WIDTH+6]=0xf0; - if (fd&0x01) screen[l*SCREEN_WIDTH+7]=0xf0; - } - screen += 8; - } +/* always using built-in font */ + +#define mk_text_out(name, type, val) \ +void name(int x, int y, const char *text) \ +{ \ + int i, l, len = strlen(text); \ + type *screen = (type *)g_screen_ptr + x + y * g_screen_width; \ + \ + for (i = 0; i < len; i++, screen += 8) \ + { \ + for (l = 0; l < 8; l++) \ + { \ + unsigned char fd = fontdata8x8[text[i] * 8 + l];\ + type *s = screen + l * g_screen_width; \ + if (fd&0x80) s[0] = val; \ + if (fd&0x40) s[1] = val; \ + if (fd&0x20) s[2] = val; \ + if (fd&0x10) s[3] = val; \ + if (fd&0x08) s[4] = val; \ + if (fd&0x04) s[5] = val; \ + if (fd&0x02) s[6] = val; \ + if (fd&0x01) s[7] = val; \ + } \ + } \ } -void emu_textOut16(int x, int y, const char *text) -{ - int i,l,len=strlen(text); - unsigned short *screen = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH; +mk_text_out(emu_textOut8, unsigned char, 0xf0) +mk_text_out(emu_textOut16, unsigned short, 0xffff) - for (i = 0; i < len; i++) - { - for (l=0;l<8;l++) - { - unsigned char fd = fontdata8x8[((text[i])*8)+l]; - if(fd&0x80) screen[l*SCREEN_WIDTH+0]=0xffff; - if(fd&0x40) screen[l*SCREEN_WIDTH+1]=0xffff; - if(fd&0x20) screen[l*SCREEN_WIDTH+2]=0xffff; - if(fd&0x10) screen[l*SCREEN_WIDTH+3]=0xffff; - if(fd&0x08) screen[l*SCREEN_WIDTH+4]=0xffff; - if(fd&0x04) screen[l*SCREEN_WIDTH+5]=0xffff; - if(fd&0x02) screen[l*SCREEN_WIDTH+6]=0xffff; - if(fd&0x01) screen[l*SCREEN_WIDTH+7]=0xffff; - } - screen += 8; - } -} -#endif +#undef mk_text_out #ifdef PSP #define MAX_COMBO_KEY 23 @@ -720,6 +723,7 @@ void emu_textOut16(int x, int y, const char *text) #define MAX_COMBO_KEY 31 #endif +// FIXME void emu_findKeyBindCombos(void) { int act, u; @@ -774,13 +778,13 @@ void emu_updateMovie(void) } else { // MXYZ SACB RLDU PicoPad[0] = ~movie_data[offs] & 0x8f; // ! SCBA RLDU - if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // A - if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // B - if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // A + if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // C + if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // A + if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // B PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU - if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A - if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B - if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A + if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // C + if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // A + if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // B PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z