\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/menu.h"\r
#include "../common/plat.h"\r
#include "../common/arm_utils.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
\r
#include <pico/pico_int.h>\r
\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;\r
+static int g_osd_fps_x, g_osd_y, doing_bg_frame;\r
\r
static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts";\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
-static unsigned char __attribute__((aligned(4))) temp_frame[g_menuscreen_w * g_menuscreen_h * 2];\r
static unsigned char __attribute__((aligned(4))) fb_copy[g_screen_width * g_screen_height * 2];\r
-unsigned char *PicoDraw2FB = temp_frame;\r
+static void *temp_frame;\r
+unsigned char *PicoDraw2FB;\r
const char *renderer_names[] = { NULL };\r
const char *renderer_names32x[] = { NULL };\r
-char cpu_clk_name[] = "Max CPU clock";\r
+\r
+static const char * const pandora_gpio_keys[KEY_MAX + 1] = {\r
+ [0 ... KEY_MAX] = NULL,\r
+ [KEY_UP] = "Up",\r
+ [KEY_LEFT] = "Left",\r
+ [KEY_RIGHT] = "Right",\r
+ [KEY_DOWN] = "Down",\r
+ [KEY_HOME] = "A",\r
+ [KEY_PAGEDOWN] = "X",\r
+ [KEY_END] = "B",\r
+ [KEY_PAGEUP] = "Y",\r
+ [KEY_RIGHTSHIFT]= "L",\r
+ [KEY_RIGHTCTRL] = "R",\r
+ [KEY_LEFTALT] = "Start",\r
+ [KEY_LEFTCTRL] = "Select",\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
\r
void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
- if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
- if (notice)\r
- osd_text(2, g_osd_y, notice);\r
- if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
- osd_text(g_osd_fps_x, g_osd_y, fps);\r
- }\r
+ if (notice && notice[0])\r
+ osd_text(2, g_osd_y, notice);\r
+ if (fps && fps[0] && (currentConfig.EmuOpt & EOPT_SHOW_FPS))\r
+ osd_text(g_osd_fps_x, g_osd_y, fps);\r
if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
}\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 plat_video_menu_begin(void)\r
{\r
- memcpy32(g_menuscreen_ptr, g_menubg_ptr, g_menuscreen_w * g_menuscreen_h * 2 / 4);\r
}\r
\r
void plat_video_menu_end(void)\r
\r
void plat_status_msg_clear(void)\r
{\r
- vout_fbdev_clear_lines(layer_fb, g_screen_height - 8, 8);\r
+ vout_fbdev_clear_lines(layer_fb, g_osd_y, 8);\r
}\r
\r
void plat_status_msg_busy_next(const char *msg)\r
}\r
}\r
\r
-void pemu_forced_frame(int opts, int no_scale)\r
+static void make_bg(int no_scale)\r
{\r
- int oldscale = currentConfig.scaling;\r
- int po_old = PicoOpt;\r
+ unsigned short *s = (void *)fb_copy;\r
+ int x, y;\r
\r
- if (no_scale) {\r
- currentConfig.scaling = SCALE_1x1;\r
- emu_video_mode_change(8, 224, 0);\r
+ memset32(g_menubg_src_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2 / 4);\r
+\r
+ if (!no_scale && g_menuscreen_w >= 640 && g_menuscreen_h >= 480) {\r
+ unsigned int t, *d = g_menubg_src_ptr;\r
+ d += (g_menuscreen_h / 2 - 480 / 2) * g_menuscreen_w / 2;\r
+ d += (g_menuscreen_w / 2 - 640 / 2) / 2;\r
+ for (y = 0; y < 240; y++, s += 320, d += g_menuscreen_w*2/2) {\r
+ for (x = 0; x < 320; x++) {\r
+ t = s[x];\r
+ t |= t << 16;\r
+ d[x] = d[x + g_menuscreen_w / 2] = t;\r
+ }\r
+ }\r
+ return;\r
}\r
\r
- PicoOpt |= opts|POPT_ACC_SPRITES;\r
-\r
- Pico.m.dirtyPal = 1;\r
- PicoFrameDrawOnly();\r
-\r
- PicoOpt = po_old;\r
- currentConfig.scaling = oldscale;\r
+ if (g_menuscreen_w >= 320 && g_menuscreen_h >= 240) {\r
+ unsigned short *d = g_menubg_src_ptr;\r
+ d += (g_menuscreen_h / 2 - 240 / 2) * g_menuscreen_w;\r
+ d += (g_menuscreen_w / 2 - 320 / 2);\r
+ for (y = 0; y < 240; y++, s += 320, d += g_menuscreen_w)\r
+ memcpy(d, s, 320*2);\r
+ return;\r
+ }\r
}\r
\r
-static void updateSound(int len)\r
+void pemu_forced_frame(int no_scale, int do_emu)\r
{\r
- unsigned int t;\r
+ doing_bg_frame = 1;\r
+ emu_cmn_forced_frame(no_scale, do_emu);\r
+ doing_bg_frame = 0;\r
\r
- len <<= 1;\r
- if (PicoOpt & POPT_EN_STEREO)\r
- len <<= 1;\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
\r
- // sndout_oss_can_write() not reliable..\r
+static void oss_write_nonblocking(int len)\r
+{\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
{\r
- int target_fps = Pico.m.pal ? 50 : 60;\r
-\r
PsndOut = NULL;\r
\r
if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
{\r
- int snd_excess_add, frame_samples;\r
int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
\r
PsndRerate(Pico.m.frame_count ? 1 : 0);\r
\r
- frame_samples = PsndLen;\r
- snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;\r
- if (snd_excess_add != 0)\r
- frame_samples++;\r
-\r
/*\r
- * for 44k stereo, we do 1470 samples/frame\r
+ * for 44k stereo, we do 1470 samples/emu_frame\r
* OMAP driver does power of 2 buffers, so we need at least 4K buffer.\r
* The most we can lag is 1K samples, size of OMAP's McBSP FIFO,\r
* with 2K sample buffer we might sometimes lag more than that,\r
* thus causing underflows.\r
*/\r
- printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
- PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);\r
- sndout_oss_start(PsndRate, frame_samples * 2, is_stereo);\r
+ printf("starting audio: %i len: %i stereo: %i, pal: %i\n",\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
\r
void pnd_restore_layer_data(void)\r
{\r
- short *t = ((short *)fb_copy)[320*240 / 2 + 160];\r
+ short *t = (short *)fb_copy + 320*240 / 2 + 160;\r
\r
// right now this is used by menu, which wants to preview something\r
// so try to get something on the layer.\r
{\r
int fb_w = 320, fb_h = 240, fb_left = 0, fb_right = 0, fb_top = 0, fb_bottom = 0;\r
\r
- PicoScanBegin = emuscan;\r
- PicoScanEnd = NULL;\r
+ if (doing_bg_frame)\r
+ return;\r
+\r
PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+ PicoDrawSetCallbacks(emuscan, NULL);\r
\r
if (is_32cols) {\r
fb_w = 256;\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
-}\r
-\r
-static void make_bg(void)\r
-{\r
- unsigned short *s = (void *)fb_copy;\r
- unsigned int t, *d = (unsigned int *)g_menubg_src_ptr + 80 / 2;\r
- int x, y;\r
-\r
- memset32(g_menubg_src_ptr, 0, 800 * 480 * 2 / 4);\r
-\r
- for (y = 0; y < 240; y++, s += 320, d += 800*2/2) {\r
- for (x = 0; x < 320; x++) {\r
- t = s[x];\r
- t |= t << 16;\r
- d[x] = d[x + 800 / 2] = t;\r
- }\r
- }\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
void pemu_loop_prep(void)\r
}\r
\r
// make sure there is no junk left behind the layer\r
- memset32(g_menuscreen_ptr, 0, 800 * 480 * 2 / 4);\r
+ memset32(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2 / 4);\r
g_menuscreen_ptr = vout_fbdev_flip(main_fb);\r
\r
// emu_video_mode_change will call pnd_setup_layer()\r
\r
void pemu_loop_end(void)\r
{\r
- int po_old = PicoOpt;\r
- int eo_old = currentConfig.EmuOpt;\r
-\r
pemu_sound_stop();\r
- memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
\r
/* do one more frame for menu bg */\r
- PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
- currentConfig.EmuOpt |= EOPT_16BPP;\r
-\r
- PicoDrawSetOutFormat(PDF_RGB555, 1);\r
- Pico.m.dirtyPal = 1;\r
- PicoFrame();\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();\r
+ pemu_forced_frame(0, 1);\r
\r
pnd_setup_layer(0, g_layer_x, g_layer_y, g_layer_w, g_layer_h);\r
-\r
- PicoOpt = po_old;\r
- currentConfig.EmuOpt = eo_old;\r
}\r
\r
void plat_wait_till_us(unsigned int us_to)\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
}\r
\r
- if (w != g_menuscreen_w || h != g_menuscreen_h) {\r
- fprintf(stderr, "%dx%d not supported on %s\n", w, h, main_fb_name);\r
- goto fail0;\r
- }\r
+ g_menuscreen_w = w;\r
+ g_menuscreen_h = h;\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
g_screen_ptr = vout_fbdev_flip(layer_fb);\r
\r
+ temp_frame = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);\r
+ if (temp_frame == NULL) {\r
+ fprintf(stderr, "OOM\n");\r
+ goto fail1;\r
+ }\r
g_menubg_ptr = temp_frame;\r
g_menubg_src_ptr = temp_frame;\r
+ PicoDraw2FB = temp_frame;\r
\r
sndout_oss_init();\r
pnd_menu_init();\r
+\r
+ in_set_config(in_name_to_id("evdev:gpio-keys"), IN_CFG_KEY_NAMES,\r
+ pandora_gpio_keys, sizeof(pandora_gpio_keys));\r
return;\r
\r
fail1:\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
notaz.gp2x.de / libpicofe.git / blobdiff