RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

32x: start reworking sheduling

Browse source
This commit is contained in:
notaz 2013-07-07 01:05:11 +03:00
parent 9b5713af95
commit ed4402a7df
17 changed files with 180 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platform/common/config_file.c
View file

@ -319,11 +319,14 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
return 1;
case MA_32XOPT_MSH2_CYCLES:
case MA_32XOPT_SSH2_CYCLES: {
int *mul = (me->id == MA_32XOPT_MSH2_CYCLES) ? &p32x_msh2_multiplier : &p32x_ssh2_multiplier;
*mul = ((unsigned int)atoi(val) << SH2_MULTI_SHIFT) / 7670;
currentConfig.msh2_khz = atoi(val);
Pico32xSetClocks(currentConfig.msh2_khz * 1000, 0);
return 1;
case MA_32XOPT_SSH2_CYCLES:
currentConfig.ssh2_khz = atoi(val);
Pico32xSetClocks(0, currentConfig.ssh2_khz * 1000);
return 1;
}
/* PSP */
case MA_OPT3_SCALE:

4
platform/common/emu.c
View file

@ -548,6 +548,8 @@ void emu_prep_defconfig(void)
defaultConfig.gamma = 100;
defaultConfig.scaling = 0;
defaultConfig.turbo_rate = 15;
defaultConfig.msh2_khz = PICO_MSH2_HZ / 1000;
defaultConfig.ssh2_khz = PICO_SSH2_HZ / 1000;
// platform specific overrides
pemu_prep_defconfig();
@ -561,8 +563,6 @@ void emu_set_defconfig(void)
PicoRegionOverride = currentConfig.s_PicoRegion;
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
PicoCDBuffers = currentConfig.s_PicoCDBuffers;
p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;
p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;
}
int emu_read_config(const char *rom_fname, int no_defaults)

2
platform/common/emu.h
View file

@ -80,6 +80,8 @@ typedef struct _currentConfig_t {
int renderer32x;
int filter; // pandora
int analog_deadzone;
int msh2_khz;
int ssh2_khz;
} currentConfig_t;
extern currentConfig_t currentConfig, defaultConfig;

24
platform/common/menu_pico.c
View file

@ -444,26 +444,28 @@ static int menu_loop_cd_options(int id, int keys)
// convert from multiplier of VClk
static int mh_opt_sh2cycles(int id, int keys)
{
int *mul = (id == MA_32XOPT_MSH2_CYCLES) ? &p32x_msh2_multiplier : &p32x_ssh2_multiplier;
int *khz = (id == MA_32XOPT_MSH2_CYCLES) ?
&currentConfig.msh2_khz : &currentConfig.ssh2_khz;
if (keys & (PBTN_LEFT|PBTN_RIGHT))
*mul += (keys & PBTN_LEFT) ? -10 : 10;
*khz += (keys & PBTN_LEFT) ? -50 : 50;
if (keys & (PBTN_L|PBTN_R))
*mul += (keys & PBTN_L) ? -100 : 100;
*khz += (keys & PBTN_L) ? -500 : 500;
if (*mul < 1)
*mul = 1;
else if (*mul > (10 << SH2_MULTI_SHIFT))
*mul = 10 << SH2_MULTI_SHIFT;
if (*khz < 1)
*khz = 1;
else if (*khz > 0x7fffffff / 1000)
*khz = 0x7fffffff / 1000;
return 0;
}
static const char *mgn_opt_sh2cycles(int id, int *offs)
{
int mul = (id == MA_32XOPT_MSH2_CYCLES) ? p32x_msh2_multiplier : p32x_ssh2_multiplier;
sprintf(static_buff, "%d", 7670 * mul >> SH2_MULTI_SHIFT);
int khz = (id == MA_32XOPT_MSH2_CYCLES) ?
currentConfig.msh2_khz : currentConfig.ssh2_khz;
sprintf(static_buff, "%d", khz);
return static_buff;
}
@ -490,6 +492,8 @@ static int menu_loop_32x_options(int id, int keys)
me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x[0] != NULL);
me_loop(e_menu_32x_options, &sel);
Pico32xSetClocks(currentConfig.msh2_khz * 1000, currentConfig.msh2_khz * 1000);
return 0;
}

3
platform/libretro.c
View file

@ -609,9 +609,6 @@ void retro_init(void)
PicoAutoRgnOrder = 0x184; // US, EU, JP
PicoCDBuffers = 0;
p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;
p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;
vout_width = 320;
vout_height = 240;
vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);