RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweak and refactor frontends, menu and config

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@895 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-09-17 09:49:16 +00:00
parent 603c28b317
commit 45285368c0
19 changed files with 262 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platform/pandora/menu.c
View file

@ -21,10 +21,10 @@ static int menu_loop_cscaler(menu_id id, int keys)
for (;;)
{
plat_video_menu_begin();
menu_draw_begin(0);
memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
text_out16(2, 480 - 18, "%dx%d | d-pad to resize, R+d-pad to move", g_layer_cw, g_layer_ch);
plat_video_menu_end();
menu_draw_end();
inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_R|PBTN_MOK|PBTN_MBACK, 40);
if (inp & PBTN_UP) g_layer_cy--;
@ -82,6 +82,7 @@ static int menu_loop_cscaler(menu_id id, int keys)
static menu_entry e_menu_gfx_options[];
static menu_entry e_menu_options[];
static menu_entry e_menu_keyconfig[];
void pnd_menu_init(void)
{
@ -141,7 +142,9 @@ void pnd_menu_init(void)
e_menu_gfx_options[i].data = (void *)mfilters;
pnd_filter_list = mfilters;
i = me_id2offset(e_menu_options, MA_OPT_SCALING);
e_menu_options[i]->name = "Max CPU clock";
i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
e_menu_options[i].name = "Max CPU clock";
me_enable(e_menu_keyconfig, MA_CTRL_DEADZONE, 0);
}

98
platform/pandora/plat.c
View file

@ -18,6 +18,7 @@
#include "../common/menu.h"
#include "../common/plat.h"
#include "../common/arm_utils.h"
#include "../common/input.h"
#include "../linux/sndout_oss.h"
#include "../linux/fbdev.h"
#include "plat.h"
@ -26,6 +27,7 @@
#include <pico/pico_int.h>
#include <linux/input.h>
static struct vout_fbdev *main_fb, *layer_fb;
static int g_layer_x, g_layer_y;
@ -40,6 +42,23 @@ unsigned char *PicoDraw2FB = temp_frame;
const char *renderer_names[] = { NULL };
const char *renderer_names32x[] = { NULL };
static const char * const pandora_gpio_keys[KEY_MAX + 1] = {
[0 ... KEY_MAX] = NULL,
[KEY_UP] = "Up",
[KEY_LEFT] = "Left",
[KEY_RIGHT] = "Right",
[KEY_DOWN] = "Down",
[KEY_HOME] = "A",
[KEY_PAGEDOWN] = "X",
[KEY_END] = "B",
[KEY_PAGEUP] = "Y",
[KEY_RIGHTSHIFT]= "L",
[KEY_RIGHTCTRL] = "R",
[KEY_LEFTALT] = "Start",
[KEY_LEFTCTRL] = "Select",
[KEY_MENU] = "Pandora",
};
static int get_cpu_clock(void)
{
FILE *f;
@ -137,7 +156,6 @@ void plat_video_menu_enter(int is_rom_loaded)
void plat_video_menu_begin(void)
{
memcpy32(g_menuscreen_ptr, g_menubg_ptr, g_menuscreen_w * g_menuscreen_h * 2 / 4);
}
void plat_video_menu_end(void)
@ -189,23 +207,45 @@ void plat_update_volume(int has_changed, int is_up)
}
}
void pemu_forced_frame(int opts, int no_scale)
static void make_bg(void)
{
unsigned short *s = (void *)fb_copy;
unsigned int t, *d = (unsigned int *)g_menubg_src_ptr + 80 / 2;
int x, y;
memset32(g_menubg_src_ptr, 0, 800 * 480 * 2 / 4);
for (y = 0; y < 240; y++, s += 320, d += 800*2/2) {
for (x = 0; x < 320; x++) {
t = s[x];
t |= t << 16;
d[x] = d[x + 800 / 2] = t;
}
}
}
void pemu_forced_frame(int no_scale, int do_emu)
{
int oldscale = currentConfig.scaling;
int po_old = PicoOpt;
if (no_scale) {
currentConfig.scaling = SCALE_1x1;
emu_video_mode_change(8, 224, 0);
}
memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
PicoOpt |= opts|POPT_ACC_SPRITES;
PicoOpt |= POPT_ACC_SPRITES;
if (!no_scale)
PicoOpt |= POPT_EN_SOFTSCALE;
PicoDrawSetOutFormat(PDF_RGB555, 1);
Pico.m.dirtyPal = 1;
PicoFrameDrawOnly();
if (do_emu)
PicoFrame();
else
PicoFrameDrawOnly();
// making a copy because enabling the layer clears it's mem
memcpy32((void *)fb_copy, g_screen_ptr, sizeof(fb_copy) / 4);
make_bg(); // FIXME: honour no_scale
PicoOpt = po_old;
currentConfig.scaling = oldscale;
}
static void updateSound(int len)
@ -425,23 +465,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
plat_video_flip();
}
static void make_bg(void)
{
unsigned short *s = (void *)fb_copy;
unsigned int t, *d = (unsigned int *)g_menubg_src_ptr + 80 / 2;
int x, y;
memset32(g_menubg_src_ptr, 0, 800 * 480 * 2 / 4);
for (y = 0; y < 240; y++, s += 320, d += 800*2/2) {
for (x = 0; x < 320; x++) {
t = s[x];
t |= t << 16;
d[x] = d[x + 800 / 2] = t;
}
}
}
void pemu_loop_prep(void)
{
static int pal_old = -1;
@ -481,28 +504,12 @@ void pemu_loop_prep(void)
void pemu_loop_end(void)
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
pemu_sound_stop();
memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
/* do one more frame for menu bg */
PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;
currentConfig.EmuOpt |= EOPT_16BPP;
PicoDrawSetOutFormat(PDF_RGB555, 1);
Pico.m.dirtyPal = 1;
PicoFrame();
// making a copy because enabling the layer clears it's mem
memcpy32((void *)fb_copy, g_screen_ptr, sizeof(fb_copy) / 4);
make_bg();
pemu_forced_frame(0, 1);
pnd_setup_layer(0, g_layer_x, g_layer_y, g_layer_w, g_layer_h);
PicoOpt = po_old;
currentConfig.EmuOpt = eo_old;
}
void plat_wait_till_us(unsigned int us_to)
@ -613,6 +620,9 @@ void plat_init(void)
sndout_oss_init();
pnd_menu_init();
in_set_config(in_name_to_id("evdev:gpio-keys"), IN_CFG_KEY_NAMES,
pandora_gpio_keys, sizeof(pandora_gpio_keys));
return;
fail1:

2
platform/pandora/version.h
View file

@ -1,2 +1,2 @@
#define VERSION "1.80beta2"
#define VERSION "1.80"