From: notaz Date: Fri, 10 Dec 2010 11:54:59 +0000 (+0200) Subject: fix x86 build, minor refactoring X-Git-Tag: r1~38 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccf51908872ddeb811b1245e6751600b860d90b5;p=pcsx_rearmed.git fix x86 build, minor refactoring --- diff --git a/Makefile b/Makefile index 3ca1616f..10614ec6 100644 --- a/Makefile +++ b/Makefile @@ -55,12 +55,15 @@ endif OBJS += gui/Config.o gui/Plugin.o OBJS += frontend/main.o frontend/plugin.o frontend/plugin_lib.o -OBJS += frontend/omap.o frontend/menu.o +OBJS += frontend/menu.o OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o OBJS += frontend/linux/plat.o frontend/linux/oshide.o OBJS += frontend/common/fonts.o frontend/common/input.o frontend/common/readpng.o ifdef CROSS_COMPILE OBJS += frontend/arm_utils.o +OBJS += frontend/plat_omap.o +else +OBJS += frontend/plat_dummy.o endif frontend/%.o: CFLAGS += -Wall -DIN_EVDEV diff --git a/frontend/plat_dummy.c b/frontend/plat_dummy.c new file mode 100644 index 00000000..b209f4fe --- /dev/null +++ b/frontend/plat_dummy.c @@ -0,0 +1,36 @@ +/* + * (C) notaz, 2010 + * + * This work is licensed under the terms of the GNU GPLv2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "common/input.h" +#include "linux/fbdev.h" + +struct vout_fbdev *layer_fb; +struct in_default_bind in_evdev_defbinds[] = { + { 0, 0, 0 }, +}; + +int omap_enable_layer(int enabled) +{ + return 0; +} + +void plat_video_menu_enter(int is_rom_loaded) +{ +} + +void plat_video_menu_begin(void) +{ +} + +void plat_video_menu_end(void) +{ +} + +void plat_init(void) +{ +} + diff --git a/frontend/omap.c b/frontend/plat_omap.c similarity index 100% rename from frontend/omap.c rename to frontend/plat_omap.c diff --git a/frontend/plugin.c b/frontend/plugin.c index c83da729..ca359d7d 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -48,8 +48,8 @@ static uint8_t pad_byte; static unsigned char PADstartPoll(int pad) { pad_byte = 0; - pad_buf[2] = keystate; - pad_buf[3] = keystate >> 8; + pad_buf[2] = ~keystate; + pad_buf[3] = ~keystate >> 8; return 0xFF; } diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 7d5e15fd..e2a0d58e 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -47,7 +47,7 @@ void *pl_fbdev_flip(void) in_update(actions); if (actions[IN_BINDTYPE_EMU] & PEV_MENU) stop = 1; - keystate = ~actions[IN_BINDTYPE_PLAYER12]; + keystate = actions[IN_BINDTYPE_PLAYER12]; // let's flip now pl_fbdev_buf = vout_fbdev_flip(layer_fb); diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c index 9b20e5ca..3403d452 100644 --- a/libpcsxcore/new_dynarec/emu_if.c +++ b/libpcsxcore/new_dynarec/emu_if.c @@ -236,11 +236,13 @@ void do_insn_cmp() {} unsigned int address, readmem_word, word; unsigned short hword; unsigned char byte; -int pending_exception; +int pending_exception, stop; unsigned int next_interupt; void new_dynarec_init() {} void new_dyna_start() {} void new_dynarec_cleanup() {} +void invalidate_all_pages() {} +void invalidate_block(unsigned int block) {} #endif #ifdef DRC_DBG