X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=ce65ccf45a19c9c25548573455d223ced70e2696;hp=6a07c8cc007ba020706b539bca2c3fa918d759d6;hb=41f55c9fb3e682e2c424e98ec70ab6aad226f85d;hpb=9e7a735287d03149ccf7d0db6c0193cc565c3fff diff --git a/frontend/menu.c b/frontend/menu.c index 6a07c8cc..ce65ccf4 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -20,9 +20,9 @@ #include "plugin.h" #include "plugin_lib.h" #include "omap.h" -#include "pandora.h" +#include "plat.h" #include "pcnt.h" -#include "arm_utils.h" +#include "cspace.h" #include "common/plat.h" #include "common/input.h" #include "linux/in_evdev.h" @@ -30,10 +30,9 @@ #include "../libpcsxcore/cdrom.h" #include "../libpcsxcore/psemu_plugin_defs.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" -#include "../plugins/dfinput/pad.h" +#include "../plugins/dfinput/main.h" #include "revision.h" -#define MENU_X2 1 #define array_size(x) (sizeof(x) / sizeof(x[0])) typedef enum @@ -55,27 +54,31 @@ typedef enum MA_CTRL_EMU, MA_CTRL_DEV_FIRST, MA_CTRL_DEV_NEXT, + MA_CTRL_NUBS_BTNS, + MA_CTRL_DEADZONE, MA_CTRL_DONE, MA_OPT_SAVECFG, MA_OPT_SAVECFG_GAME, MA_OPT_CPU_CLOCKS, MA_OPT_FILTERING, + MA_OPT_DISP_OPTS, } menu_id; enum { SCALE_1_1, SCALE_4_3, + SCALE_4_3v2, SCALE_FULLSCREEN, SCALE_CUSTOM, }; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost; +static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost, frameskip; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; -static int warned_about_bios, region, in_type_sel; +static int warned_about_bios, region, in_type_sel1, in_type_sel2; static int memcard1_sel, memcard2_sel; -int g_opts; +int g_opts, analog_deadzone; // sound plugin extern int iUseReverb; @@ -143,19 +146,24 @@ static void menu_sync_config(void) Config.PsxAuto = 0; Config.PsxType = region - 1; } - in_type = in_type_sel ? PSE_PAD_TYPE_ANALOGPAD : PSE_PAD_TYPE_STANDARD; + switch (in_type_sel1) { + case 1: in_type1 = PSE_PAD_TYPE_ANALOGPAD; break; + case 2: in_type1 = PSE_PAD_TYPE_GUNCON; break; + default: in_type1 = PSE_PAD_TYPE_STANDARD; + } + switch (in_type_sel2) { + case 1: in_type2 = PSE_PAD_TYPE_ANALOGPAD; break; + case 2: in_type2 = PSE_PAD_TYPE_GUNCON; break; + default: in_type2 = PSE_PAD_TYPE_STANDARD; + } if (in_evdev_allow_abs_only != allow_abs_only_old) { - pandora_rescan_inputs(); + plat_rescan_inputs(); allow_abs_only_old = in_evdev_allow_abs_only; } - pl_frame_interval = Config.PsxType ? 20000 : 16667; - // used by P.E.Op.S. frameskip code - pl_rearmed_cbs.gpu_peops.fFrameRateHz = Config.PsxType ? 50.0f : 59.94f; - pl_rearmed_cbs.gpu_peops.dwFrameRateTicks = - (100000*100 / (unsigned long)(pl_rearmed_cbs.gpu_peops.fFrameRateHz*100)); - iVolume = 768 + 128 * volume_boost; + pl_rearmed_cbs.frameskip = frameskip - 1; + pl_timing_prepare(Config.PsxType); } static void menu_set_defconfig(void) @@ -163,17 +171,21 @@ static void menu_set_defconfig(void) g_opts = 0; scaling = SCALE_4_3; volume_boost = 0; + frameskip = 0; + analog_deadzone = 70; region = 0; - in_type_sel = 0; + in_type_sel1 = in_type_sel2 = 0; in_evdev_allow_abs_only = 0; Config.Xa = Config.Cdda = Config.Sio = Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; Config.CdrReschedule = 0; - pl_rearmed_cbs.frameskip = 0; pl_rearmed_cbs.gpu_peops.iUseDither = 0; pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7; + pl_rearmed_cbs.gpu_unai.abe_hack = + pl_rearmed_cbs.gpu_unai.no_light = + pl_rearmed_cbs.gpu_unai.no_blend = 0; iUseReverb = 2; iUseInterpolation = 1; @@ -203,6 +215,9 @@ static void menu_set_defconfig(void) #define CE_INTVAL_V(val, ver) \ { #val #ver, sizeof(val), &val } +#define CE_INTVAL_PV(val, ver) \ + { #val #ver, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val } + static const struct { const char *name; size_t len; @@ -224,7 +239,7 @@ static const struct { CE_CONFIG_VAL(Cpu), CE_CONFIG_VAL(CdrReschedule), CE_INTVAL(region), - CE_INTVAL(scaling), + CE_INTVAL_V(scaling, 2), CE_INTVAL(g_layer_x), CE_INTVAL(g_layer_y), CE_INTVAL(g_layer_w), @@ -233,15 +248,20 @@ static const struct { CE_INTVAL(state_slot), CE_INTVAL(cpu_clock), CE_INTVAL(g_opts), - CE_INTVAL(in_type_sel), - CE_INTVAL_P(frameskip), + CE_INTVAL(in_type_sel1), + CE_INTVAL(in_type_sel2), + CE_INTVAL(analog_deadzone), + CE_INTVAL_V(frameskip, 2), CE_INTVAL_P(gpu_peops.iUseDither), CE_INTVAL_P(gpu_peops.dwActFixes), - CE_INTVAL(iUseReverb), - CE_INTVAL(iXAPitch), - CE_INTVAL_V(iUseInterpolation, 2), - CE_INTVAL_V(iSPUIRQWait, 2), - CE_INTVAL(iUseTimer), + CE_INTVAL_P(gpu_unai.abe_hack), + CE_INTVAL_P(gpu_unai.no_light), + CE_INTVAL_P(gpu_unai.no_blend), + CE_INTVAL_V(iUseReverb, 3), + CE_INTVAL_V(iXAPitch, 3), + CE_INTVAL_V(iUseInterpolation, 3), + CE_INTVAL_V(iSPUIRQWait, 3), + CE_INTVAL_V(iUseTimer, 3), CE_INTVAL(warned_about_bios), CE_INTVAL(in_evdev_allow_abs_only), CE_INTVAL(volume_boost), @@ -459,6 +479,12 @@ static const char *filter_exts[] = { }; #define MENU_ALIGN_LEFT +#ifdef __ARM_ARCH_7A__ // assume hires device +#define MENU_X2 1 +#else +#define MENU_X2 0 +#endif + #define menu_init menu_init_common #include "common/menu.c" #undef menu_init @@ -522,44 +548,26 @@ static void draw_savestate_bg(int slot) h = min(g_menuscreen_h, h); d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; - for (; h > 0; h--, d += g_menuscreen_w, s += 1024) + for (; h > 0; h--, d += g_menuscreen_w, s += 1024) { if (gpu->ulStatus & 0x200000) bgr888_to_rgb565(d, s, w * 3); else bgr555_to_rgb565(d, s, w * 2); +#ifndef __ARM_ARCH_7A__ + // better darken this on small screens + menu_darken_bg(d, d, w * 2, 0); +#endif + } out: free(gpu); } -// ---------- pandora specific ----------- +// ---------- XXX: pandora specific ----------- static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts"; static char **pnd_filter_list; -static int get_cpu_clock(void) -{ - FILE *f; - int ret = 0; - f = fopen("/proc/pandora/cpu_mhz_max", "r"); - if (f) { - fscanf(f, "%d", &ret); - fclose(f); - } - return ret; -} - -static void apply_cpu_clock(void) -{ - char buf[128]; - - if (cpu_clock != 0 && cpu_clock != get_cpu_clock()) { - snprintf(buf, sizeof(buf), "unset DISPLAY; echo y | %s/op_cpuspeed.sh %d", - pnd_script_base, cpu_clock); - system(buf); - } -} - static void apply_filter(int which) { static int old = -1; @@ -605,7 +613,7 @@ static void pnd_menu_init(void) char buff[64]; DIR *dir; - cpu_clock_st = cpu_clock = get_cpu_clock(); + cpu_clock_st = cpu_clock = plat_cpu_clock_get(); dir = opendir("/etc/pandora/conf/dss_fir"); if (dir == NULL) { @@ -672,8 +680,7 @@ static void pnd_menu_init(void) void menu_finish(void) { - cpu_clock = cpu_clock_st; - apply_cpu_clock(); + plat_cpu_clock_apply(cpu_clock_st); } // -------------- key config -------------- @@ -708,6 +715,10 @@ me_bind_action emuctrl_actions[] = { "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP }, { "Take Screenshot ", 1 << SACTION_SCREENSHOT }, { "Enter Menu ", 1 << SACTION_ENTER_MENU }, + { "Gun Trigger ", 1 << SACTION_GUN_TRIGGER }, + { "Gun A button ", 1 << SACTION_GUN_A }, + { "Gun B button ", 1 << SACTION_GUN_B }, + { "Gun Offscreen Trigger", 1 << SACTION_GUN_TRIGGER2 }, { NULL, 0 } }; @@ -937,23 +948,32 @@ static int mh_savecfg(int id, int keys) static int mh_input_rescan(int id, int keys) { //menu_sync_config(); - pandora_rescan_inputs(); + plat_rescan_inputs(); me_update_msg("rescan complete."); return 0; } -static const char *men_in_type_sel[] = { "Standard (SCPH-1080)", "Analog (SCPH-1150)", NULL }; +static const char *men_in_type_sel[] = { + "Standard (SCPH-1080)", + "Analog (SCPH-1150)", + "GunCon", + NULL +}; static const char h_nub_btns[] = "Experimental, keep this OFF if unsure. Select rescan after change."; +static const char h_notsgun[] = "Don't trigger (shoot) when touching screen in gun games."; static menu_entry e_menu_keyconfig[] = { - mee_handler_id("Player 1", MA_CTRL_PLAYER1, key_config_loop_wrap), - mee_handler_id("Player 2", MA_CTRL_PLAYER2, key_config_loop_wrap), - mee_handler_id("Emulator controls", MA_CTRL_EMU, key_config_loop_wrap), + mee_handler_id("Player 1", MA_CTRL_PLAYER1, key_config_loop_wrap), + mee_handler_id("Player 2", MA_CTRL_PLAYER2, key_config_loop_wrap), + mee_handler_id("Emulator/Gun controls", MA_CTRL_EMU, key_config_loop_wrap), mee_label (""), - mee_enum ("Controller", 0, in_type_sel, men_in_type_sel), - mee_onoff_h ("Nubs as buttons", 0, in_evdev_allow_abs_only, 1, h_nub_btns), + mee_enum ("Port 1 device", 0, in_type_sel1, men_in_type_sel), + mee_enum ("Port 2 device", 0, in_type_sel2, men_in_type_sel), + mee_onoff_h ("Nubs as buttons", MA_CTRL_NUBS_BTNS, in_evdev_allow_abs_only, 1, h_nub_btns), + mee_range ("Analog deadzone", MA_CTRL_DEADZONE, analog_deadzone, 1, 99), + mee_onoff_h ("No TS Gun trigger", 0, g_opts, OPT_TSGUN_NOTRIGGER, h_notsgun), mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg), mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg), mee_handler ("Rescan devices", mh_input_rescan), @@ -980,7 +1000,7 @@ static int menu_loop_keyconfig(int id, int keys) // ------------ gfx options menu ------------ -static const char *men_scaler[] = { "1x1", "scaled 4:3", "fullscreen", "custom", NULL }; +static const char *men_scaler[] = { "1x1", "scaled 4:3", "integer scaled 4:3", "fullscreen", "custom", NULL }; static const char h_cscaler[] = "Displays the scaler layer, you can resize it\n" "using d-pad or move it using R+d-pad"; static const char *men_dummy[] = { NULL }; @@ -1055,6 +1075,21 @@ static int menu_loop_gfx_options(int id, int keys) // ------------ bios/plugins ------------ +static menu_entry e_menu_plugin_gpu_unai[] = +{ + mee_onoff ("Abe's Odyssey hack", 0, pl_rearmed_cbs.gpu_unai.abe_hack, 1), + mee_onoff ("Disable lighting", 0, pl_rearmed_cbs.gpu_unai.no_light, 1), + mee_onoff ("Disable blending", 0, pl_rearmed_cbs.gpu_unai.no_blend, 1), + mee_end, +}; + +static int menu_loop_plugin_gpu_unai(int id, int keys) +{ + int sel = 0; + me_loop(e_menu_plugin_gpu_unai, &sel); + return 0; +} + static const char *men_gpu_dithering[] = { "None", "Game dependant", "Always", NULL }; static const char h_gpu_0[] = "Needed for Chrono Cross"; static const char h_gpu_1[] = "Capcom fighting games"; @@ -1066,7 +1101,7 @@ static const char h_gpu_8[] = "Needed by Dark Forces"; static const char h_gpu_9[] = "better g-colors, worse textures"; static const char h_gpu_10[] = "Toggle busy flags after drawing"; -static menu_entry e_menu_plugin_gpu[] = +static menu_entry e_menu_plugin_gpu_peops[] = { mee_enum ("Dithering", 0, pl_rearmed_cbs.gpu_peops.iUseDither, men_gpu_dithering), mee_onoff_h ("Odd/even bit hack", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<0, h_gpu_0), @@ -1081,10 +1116,10 @@ static menu_entry e_menu_plugin_gpu[] = mee_end, }; -static int menu_loop_plugin_gpu(int id, int keys) +static int menu_loop_plugin_gpu_peops(int id, int keys) { static int sel = 0; - me_loop(e_menu_plugin_gpu, &sel); + me_loop(e_menu_plugin_gpu_peops, &sel); return 0; } @@ -1111,12 +1146,13 @@ static int menu_loop_plugin_spu(int id, int keys) return 0; } -static const char h_bios[] = "HLE is simulated BIOS. BIOS selection is saved in savestates\n" - "and can't be changed there. Must save config and reload\n" - "the game for change to take effect"; +static const char h_bios[] = "HLE is simulated BIOS. BIOS selection is saved in\n" + "savestates and can't be changed there. Must save\n" + "config and reload the game for change to take effect"; static const char h_plugin_xpu[] = "Must save config and reload the game\n" "for plugin change to take effect"; -static const char h_gpu[] = "Configure P.E.Op.S. SoftGL Driver V1.17"; +static const char h_gpu_peops[] = "Configure P.E.Op.S. SoftGL Driver V1.17"; +static const char h_gpu_unai[] = "Configure Unai/PCSX4ALL Team GPU plugin"; static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7"; static menu_entry e_menu_plugin_options[] = @@ -1124,7 +1160,8 @@ static menu_entry e_menu_plugin_options[] = mee_enum_h ("BIOS", 0, bios_sel, bioses, h_bios), mee_enum_h ("GPU plugin", 0, gpu_plugsel, gpu_plugins, h_plugin_xpu), mee_enum_h ("SPU plugin", 0, spu_plugsel, spu_plugins, h_plugin_xpu), - mee_handler_h ("Configure gpu_peops plugin", menu_loop_plugin_gpu, h_gpu), + mee_handler_h ("Configure gpu_peops plugin", menu_loop_plugin_gpu_peops, h_gpu_peops), + mee_handler_h ("Configure PCSX4ALL GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai), mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu), mee_end, }; @@ -1199,6 +1236,7 @@ static int mh_restore_defaults(int id, int keys) } static const char *men_region[] = { "Auto", "NTSC", "PAL", NULL }; +static const char *men_frameskip[] = { "Auto", "Off", "1", NULL }; /* static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL }; static const char h_confirm_save[] = "Ask for confirmation when overwriting save,\n" @@ -1212,11 +1250,11 @@ static menu_entry e_menu_options[] = { // mee_range ("Save slot", 0, state_slot, 0, 9), // mee_enum_h ("Confirm savestate", 0, dummy, men_confirm_save, h_confirm_save), - mee_onoff_h ("Frameskip", 0, pl_rearmed_cbs.frameskip, 1, h_frameskip), + mee_enum_h ("Frameskip", 0, frameskip, men_frameskip, h_frameskip), mee_onoff ("Show FPS", 0, g_opts, OPT_SHOWFPS), mee_enum ("Region", 0, region, men_region), mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000), - mee_handler ("[Display]", menu_loop_gfx_options), + mee_handler_id("[Display]", MA_OPT_DISP_OPTS, menu_loop_gfx_options), mee_handler ("[BIOS/Plugins]", menu_loop_plugin_options), mee_handler ("[Advanced]", menu_loop_adv_options), mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg), @@ -1428,13 +1466,25 @@ void OnFile_Exit(); static void draw_frame_main(void) { + struct tm *tmp; + time_t ltime; + char ltime_s[16]; + char buff[64]; + if (CdromId[0] != 0) { - char buff[64]; snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)", get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC", Config.HLE ? "HLE" : "BIOS"); smalltext_out16(4, 1, buff, 0x105f); } + + if (ready_to_go) { + ltime = time(NULL); + tmp = localtime(<ime); + strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp); + snprintf(buff, sizeof(buff), "%s %3d%%", ltime_s, plat_get_bat_capacity()); + smalltext_out16(4, 1 + me_sfont_h, buff, 0x105f); + } } static void draw_frame_credits(void) @@ -1472,7 +1522,7 @@ static int reset_game(void) static int reload_plugins(const char *cdimg) { - pl_fbdev_buf = NULL; + pl_vout_buf = NULL; ClosePlugins(); @@ -1534,6 +1584,9 @@ static int run_cd_image(const char *fname) ready_to_go = 0; reload_plugins(fname); + // always autodetect, menu_sync_config will override as needed + Config.PsxAuto = 1; + if (CheckCdrom() == -1) { // Only check the CD if we are starting the console with a CD ClosePlugins(); @@ -1913,18 +1966,64 @@ void menu_init(void) exit(1); emu_make_path(buff, "skin/background.png", sizeof(buff)); readpng(g_menubg_src_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h); + +#ifndef __ARM_ARCH_7A__ /* XXX */ + me_enable(e_menu_options, MA_OPT_DISP_OPTS, 0); + me_enable(e_menu_keyconfig, MA_CTRL_NUBS_BTNS, 0); +#else + me_enable(e_menu_keyconfig, MA_CTRL_DEADZONE, 0); +#endif } void menu_notify_mode_change(int w, int h, int bpp) { + float mult; + int imult; + last_psx_w = w; last_psx_h = h; last_psx_bpp = bpp; - if (scaling == SCALE_1_1) { - g_layer_x = 800/2 - w/2; g_layer_y = 480/2 - h/2; + switch (scaling) { + case SCALE_1_1: g_layer_w = w; g_layer_h = h; + break; + + case SCALE_4_3: + mult = 240.0f / (float)h * 4.0f / 3.0f; + if (h > 256) + mult *= 2.0f; + g_layer_w = mult * (float)g_menuscreen_h; + g_layer_h = g_menuscreen_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + + case SCALE_4_3v2: + // 4:3 that prefers integer scaling + imult = g_menuscreen_h / h; + g_layer_w = w * imult; + g_layer_h = h * imult; + mult = (float)g_layer_w / (float)g_layer_h; + if (mult < 1.25f || mult > 1.666f) + g_layer_w = 4.0f/3.0f * (float)g_layer_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + + case SCALE_FULLSCREEN: + g_layer_w = g_menuscreen_w; + g_layer_h = g_menuscreen_h; + break; + + default: + break; } + + g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2; + g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2; + if (g_layer_x < 0) g_layer_x = 0; + if (g_layer_y < 0) g_layer_y = 0; + if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w; + if (g_layer_h > g_menuscreen_h) g_layer_w = g_menuscreen_h; } static void menu_leave_emu(void) @@ -1935,23 +2034,23 @@ static void menu_leave_emu(void) fprintf(stderr, "Warning: GPU_close returned %d\n", ret); } + plat_video_menu_enter(ready_to_go); + memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); - if (pl_fbdev_buf != NULL && ready_to_go && last_psx_bpp == 16) { + if (pl_vout_buf != NULL && ready_to_go && last_psx_bpp == 16) { int x = max(0, g_menuscreen_w - last_psx_w); int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2); int w = min(g_menuscreen_w, last_psx_w); int h = min(g_menuscreen_h, last_psx_h); u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; - u16 *s = pl_fbdev_buf; + u16 *s = pl_vout_buf; for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w) menu_darken_bg(d, s, w, 0); } if (ready_to_go) - cpu_clock = get_cpu_clock(); - - plat_video_menu_enter(ready_to_go); + cpu_clock = plat_cpu_clock_get(); } void menu_prepare_emu(void) @@ -1960,21 +2059,7 @@ void menu_prepare_emu(void) plat_video_menu_leave(); - switch (scaling) { - case SCALE_1_1: - menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp); - break; - case SCALE_4_3: - g_layer_x = 80; g_layer_y = 0; - g_layer_w = 640; g_layer_h = 480; - break; - case SCALE_FULLSCREEN: - g_layer_x = 0; g_layer_y = 0; - g_layer_w = 800; g_layer_h = 480; - break; - case SCALE_CUSTOM: - break; - } + menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp); psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec; if (psxCpu != prev_cpu) @@ -1989,7 +2074,7 @@ void menu_prepare_emu(void) menu_sync_config(); apply_lcdrate(Config.PsxType); apply_filter(filter); - apply_cpu_clock(); + plat_cpu_clock_apply(cpu_clock); // push config to GPU plugin plugin_call_rearmed_cbs(); @@ -2000,7 +2085,7 @@ void menu_prepare_emu(void) fprintf(stderr, "Warning: GPU_open returned %d\n", ret); } - dfinput_activate(in_type == PSE_PAD_TYPE_ANALOGPAD); + dfinput_activate(); } void me_update_msg(const char *msg)