mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 02:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Libretro) libretro-related to ports

Browse Source
This commit is contained in:
Twinaphex 2012-04-10 03:14:21 +02:00
parent 9d3d696b3e
commit 5906754468
4 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ps3/ps3_input.c
View File

@ -125,7 +125,7 @@ void oskutil_init(oskutil_params *params, unsigned int containersize)
params->osk_memorycontainer = 1024*1024*7;
}
static bool oskutil_enable_key_layout()
static bool oskutil_enable_key_layout (void)
{
int ret = cellOskDialogSetKeyLayoutOption(CELL_OSKDIALOG_10KEY_PANEL | \
CELL_OSKDIALOG_FULLKEY_PANEL);

21
ps3/ps3_video_psgl.c
View File

@ -111,22 +111,13 @@ static bool gl_shader_init(void)
switch (g_settings.video.shader_type)
{
case SSNES_SHADER_AUTO:
{
if (strlen(g_settings.video.cg_shader_path) > 0 && strlen(g_settings.video.bsnes_shader_path) > 0)
SSNES_WARN("Both Cg and bSNES XML shader are defined in config file. Cg shader will be selected by default.\n");
if (strlen(g_settings.video.cg_shader_path) > 0)
return gl_cg_init(g_settings.video.cg_shader_path);
break;
}
if (strlen(g_settings.video.cg_shader_path) > 0 && strlen(g_settings.video.bsnes_shader_path) > 0)
SSNES_WARN("Both Cg and bSNES XML shader are defined in config file. Cg shader will be selected by default.\n");
// fall-through
case SSNES_SHADER_CG:
{
if (strlen(g_settings.video.cg_shader_path) > 0)
return gl_cg_init(g_settings.video.cg_shader_path);
break;
}
if (strlen(g_settings.video.cg_shader_path) > 0)
return gl_cg_init(g_settings.video.cg_shader_path);
break;
default:
break;
}

34
wii/input.c
View File

@ -73,7 +73,7 @@ static void wii_input_poll(void *data)
unsigned pads = PAD_ScanPads();
unsigned wpads = WPAD_ScanPads();
#define _BIND(btn) pad_state[i][SNES_DEVICE_ID_JOYPAD_##btn] = down & PAD_BUTTON_##btn
#define _BIND(btn) pad_state[i][RETRO_DEVICE_ID_JOYPAD_##btn] = down & PAD_BUTTON_##btn
for (unsigned i = 0; i < pads; i++)
{
uint16_t down = PAD_ButtonsHeld(i) | PAD_ButtonsDown(i);
@ -81,7 +81,7 @@ static void wii_input_poll(void *data)
_BIND(B);
_BIND(Y);
pad_state[i][SNES_DEVICE_ID_JOYPAD_SELECT] = down & PAD_TRIGGER_Z;
pad_state[i][RETRO_DEVICE_ID_JOYPAD_SELECT] = down & PAD_TRIGGER_Z;
_BIND(START);
_BIND(UP);
_BIND(DOWN);
@ -89,13 +89,13 @@ static void wii_input_poll(void *data)
_BIND(RIGHT);
_BIND(A);
_BIND(X);
pad_state[i][SNES_DEVICE_ID_JOYPAD_L] = down & PAD_TRIGGER_L;
pad_state[i][SNES_DEVICE_ID_JOYPAD_R] = down & PAD_TRIGGER_R;
pad_state[i][RETRO_DEVICE_ID_JOYPAD_L] = down & PAD_TRIGGER_L;
pad_state[i][RETRO_DEVICE_ID_JOYPAD_R] = down & PAD_TRIGGER_R;
}
#undef _BIND
#define _BIND(btn) \
wpad_state[i][SNES_DEVICE_ID_JOYPAD_##btn] = down & WPAD_CLASSIC_BUTTON_##btn;
wpad_state[i][RETRO_DEVICE_ID_JOYPAD_##btn] = down & WPAD_CLASSIC_BUTTON_##btn;
for (unsigned i = 0; i < wpads; i++)
{
@ -104,16 +104,16 @@ static void wii_input_poll(void *data)
_BIND(B);
_BIND(Y);
wpad_state[i][SNES_DEVICE_ID_JOYPAD_SELECT] = down & WPAD_CLASSIC_BUTTON_MINUS;
wpad_state[i][SNES_DEVICE_ID_JOYPAD_START] = down & WPAD_CLASSIC_BUTTON_PLUS;
wpad_state[i][RETRO_DEVICE_ID_JOYPAD_SELECT] = down & WPAD_CLASSIC_BUTTON_MINUS;
wpad_state[i][RETRO_DEVICE_ID_JOYPAD_START] = down & WPAD_CLASSIC_BUTTON_PLUS;
_BIND(UP);
_BIND(DOWN);
_BIND(LEFT);
_BIND(RIGHT);
_BIND(A);
_BIND(X);
wpad_state[i][SNES_DEVICE_ID_JOYPAD_L] = down & WPAD_CLASSIC_BUTTON_FULL_L;
wpad_state[i][SNES_DEVICE_ID_JOYPAD_R] = down & WPAD_CLASSIC_BUTTON_FULL_R;
wpad_state[i][RETRO_DEVICE_ID_JOYPAD_L] = down & WPAD_CLASSIC_BUTTON_FULL_L;
wpad_state[i][RETRO_DEVICE_ID_JOYPAD_R] = down & WPAD_CLASSIC_BUTTON_FULL_R;
}
}
@ -124,14 +124,14 @@ static bool wii_key_pressed(void *data, int key)
{
case SSNES_QUIT_KEY:
return g_quit ||
(pad_state[0][SNES_DEVICE_ID_JOYPAD_SELECT] &&
pad_state[0][SNES_DEVICE_ID_JOYPAD_START] &&
pad_state[0][SNES_DEVICE_ID_JOYPAD_L] &&
pad_state[0][SNES_DEVICE_ID_JOYPAD_R]) ||
(wpad_state[0][SNES_DEVICE_ID_JOYPAD_SELECT] &&
wpad_state[0][SNES_DEVICE_ID_JOYPAD_START] &&
wpad_state[0][SNES_DEVICE_ID_JOYPAD_L] &&
wpad_state[0][SNES_DEVICE_ID_JOYPAD_R]);
(pad_state[0][RETRO_DEVICE_ID_JOYPAD_SELECT] &&
pad_state[0][RETRO_DEVICE_ID_JOYPAD_START] &&
pad_state[0][RETRO_DEVICE_ID_JOYPAD_L] &&
pad_state[0][RETRO_DEVICE_ID_JOYPAD_R]) ||
(wpad_state[0][RETRO_DEVICE_ID_JOYPAD_SELECT] &&
wpad_state[0][RETRO_DEVICE_ID_JOYPAD_START] &&
wpad_state[0][RETRO_DEVICE_ID_JOYPAD_L] &&
wpad_state[0][RETRO_DEVICE_ID_JOYPAD_R]);
default:
return false;
}

10
wii/main.c
View File

@ -90,19 +90,19 @@ static const char *get_rom_path(sgui_handle_t *sgui)
for (unsigned i = 0; i < SSNES_FIRST_META_KEY; i++)
{
input_state |= input_wii.input_state(NULL, NULL, false,
SNES_DEVICE_JOYPAD, 0, i) ? (1 << i) : 0;
RETRO_DEVICE_JOYPAD, 0, i) ? (1 << i) : 0;
}
uint16_t trigger_state = input_state & ~old_input_state;
sgui_action_t action = SGUI_ACTION_NOOP;
if (trigger_state & (1 << SNES_DEVICE_ID_JOYPAD_B))
if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))
action = SGUI_ACTION_CANCEL;
else if (trigger_state & (1 << SNES_DEVICE_ID_JOYPAD_A))
else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_A))
action = SGUI_ACTION_OK;
else if (trigger_state & (1 << SNES_DEVICE_ID_JOYPAD_UP))
else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_UP))
action = SGUI_ACTION_UP;
else if (trigger_state & (1 << SNES_DEVICE_ID_JOYPAD_DOWN))
else if (trigger_state & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN))
action = SGUI_ACTION_DOWN;
const char *ret = sgui_iterate(sgui, action);