notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ios_static target
[picodrive.git]
/
platform
/
linux
/
io.c
diff --git
a/platform/linux/io.c
b/platform/linux/io.c
index
5a76696
..
edc5f6e
100644
(file)
--- a/
platform/linux/io.c
+++ b/
platform/linux/io.c
@@
-11,7
+11,6
@@
#include "../libpicofe/menu.h"
#include "../libpicofe/input.h"
#include "../libpicofe/menu.h"
#include "../libpicofe/input.h"
-#include "../libpicofe/linux/sndout_oss.h"
#include "../common/emu.h"
#include "../common/input_pico.h"
#include "version.h"
#include "../common/emu.h"
#include "../common/input_pico.h"
#include "version.h"
@@
-19,7
+18,6
@@
#include "log_io.h"
int current_keys;
#include "log_io.h"
int current_keys;
-unsigned char *PicoDraw2FB;
#ifdef FBDEV
#ifdef FBDEV
@@
-33,7
+31,7
@@
unsigned char *PicoDraw2FB;
static int current_bpp = 16;
static int current_pal[256];
static const char *verstring = "PicoDrive " VERSION;
static int current_bpp = 16;
static int current_pal[256];
static const char *verstring = "PicoDrive " VERSION;
-static int scr_changed = 0, scr_w =
SCREEN_WIDTH, scr_h = SCREEN_HEIGHT
;
+static int scr_changed = 0, scr_w =
320, scr_h = 240
;
/* faking GP2X pad */
enum { GP2X_UP=0x1, GP2X_LEFT=0x4, GP2X_DOWN=0x10, GP2X_RIGHT=0x40,
/* faking GP2X pad */
enum { GP2X_UP=0x1, GP2X_LEFT=0x4, GP2X_DOWN=0x10, GP2X_RIGHT=0x40,
@@
-266,7
+264,6
@@
static void realloc_screen(void)
g_menubg_ptr = realloc(g_menubg_ptr, size);
memset(g_screen_ptr, 0, size);
memset(g_menubg_ptr, 0, size);
g_menubg_ptr = realloc(g_menubg_ptr, size);
memset(g_screen_ptr, 0, size);
memset(g_menubg_ptr, 0, size);
- PicoDraw2FB = g_menubg_ptr;
scr_changed = 0;
}
scr_changed = 0;
}
@@
-336,15
+333,11
@@
void plat_init(void)
g_screen_width = g_menuscreen_w = w;
g_screen_height = g_menuscreen_h = h;
g_menubg_ptr = realloc(g_menubg_ptr, w * g_screen_height * 2);
g_screen_width = g_menuscreen_w = w;
g_screen_height = g_menuscreen_h = h;
g_menubg_ptr = realloc(g_menubg_ptr, w * g_screen_height * 2);
- PicoDraw2FB = g_menubg_ptr;
#else
realloc_screen();
memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
xlib_init();
#endif
#else
realloc_screen();
memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
xlib_init();
#endif
-
- // snd
- sndout_oss_init();
}
void plat_finish(void)
}
void plat_finish(void)
@@
-354,7
+347,6
@@
void plat_finish(void)
#else
free(g_screen_ptr);
#endif
#else
free(g_screen_ptr);
#endif
- sndout_oss_exit();
}
/* misc */
}
/* misc */