\r
#include <stdio.h>\r
#include <unistd.h>\r
-#include <stdarg.h>\r
#include <sys/types.h>\r
#include <sys/stat.h>\r
#include <fcntl.h>\r
#include "../common/input.h"\r
#include "../linux/sndout_oss.h"\r
#include "../linux/fbdev.h"\r
+#include "../linux/xenv.h"\r
#include "plat.h"\r
#include "asm_utils.h"\r
#include "version.h"\r
#include <linux/input.h>\r
\r
static struct vout_fbdev *main_fb, *layer_fb;\r
+// g_layer_* - in use, g_layer_c* - configured custom\r
+int g_layer_cx, g_layer_cy, g_layer_cw, g_layer_ch;\r
static int g_layer_x, g_layer_y;\r
static int g_layer_w = 320, g_layer_h = 240;\r
static int g_osd_fps_x, g_osd_y, doing_bg_frame;\r
[KEY_MENU] = "Pandora",\r
};\r
\r
+struct in_default_bind in_evdev_defbinds[] =\r
+{\r
+ /* MXYZ SACB RLDU */\r
+ { KEY_UP, IN_BINDTYPE_PLAYER12, 0 },\r
+ { KEY_DOWN, IN_BINDTYPE_PLAYER12, 1 },\r
+ { KEY_LEFT, IN_BINDTYPE_PLAYER12, 2 },\r
+ { KEY_RIGHT, IN_BINDTYPE_PLAYER12, 3 },\r
+ { KEY_S, IN_BINDTYPE_PLAYER12, 4 }, /* B */\r
+ { KEY_D, IN_BINDTYPE_PLAYER12, 5 }, /* C */\r
+ { KEY_A, IN_BINDTYPE_PLAYER12, 6 }, /* A */\r
+ { KEY_ENTER, IN_BINDTYPE_PLAYER12, 7 },\r
+ { KEY_BACKSLASH, IN_BINDTYPE_EMU, PEVB_MENU },\r
+ { KEY_SPACE, IN_BINDTYPE_EMU, PEVB_MENU },\r
+ /* Pandora */\r
+ { KEY_PAGEDOWN, IN_BINDTYPE_PLAYER12, 4 },\r
+ { KEY_END, IN_BINDTYPE_PLAYER12, 5 },\r
+ { KEY_HOME, IN_BINDTYPE_PLAYER12, 6 },\r
+ { KEY_LEFTALT, IN_BINDTYPE_PLAYER12, 7 },\r
+ { KEY_RIGHTSHIFT,IN_BINDTYPE_EMU, PEVB_STATE_SAVE },\r
+ { KEY_RIGHTCTRL, IN_BINDTYPE_EMU, PEVB_STATE_LOAD },\r
+ { KEY_LEFTCTRL, IN_BINDTYPE_EMU, PEVB_MENU },\r
+ { 0, 0, 0 }\r
+};\r
+\r
static int get_cpu_clock(void)\r
{\r
FILE *f;\r
void plat_video_flip(void)\r
{\r
g_screen_ptr = vout_fbdev_flip(layer_fb);\r
+\r
+ // XXX: drain OS event queue here, maybe we'll actually use it someday..\r
+ int dummy;\r
+ xenv_update(&dummy);\r
}\r
\r
void plat_video_toggle_renderer(int change, int is_menu)\r
\r
void pemu_forced_frame(int no_scale, int do_emu)\r
{\r
- int po_old = PicoOpt;\r
-\r
- memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
-\r
- PicoOpt |= POPT_ACC_SPRITES;\r
- if (!no_scale)\r
- PicoOpt |= POPT_EN_SOFTSCALE;\r
-\r
- PicoDrawSetOutFormat(PDF_RGB555, 1);\r
- Pico.m.dirtyPal = 1;\r
doing_bg_frame = 1;\r
- if (do_emu)\r
- PicoFrame();\r
- else\r
- PicoFrameDrawOnly();\r
+ emu_cmn_forced_frame(no_scale, do_emu);\r
doing_bg_frame = 0;\r
\r
// making a copy because enabling the layer clears it's mem\r
memcpy32((void *)fb_copy, g_screen_ptr, sizeof(fb_copy) / 4);\r
make_bg(no_scale);\r
-\r
- PicoOpt = po_old;\r
}\r
\r
-static void updateSound(int len)\r
+static void oss_write_nonblocking(int len)\r
{\r
- unsigned int t;\r
-\r
- len <<= 1;\r
- if (PicoOpt & POPT_EN_STEREO)\r
- len <<= 1;\r
-\r
- // sndout_oss_can_write() not reliable..\r
+ // sndout_oss_can_write() is not reliable, only use with no_frmlimit\r
if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))\r
return;\r
\r
- /* avoid writing audio when lagging behind to prevent audio lag */\r
- if (PicoSkipFrame == 2)\r
- return;\r
-\r
- t = plat_get_ticks_ms();\r
- sndout_oss_write(PsndOut, len);\r
- t = plat_get_ticks_ms() - t;\r
- if (t > 1)\r
- printf("audio lag %u\n", t);\r
+ sndout_oss_write_nb(PsndOut, len);\r
}\r
\r
void pemu_sound_start(void)\r
PsndRate, PsndLen, is_stereo, Pico.m.pal);\r
sndout_oss_start(PsndRate, is_stereo, 2);\r
//sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
- PicoWriteSound = updateSound;\r
+ PicoWriteSound = oss_write_nonblocking;\r
plat_update_volume(0, 0);\r
memset(sndBuffer, 0, sizeof(sndBuffer));\r
PsndOut = sndBuffer;\r
g_osd_y = fb_top + fb_h - 8;\r
\r
pnd_setup_layer(1, g_layer_x, g_layer_y, g_layer_w, g_layer_h);\r
- vout_fbdev_resize(layer_fb, fb_w, fb_h, fb_left, fb_right, fb_top, fb_bottom, 0);\r
vout_fbdev_clear(layer_fb);\r
+ vout_fbdev_resize(layer_fb, fb_w, fb_h, 16, fb_left, fb_right, fb_top, fb_bottom, 3);\r
plat_video_flip();\r
}\r
\r
*/\r
}\r
\r
-const char *plat_get_credits(void)\r
-{\r
- return "PicoDrive v" VERSION " (c) notaz, 2006-2010\n\n\n"\r
- "Credits:\n"\r
- "fDave: Cyclone 68000 core,\n"\r
- " base code of PicoDrive\n"\r
- "Reesy & FluBBa: DrZ80 core\n"\r
- "MAME devs: YM2612 and SN76496 cores\n"\r
- "Pandora team: Pandora\n"\r
- "Inder, ketchupgun: graphics\n"\r
- "\n"\r
- "special thanks (for docs, ideas):\n"\r
- " Charles MacDonald, Haze,\n"\r
- " Stephane Dallongeville,\n"\r
- " Lordus, Exophase, Rokas,\n"\r
- " Nemesis, Tasco Deluxe";\r
-}\r
-\r
-#include "../linux/oshide.h"\r
-\r
void plat_early_init(void)\r
{\r
}\r
exit(1);\r
}\r
\r
- oshide_init();\r
+ xenv_init();\r
\r
w = h = 0;\r
- main_fb = vout_fbdev_init(main_fb_name, &w, &h, 0);\r
+ main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2);\r
if (main_fb == NULL) {\r
fprintf(stderr, "couldn't init fb: %s\n", main_fb_name);\r
exit(1);\r
g_menuscreen_ptr = vout_fbdev_flip(main_fb);\r
\r
w = 320; h = 240;\r
- layer_fb = vout_fbdev_init(layer_fb_name, &w, &h, 0);\r
+ layer_fb = vout_fbdev_init(layer_fb_name, &w, &h, 16, 3);\r
if (layer_fb == NULL) {\r
fprintf(stderr, "couldn't init fb: %s\n", layer_fb_name);\r
goto fail0;\r
{\r
sndout_oss_exit();\r
vout_fbdev_finish(main_fb);\r
- oshide_finish();\r
+ xenv_finish();\r
\r
printf("all done\n");\r
}\r
\r
-/* lprintf */\r
-void lprintf(const char *fmt, ...)\r
-{\r
- va_list vl;\r
-\r
- va_start(vl, fmt);\r
- vprintf(fmt, vl);\r
- va_end(vl);\r
-}\r
-\r