X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=5f18dd0f9ad555320e20e0c79ba8b09e98b4299f;hb=ee2a3bdfa5a969ea9446b2d08748f16e29bbd4d5;hp=7aac10b8463819f44e34da9f432111c22d90b098;hpb=713c9224026b769b8238f898c85b63a17cd5bada;p=picodrive.git diff --git a/platform/common/emu.c b/platform/common/emu.c index 7aac10b..5f18dd0 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -5,7 +5,6 @@ #include #include -#include // tolower #ifndef NO_SYNC #include #endif @@ -15,7 +14,6 @@ #include "fonts.h" #include "lprintf.h" #include "config.h" -#include "common.h" #include "plat.h" #include @@ -24,12 +22,18 @@ #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; char noticeMsg[64] = { 0, }; int state_slot = 0; int config_slot = 0, config_slot_current = 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; @@ -42,12 +46,13 @@ unsigned char *movie_data = NULL; static int movie_size = 0; -// utilities +/* don't use tolower() for easy old glibc binary compatibility */ static void strlwr_(char *string) { char *p; for (p = string; *p; p++) - *p = (char)tolower(*p); + if ('A' <= *p && *p <= 'Z') + *p += 'a' - 'A'; } static int try_rfn_cut(char *fname) @@ -122,9 +127,9 @@ int emu_findBios(int region, char **bios_file) if (bios_file) *bios_file = bios_path; return 1; } else { - sprintf(menuErrorMsg, "no %s BIOS files found, read docs", + sprintf(bios_path, "no %s BIOS files found, read docs", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA"); - lprintf("%s\n", menuErrorMsg); + me_update_msg(bios_path); return 0; } } @@ -300,7 +305,7 @@ int emu_ReloadRom(char *rom_fname) // detect wrong extensions if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz - sprintf(menuErrorMsg, "Not a ROM/CD selected."); + me_update_msg("Not a ROM/CD selected."); return 0; } @@ -317,32 +322,32 @@ int emu_ReloadRom(char *rom_fname) int dummy; FILE *movie_file = fopen(rom_fname, "rb"); if(!movie_file) { - sprintf(menuErrorMsg, "Failed to open movie."); + me_update_msg("Failed to open movie."); return 0; } fseek(movie_file, 0, SEEK_END); movie_size = ftell(movie_file); fseek(movie_file, 0, SEEK_SET); if(movie_size < 64+3) { - sprintf(menuErrorMsg, "Invalid GMV file."); + me_update_msg("Invalid GMV file."); fclose(movie_file); return 0; } movie_data = malloc(movie_size); if(movie_data == NULL) { - sprintf(menuErrorMsg, "low memory."); + me_update_msg("low memory."); fclose(movie_file); return 0; } fread(movie_data, 1, movie_size, movie_file); fclose(movie_file); if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) { - sprintf(menuErrorMsg, "Invalid GMV file."); + me_update_msg("Invalid GMV file."); return 0; } dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname); if (!dummy) { - sprintf(menuErrorMsg, "Could't find a ROM for movie."); + me_update_msg("Could't find a ROM for movie."); return 0; } get_ext(rom_fname, ext); @@ -354,7 +359,7 @@ int emu_ReloadRom(char *rom_fname) PicoPatchLoad(rom_fname); dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname); if (!dummy) { - sprintf(menuErrorMsg, "Could't find a ROM to patch."); + me_update_msg("Could't find a ROM to patch."); return 0; } get_ext(rom_fname, ext); @@ -394,12 +399,12 @@ int emu_ReloadRom(char *rom_fname) rom = pm_open(used_rom_name); if (!rom) { - sprintf(menuErrorMsg, "Failed to open ROM/CD image"); + me_update_msg("Failed to open ROM/CD image"); goto fail; } if (cd_state < 0) { - sprintf(menuErrorMsg, "Invalid CD image"); + me_update_msg("Invalid CD image"); goto fail; } @@ -409,10 +414,9 @@ int emu_ReloadRom(char *rom_fname) rom_loaded = 0; if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) { - 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); + if (ret == 2) me_update_msg("Out of memory"); + else if (ret == 3) me_update_msg("Read failed"); + else me_update_msg("PicoCartLoad() failed."); goto fail2; } pm_close(rom); @@ -422,7 +426,7 @@ int emu_ReloadRom(char *rom_fname) if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 || ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) { if (rom_data) free(rom_data); - sprintf(menuErrorMsg, "Not a ROM selected."); + me_update_msg("Not a ROM selected."); goto fail2; } @@ -436,7 +440,7 @@ int emu_ReloadRom(char *rom_fname) lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size); if (PicoCartInsert(rom_data, rom_size)) { - sprintf(menuErrorMsg, "Failed to load ROM."); + me_update_msg("Failed to load ROM."); goto fail2; } @@ -444,8 +448,7 @@ int emu_ReloadRom(char *rom_fname) if (cd_state != CIT_NOT_CD) { ret = Insert_CD(rom_fname, cd_state); if (ret != 0) { - sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?"); - lprintf("%s\n", menuErrorMsg); + me_update_msg("Insert_CD() failed, invalid CD image?"); goto fail2; } } @@ -618,23 +621,21 @@ int emu_ReadConfig(int game, int no_defaults) } } + plat_validate_config(); + // some sanity checks - if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200; #ifdef PSP + /* TODO: mv to plat_validate_config() */ + if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200; if (currentConfig.gamma < -4 || currentConfig.gamma > 16) currentConfig.gamma = 0; if (currentConfig.gamma2 < 0 || currentConfig.gamma2 > 2) currentConfig.gamma2 = 0; -#else - if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100; #endif - if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50; -#ifdef __GP2X__ - // if volume keys are unbound, bind them to volume control - if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) { - currentConfig.KeyBinds[23] = 1<<29; // vol up - currentConfig.KeyBinds[22] = 1<<30; // vol down - } -#endif - if (ret == 0) config_slot_current = config_slot; + if (currentConfig.volume < 0 || currentConfig.volume > 99) + currentConfig.volume = 50; + + if (ret == 0) + config_slot_current = config_slot; + return (ret == 0); } @@ -679,101 +680,36 @@ void emu_writelrom(void) #endif } -#ifndef UIQ3 -void emu_textOut8(int x, int y, const char *text) -{ - int i,l,len=strlen(text); - unsigned char *screen = (unsigned char *)SCREEN_BUFFER + x + y*SCREEN_WIDTH; - - /* 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; - } -} - -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; - - 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 - -#ifdef PSP -#define MAX_COMBO_KEY 23 -#else -#define MAX_COMBO_KEY 31 -#endif - -void emu_findKeyBindCombos(void) -{ - int act, u; - - // find out which keys and actions are combos - kb_combo_keys = kb_combo_acts = 0; - for (act = 0; act < 32; act++) - { - int keyc = 0, keyc2 = 0; - if (act == 16 || act == 17) continue; // player2 flag - if (act > 17) - { - for (u = 0; u <= MAX_COMBO_KEY; u++) - if (currentConfig.KeyBinds[u] & (1 << act)) keyc++; - } - else - { - for (u = 0; u <= MAX_COMBO_KEY; u++) - if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1 - (currentConfig.KeyBinds[u] & (1 << act))) keyc++; - for (u = 0; u <= MAX_COMBO_KEY; u++) - if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2 - (currentConfig.KeyBinds[u] & (1 << act))) keyc2++; - if (keyc2 > keyc) keyc = keyc2; - } - if (keyc > 1) - { - // loop again and mark those keys and actions as combo - for (u = 0; u <= MAX_COMBO_KEY; u++) - { - if (currentConfig.KeyBinds[u] & (1 << act)) { - kb_combo_keys |= 1 << u; - kb_combo_acts |= 1 << act; - } - } - } - } - - // printf("combo keys/acts: %08x %08x\n", kb_combo_keys, kb_combo_acts); -} +/* 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; \ + } \ + } \ +} + +mk_text_out(emu_textOut8, unsigned char, 0xf0) +mk_text_out(emu_textOut16, unsigned short, 0xffff) + +#undef mk_text_out void emu_updateMovie(void)