linux: oshide becomes xenv for broader use

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@932 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2011-09-03 15:33:25 +00:00
parent 10250ad230
commit 10ef62e381
5 changed files with 119 additions and 101 deletions

View file

@ -50,7 +50,7 @@ OBJS += platform/common/emu.o platform/common/menu_pico.o platform/common/fonts.
platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.o \
platform/common/readpng.o platform/common/input.o platform/common/main.o platform/common/mp3.o \
platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.o \
platform/linux/plat.o platform/linux/oshide.o
platform/linux/plat.o platform/linux/xenv.o
# ARM stuff
OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o

View file

@ -20,6 +20,7 @@
#include "../common/input.h"
#include "../linux/sndout_oss.h"
#include "../linux/fbdev.h"
#include "../linux/xenv.h"
#include "plat.h"
#include "asm_utils.h"
#include "version.h"
@ -169,6 +170,10 @@ void pemu_finalize_frame(const char *fps, const char *notice)
void plat_video_flip(void)
{
g_screen_ptr = vout_fbdev_flip(layer_fb);
// XXX: drain OS event queue here, maybe we'll actually use it someday..
int dummy;
xenv_update(&dummy);
}
void plat_video_toggle_renderer(int change, int is_menu)
@ -542,8 +547,6 @@ void plat_wait_till_us(unsigned int us_to)
*/
}
#include "../linux/oshide.h"
void plat_early_init(void)
{
}
@ -576,7 +579,7 @@ void plat_init(void)
exit(1);
}
oshide_init();
xenv_init();
w = h = 0;
main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2);
@ -629,7 +632,7 @@ void plat_finish(void)
{
sndout_oss_exit();
vout_fbdev_finish(main_fb);
oshide_finish();
xenv_finish();
printf("all done\n");
}