X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fplat.c;h=321a4b677ce0ae73930c180e142b73125fa33bc6;hb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;hp=aa60412328872e237b8da70d6418d306cd9e8b51;hpb=b79118011b8b1ac835efed1ac5a9ce3bdc55c158;p=libpicofe.git diff --git a/gp2x/plat.c b/gp2x/plat.c index aa60412..321a4b6 100644 --- a/gp2x/plat.c +++ b/gp2x/plat.c @@ -1,7 +1,6 @@ #include #include #include -#include #include "plat_gp2x.h" #include "soc.h" @@ -10,20 +9,66 @@ #include "../common/readpng.h" #include "../common/menu.h" #include "../common/emu.h" +#include "../common/input.h" #include "../linux/sndout_oss.h" #include /* GP2X local */ int default_cpu_clock; +int gp2x_dev_id; +int gp2x_current_bpp; void *gp2x_screens[4]; +#include + +static const char * const caanoo_keys[KEY_MAX + 1] = { + [0 ... KEY_MAX] = NULL, + [KEY_UP] = "Up", + [KEY_LEFT] = "Left", + [KEY_RIGHT] = "Right", + [KEY_DOWN] = "Down", + [BTN_TRIGGER] = "A", + [BTN_THUMB] = "X", + [BTN_THUMB2] = "B", + [BTN_TOP] = "Y", + [BTN_TOP2] = "L", + [BTN_PINKIE] = "R", + [BTN_BASE] = "Home", + [BTN_BASE2] = "Lock", + [BTN_BASE3] = "I", + [BTN_BASE4] = "II", + [BTN_BASE5] = "Push", +}; + +struct in_default_bind in_evdev_defbinds[] = +{ + /* MXYZ SACB RLDU */ + { KEY_UP, IN_BINDTYPE_PLAYER12, 0 }, + { KEY_DOWN, IN_BINDTYPE_PLAYER12, 1 }, + { KEY_LEFT, IN_BINDTYPE_PLAYER12, 2 }, + { KEY_RIGHT, IN_BINDTYPE_PLAYER12, 3 }, + { KEY_S, IN_BINDTYPE_PLAYER12, 4 }, /* B */ + { KEY_D, IN_BINDTYPE_PLAYER12, 5 }, /* C */ + { KEY_A, IN_BINDTYPE_PLAYER12, 6 }, /* A */ + { KEY_ENTER, IN_BINDTYPE_PLAYER12, 7 }, + { KEY_BACKSLASH, IN_BINDTYPE_EMU, PEVB_MENU }, + /* Caanoo */ + { BTN_THUMB, IN_BINDTYPE_PLAYER12, 4 }, /* B */ + { BTN_THUMB2, IN_BINDTYPE_PLAYER12, 5 }, /* C */ + { BTN_TRIGGER, IN_BINDTYPE_PLAYER12, 6 }, /* A */ + { BTN_BASE3, IN_BINDTYPE_PLAYER12, 7 }, + { BTN_TOP2, IN_BINDTYPE_EMU, PEVB_STATE_SAVE }, + { BTN_PINKIE, IN_BINDTYPE_EMU, PEVB_STATE_LOAD }, + { BTN_BASE, IN_BINDTYPE_EMU, PEVB_MENU }, + { 0, 0, 0 } +}; + void gp2x_video_changemode(int bpp) { gp2x_video_changemode_ll(bpp); - gp2x_memset_all_buffers(0, 0, 320*240*2); - gp2x_video_flip(); + gp2x_current_bpp = bpp < 0 ? -bpp : bpp; } static void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len) @@ -65,37 +110,18 @@ void gp2x_make_fb_bufferable(int yes) } /* common */ -char cpu_clk_name[16] = "GP2X CPU clocks"; - void plat_video_menu_enter(int is_rom_loaded) { - if (is_rom_loaded) - { - // darken the active framebuffer - memset(g_screen_ptr, 0, 320*8*2); - menu_darken_bg((char *)g_screen_ptr + 320*8*2, 320*224, 1); - memset((char *)g_screen_ptr + 320*232*2, 0, 320*8*2); + if (gp2x_current_bpp != 16 || gp2x_dev_id == GP2X_DEV_WIZ) { + /* try to switch nicely avoiding glitches */ + gp2x_video_wait_vsync(); + memset(gp2x_screens[0], 0, 320*240*2); + memset(gp2x_screens[1], 0, 320*240*2); + gp2x_video_flip2(); // might flip to fb2/3 + gp2x_video_flip2(); // ..so we do it again } else - { - char buff[256]; - - // should really only happen once, on startup.. - emu_make_path(buff, "skin/background.png", sizeof(buff)); - if (readpng(g_screen_ptr, buff, READPNG_BG) < 0) - memset(g_screen_ptr, 0, 320*240*2); - } - - // copy to buffer2, switch to black - gp2x_memcpy_buffers((1<<2), g_screen_ptr, 0, 320*240*2); - - /* try to switch nicely avoiding tearing on Wiz */ - gp2x_video_wait_vsync(); - memset(gp2x_screens[0], 0, 320*240*2); - memset(gp2x_screens[1], 0, 320*240*2); - gp2x_video_flip2(); - gp2x_video_wait_vsync(); - gp2x_video_wait_vsync(); + gp2x_video_flip2(); // switch to 16bpp gp2x_video_changemode_ll(16); @@ -104,51 +130,47 @@ void plat_video_menu_enter(int is_rom_loaded) void plat_video_menu_begin(void) { - memcpy(g_screen_ptr, gp2x_screens[2], 320*240*2); + g_menuscreen_ptr = g_screen_ptr; } void plat_video_menu_end(void) { - // FIXME - // gp2x_video_flush_cache(); gp2x_video_flip2(); } -void plat_validate_config(void) -{ - gp2x_soc_t soc; - - soc = soc_detect(); - if (soc != SOCID_MMSP2) - PicoOpt &= ~POPT_EXT_FM; - if (soc != SOCID_POLLUX) - currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX; - - if (currentConfig.gamma < 10 || currentConfig.gamma > 300) - currentConfig.gamma = 100; - - if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 1024) - currentConfig.CPUclock = default_cpu_clock; -} - void plat_early_init(void) { gp2x_soc_t soc; + FILE *f; soc = soc_detect(); switch (soc) { case SOCID_MMSP2: default_cpu_clock = 200; + gp2x_dev_id = GP2X_DEV_GP2X; break; case SOCID_POLLUX: - strcpy(cpu_clk_name, "Wiz CPU clock"); default_cpu_clock = 533; + f = fopen("/dev/accel", "rb"); + if (f) { + printf("detected Caanoo\n"); + gp2x_dev_id = GP2X_DEV_CAANOO; + fclose(f); + } + else { + printf("detected Wiz\n"); + gp2x_dev_id = GP2X_DEV_WIZ; + } break; default: - fprintf(stderr, "could not recognize SoC, bailing out.\n"); - exit(1); + printf("could not recognize SoC, running in dummy mode.\n"); + break; } + + // just use gettimeofday until plat_init() + gp2x_get_ticks_ms = plat_get_ticks_ms_good; + gp2x_get_ticks_us = plat_get_ticks_us_good; } void plat_init(void) @@ -163,9 +185,9 @@ void plat_init(void) break; case SOCID_POLLUX: pollux_init(); - menu_plat_setup(1); break; default: + dummy_init(); break; } @@ -173,8 +195,17 @@ void plat_init(void) gp2x_memset_all_buffers(0, 0, 320*240*2); + // use buffer2 for menubg to save mem (using only buffers 0, 1 in menu) + g_menubg_ptr = gp2x_screens[2]; + // snd sndout_oss_init(); + + if (gp2x_dev_id == GP2X_DEV_CAANOO) + in_set_config(in_name_to_id("evdev:pollux-analog"), IN_CFG_KEY_NAMES, + caanoo_keys, sizeof(caanoo_keys)); + + gp2x_menu_init(); } void plat_finish(void) @@ -192,17 +223,11 @@ void plat_finish(void) case SOCID_POLLUX: pollux_finish(); break; + default: + dummy_finish(); + break; } sndout_oss_exit(); } -void lprintf(const char *fmt, ...) -{ - va_list vl; - - va_start(vl, fmt); - vprintf(fmt, vl); - va_end(vl); -} -