notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
partially working menu
[fceu.git]
/
drivers
/
gp2x
/
input.c
diff --git
a/drivers/gp2x/input.c
b/drivers/gp2x/input.c
index
9ba438a
..
cd25e97
100644
(file)
--- a/
drivers/gp2x/input.c
+++ b/
drivers/gp2x/input.c
@@
-29,13
+29,12
@@
#include "minimal.h"
#include "minimal.h"
+extern uint8 Exit; // exit emu loop
extern int swapbuttons;
extern int scaled_display;
extern int FSkip_setting;
extern int swapbuttons;
extern int scaled_display;
extern int FSkip_setting;
-extern void SetVideoScaling(int pixels,int width,int height);
-
/* UsrInputType[] is user-specified. InputType[] is current
/* UsrInputType[] is user-specified. InputType[] is current
@@
-99,7
+98,7
@@
static void setsoundvol(int soundvolume)
void FCEUD_UpdateInput(void)
{
long lastpad2=lastpad;
void FCEUD_UpdateInput(void)
{
long lastpad2=lastpad;
- unsigned long pad=gp2x_joystick_read(
);
+ unsigned long pad=gp2x_joystick_read(
1); // TODO: USB joys and stuff
uint32 JS=0;
#define down(b) (pad & GP2X_##b)
uint32 JS=0;
#define down(b) (pad & GP2X_##b)
@@
-132,6
+131,10
@@
void FCEUD_UpdateInput(void)
//FCEUI_SetSoundVolume(soundvol);
setsoundvol(soundvol);
}
//FCEUI_SetSoundVolume(soundvol);
setsoundvol(soundvol);
}
+ else if (down(VOL_DOWN) && down(VOL_UP))
+ {
+ Exit = 1;
+ }
if (shift)
{
if (shift)
{
@@
-149,11
+152,11
@@
void FCEUD_UpdateInput(void)
if (scaled_display)
{
if (scaled_display)
{
-
SetVideoScaling(32
0, 256, 240);
+
gp2x_video_RGB_setscaling(
0, 256, 240);
}
else
{
}
else
{
-
SetVideoScaling(32
0, 320, 240);
+
gp2x_video_RGB_setscaling(
0, 320, 240);
}
goto no_pad;
}
goto no_pad;