#include <unistd.h>\r
#include <linux/fb.h>\r
#include <linux/omapfb.h>\r
+#include <linux/input.h>\r
\r
#include "../common/emu.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 "../common/input_pico.h"\r
+#include "../common/version.h"\r
+#include "../libpicofe/input.h"\r
+#include "../libpicofe/menu.h"\r
+#include "../libpicofe/plat.h"\r
+#include "../libpicofe/linux/in_evdev.h"\r
+#include "../libpicofe/linux/sndout_oss.h"\r
+#include "../libpicofe/linux/fbdev.h"\r
+#include "../libpicofe/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
+#define LAYER_MEM_SIZE (320*240*2 * 4)\r
\r
static struct vout_fbdev *main_fb, *layer_fb;\r
// g_layer_* - in use, g_layer_c* - configured custom\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
\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))) fb_copy[g_screen_width * g_screen_height * 2];\r
+static unsigned char __attribute__((aligned(4))) fb_copy[320 * 240 * 2];\r
static void *temp_frame;\r
-unsigned char *PicoDraw2FB;\r
const char *renderer_names[] = { NULL };\r
const char *renderer_names32x[] = { NULL };\r
\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
+static struct in_default_bind in_evdev_defbinds[] =\r
+{\r
+ { KEY_UP, IN_BINDTYPE_PLAYER12, GBTN_UP },\r
+ { KEY_DOWN, IN_BINDTYPE_PLAYER12, GBTN_DOWN },\r
+ { KEY_LEFT, IN_BINDTYPE_PLAYER12, GBTN_LEFT },\r
+ { KEY_RIGHT, IN_BINDTYPE_PLAYER12, GBTN_RIGHT },\r
+ { KEY_A, IN_BINDTYPE_PLAYER12, GBTN_A },\r
+ { KEY_S, IN_BINDTYPE_PLAYER12, GBTN_B },\r
+ { KEY_D, IN_BINDTYPE_PLAYER12, GBTN_C },\r
+ { KEY_ENTER, IN_BINDTYPE_PLAYER12, GBTN_START },\r
+ { KEY_R, IN_BINDTYPE_EMU, PEVB_RESET },\r
+ { KEY_F, IN_BINDTYPE_EMU, PEVB_FF },\r
+ { KEY_BACKSPACE,IN_BINDTYPE_EMU, PEVB_FF },\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
+ { KEY_LEFTCTRL, IN_BINDTYPE_EMU, PEVB_MENU },\r
+ { KEY_HOME, IN_BINDTYPE_PLAYER12, GBTN_A },\r
+ { KEY_PAGEDOWN, IN_BINDTYPE_PLAYER12, GBTN_B },\r
+ { KEY_END, IN_BINDTYPE_PLAYER12, GBTN_C },\r
+ { KEY_LEFTALT, IN_BINDTYPE_PLAYER12, GBTN_START },\r
+ { KEY_1, IN_BINDTYPE_EMU, PEVB_STATE_SAVE },\r
+ { KEY_2, IN_BINDTYPE_EMU, PEVB_STATE_LOAD },\r
+ { KEY_3, IN_BINDTYPE_EMU, PEVB_SSLOT_PREV },\r
+ { KEY_4, IN_BINDTYPE_EMU, PEVB_SSLOT_NEXT },\r
+ { KEY_5, IN_BINDTYPE_EMU, PEVB_PICO_PPREV },\r
+ { KEY_6, IN_BINDTYPE_EMU, PEVB_PICO_PNEXT },\r
+ { KEY_7, IN_BINDTYPE_EMU, PEVB_PICO_SWINP },\r
{ 0, 0, 0 }\r
};\r
\r
-static int get_cpu_clock(void)\r
+static const struct menu_keymap key_pbtn_map[] =\r
{\r
- FILE *f;\r
- int ret = 0;\r
- f = fopen("/proc/pandora/cpu_mhz_max", "r");\r
- if (f) {\r
- fscanf(f, "%d", &ret);\r
- fclose(f);\r
- }\r
- return ret;\r
-}\r
+ { KEY_UP, PBTN_UP },\r
+ { KEY_DOWN, PBTN_DOWN },\r
+ { KEY_LEFT, PBTN_LEFT },\r
+ { KEY_RIGHT, PBTN_RIGHT },\r
+ /* Pandora */\r
+ { KEY_END, PBTN_MOK },\r
+ { KEY_PAGEDOWN, PBTN_MBACK },\r
+ { KEY_HOME, PBTN_MA2 },\r
+ { KEY_PAGEUP, PBTN_MA3 },\r
+ { KEY_LEFTCTRL, PBTN_MENU },\r
+ { KEY_RIGHTSHIFT, PBTN_L },\r
+ { KEY_RIGHTCTRL, PBTN_R },\r
+ /* "normal" keyboards */\r
+ { KEY_ENTER, PBTN_MOK },\r
+ { KEY_ESC, PBTN_MBACK },\r
+ { KEY_SEMICOLON, PBTN_MA2 },\r
+ { KEY_APOSTROPHE, PBTN_MA3 },\r
+ { KEY_BACKSLASH, PBTN_MENU },\r
+ { KEY_LEFTBRACE, PBTN_L },\r
+ { KEY_RIGHTBRACE, PBTN_R },\r
+};\r
+\r
+static const struct in_pdata pandora_evdev_pdata = {\r
+ .defbinds = in_evdev_defbinds,\r
+ .key_map = key_pbtn_map,\r
+ .kmap_size = sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]),\r
+};\r
\r
void pemu_prep_defconfig(void)\r
{\r
defaultConfig.EmuOpt |= EOPT_VSYNC|EOPT_16BPP;\r
- defaultConfig.s_PicoOpt |= POPT_EN_MCD_GFX|POPT_EN_MCD_PSYNC;\r
+ defaultConfig.s_PicoOpt |= POPT_EN_MCD_GFX;\r
defaultConfig.scaling = SCALE_2x2_3x2;\r
}\r
\r
void pemu_validate_config(void)\r
{\r
- currentConfig.CPUclock = get_cpu_clock();\r
-}\r
-\r
-static void osd_text(int x, int y, const char *text)\r
-{\r
- int len = strlen(text)*8;\r
- int i, h;\r
-\r
- len++;\r
- for (h = 0; h < 8; h++) {\r
- unsigned short *p;\r
- p = (unsigned short *)g_screen_ptr + x + g_screen_width*(y + h);\r
- for (i = len; i; i--, p++)\r
- *p = (*p>>2) & 0x39e7;\r
- }\r
- emu_text_out16(x, y, text);\r
+ currentConfig.CPUclock = plat_target_cpu_clock_get();\r
}\r
\r
static void draw_cd_leds(void)\r
}\r
}\r
\r
-static int emuscan(unsigned int num)\r
-{\r
- DrawLineDest = (unsigned short *)g_screen_ptr + num * g_screen_width;\r
-\r
- return 0;\r
-}\r
-\r
void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
if (notice && notice[0])\r
- osd_text(2, g_osd_y, notice);\r
+ emu_osd_text16(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
+ emu_osd_text16(g_osd_fps_x, g_osd_y, fps);\r
+ if ((PicoIn.AHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
}\r
\r
void plat_video_flip(void)\r
{\r
g_screen_ptr = vout_fbdev_flip(layer_fb);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
\r
// XXX: drain OS event queue here, maybe we'll actually use it someday..\r
- int dummy;\r
- xenv_update(&dummy);\r
+ xenv_update(NULL, NULL, NULL, NULL);\r
}\r
\r
void plat_video_toggle_renderer(int change, int is_menu)\r
g_menuscreen_ptr = vout_fbdev_flip(main_fb);\r
}\r
\r
+void plat_video_menu_leave(void)\r
+{\r
+}\r
+\r
void plat_video_wait_vsync(void)\r
{\r
vout_fbdev_wait_vsync(main_fb);\r
\r
void plat_update_volume(int has_changed, int is_up)\r
{\r
- static int prev_frame = 0, wait_frames = 0;\r
- int vol = currentConfig.volume;\r
-\r
- if (has_changed)\r
- {\r
- if (is_up) {\r
- if (vol < 99) vol++;\r
- } else {\r
- if (vol > 0) vol--;\r
- }\r
- wait_frames = 0;\r
- sndout_oss_setvol(vol, vol);\r
- currentConfig.volume = vol;\r
- emu_status_msg("VOL: %02i", vol);\r
- prev_frame = Pico.m.frame_count;\r
- }\r
-}\r
-\r
-static void make_bg(int no_scale)\r
-{\r
- unsigned short *s = (void *)fb_copy;\r
- int x, y;\r
-\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
- 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
void pemu_forced_frame(int no_scale, int 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
-\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
- sndout_oss_write_nb(PsndOut, len);\r
+ memcpy((void *)fb_copy, g_screen_ptr, sizeof(fb_copy));\r
+ g_menubg_src_ptr = fb_copy;\r
}\r
\r
void pemu_sound_start(void)\r
{\r
- PsndOut = NULL;\r
-\r
- if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
- {\r
- int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
-\r
- PsndRerate(Pico.m.frame_count ? 1 : 0);\r
-\r
- /*\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 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 = oss_write_nonblocking;\r
- plat_update_volume(0, 0);\r
- memset(sndBuffer, 0, sizeof(sndBuffer));\r
- PsndOut = sndBuffer;\r
- }\r
-}\r
-\r
-void pemu_sound_stop(void)\r
-{\r
- sndout_oss_stop();\r
-}\r
-\r
-void pemu_sound_wait(void)\r
-{\r
- // don't need to do anything, writes will block by themselves\r
+ emu_sound_start();\r
}\r
\r
void plat_debug_cat(char *str)\r
{\r
struct omapfb_plane_info pi;\r
struct omapfb_mem_info mi;\r
+ int is_enabled;\r
+ int retval = 0;\r
int ret;\r
\r
ret = ioctl(fd, OMAPFB_QUERY_PLANE, &pi);\r
}\r
\r
/* must disable when changing stuff */\r
- if (pi.enabled) {\r
+ is_enabled = pi.enabled;\r
+ if (is_enabled) {\r
pi.enabled = 0;\r
ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi);\r
if (ret != 0)\r
perror("SETUP_PLANE");\r
+ else\r
+ is_enabled = 0;\r
}\r
\r
- mi.size = 320*240*2*4;\r
- ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);\r
- if (ret != 0) {\r
- perror("SETUP_MEM");\r
- return -1;\r
+ if (mi.size < LAYER_MEM_SIZE) {\r
+ unsigned int size_old = mi.size;\r
+\r
+ mi.size = LAYER_MEM_SIZE;\r
+ ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);\r
+ if (ret != 0) {\r
+ perror("SETUP_MEM");\r
+ fprintf(stderr, "(requested %u, had %u)\n",\r
+ mi.size, size_old);\r
+ return -1;\r
+ }\r
}\r
\r
pi.pos_x = x;\r
pi.enabled = enabled;\r
\r
ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi);\r
- if (ret != 0) {\r
+ if (ret == 0) {\r
+ is_enabled = pi.enabled;\r
+ }\r
+ else {\r
perror("SETUP_PLANE");\r
- return -1;\r
+ retval = -1;\r
}\r
\r
- return 0;\r
+ plat_target_switch_layer(1, is_enabled);\r
+\r
+ return retval;\r
}\r
\r
int pnd_setup_layer(int enabled, int x, int y, int w, int h)\r
if ((t[0] | t[5] | t[13]) == 0)\r
memset32((void *)fb_copy, 0x07000700, sizeof(fb_copy) / 4);\r
\r
- memcpy32(g_screen_ptr, (void *)fb_copy, 320*240*2 / 4);\r
+ memcpy(g_screen_ptr, (void *)fb_copy, 320*240*2);\r
plat_video_flip();\r
}\r
\r
-static void apply_filter(int which)\r
-{\r
- char buf[128];\r
- int i;\r
-\r
- if (pnd_filter_list == NULL)\r
- return;\r
-\r
- for (i = 0; i < which; i++)\r
- if (pnd_filter_list[i] == NULL)\r
- return;\r
-\r
- if (pnd_filter_list[i] == NULL)\r
- return;\r
-\r
- snprintf(buf, sizeof(buf), "%s/op_videofir.sh %s", pnd_script_base, pnd_filter_list[i]);\r
- system(buf);\r
-}\r
-\r
void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
{\r
int fb_w = 320, fb_h = 240, fb_left = 0, fb_right = 0, fb_top = 0, fb_bottom = 0;\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
fb_left = fb_right = 32;\r
\r
pnd_setup_layer(1, g_layer_x, g_layer_y, g_layer_w, g_layer_h);\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
+ vout_fbdev_resize(layer_fb, fb_w, fb_h, 16, fb_left, fb_right, fb_top, fb_bottom, 4);\r
plat_video_flip();\r
+\r
+ PicoDrawSetOutFormat(PDF_RGB555, 0);\r
}\r
\r
-void pemu_loop_prep(void)\r
+void plat_video_loop_prepare(void)\r
{\r
- static int pal_old = -1;\r
- static int filter_old = -1;\r
- char buf[128];\r
-\r
- if (currentConfig.CPUclock != get_cpu_clock()) {\r
- snprintf(buf, sizeof(buf), "unset DISPLAY; echo y | %s/op_cpuspeed.sh %d",\r
- pnd_script_base, currentConfig.CPUclock);\r
- system(buf);\r
- }\r
-\r
- if (Pico.m.pal != pal_old) {\r
- snprintf(buf, sizeof(buf), "%s/op_lcdrate.sh %d",\r
- pnd_script_base, Pico.m.pal ? 50 : 60);\r
- system(buf);\r
- pal_old = Pico.m.pal;\r
- }\r
-\r
- if (currentConfig.filter != filter_old) {\r
- apply_filter(currentConfig.filter);\r
- filter_old = currentConfig.filter;\r
- }\r
-\r
// make sure there is no junk left behind the layer\r
- memset32(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2 / 4);\r
+ memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);\r
g_menuscreen_ptr = vout_fbdev_flip(main_fb);\r
\r
// emu_video_mode_change will call pnd_setup_layer()\r
+}\r
\r
+void pemu_loop_prep(void)\r
+{\r
// dirty buffers better go now than during gameplay\r
+ fflush(stdout);\r
+ fflush(stderr);\r
sync();\r
sleep(0);\r
-\r
- pemu_sound_start();\r
}\r
\r
void pemu_loop_end(void)\r
{\r
- pemu_sound_stop();\r
-\r
/* do one more frame for menu bg */\r
pemu_forced_frame(0, 1);\r
\r
*/\r
}\r
\r
+void *plat_mem_get_for_drc(size_t size)\r
+{\r
+ return NULL;\r
+}\r
+\r
void plat_early_init(void)\r
{\r
}\r
exit(1);\r
}\r
\r
- xenv_init();\r
+ xenv_init(NULL, "PicoDrive " VERSION);\r
\r
w = h = 0;\r
main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2);\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, 16, 3);\r
+ layer_fb = vout_fbdev_init(layer_fb_name, &w, &h, 16, 4);\r
if (layer_fb == NULL) {\r
fprintf(stderr, "couldn't init fb: %s\n", layer_fb_name);\r
goto fail0;\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
+ // default ROM path\r
+ strcpy(rom_fname_loaded, "/media");\r
+\r
+ in_evdev_init(&pandora_evdev_pdata);\r
+ in_probe();\r
+ plat_target_setup_input();\r
+\r
+ sndout_oss_frag_frames = 2;\r
+\r
return;\r
\r
fail1:\r
\r
void plat_finish(void)\r
{\r
- sndout_oss_exit();\r
vout_fbdev_finish(main_fb);\r
xenv_finish();\r
\r
notaz.gp2x.de / picodrive.git / blobdiff