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

add configure, revive pnd build, unify/refactor things

Browse source
This commit is contained in:
notaz 2013-06-25 01:39:21 +03:00
parent 7e7b446f29
commit d4d626658a
22 changed files with 733 additions and 498 deletions
Download patch file Download diff file Expand all files Collapse all files

52
platform/common/common.mak
View file

@ -20,6 +20,37 @@ DEFINES += PPROF
OBJS += platform/linux/pprof.o
endif
# asm stuff
ifeq "$(asm_render)" "1"
DEFINES += _ASM_DRAW_C
OBJS += pico/draw_arm.o pico/draw2_arm.o
endif
ifeq "$(asm_memory)" "1"
DEFINES += _ASM_MEMORY_C
OBJS += pico/memory_arm.o
endif
ifeq "$(asm_ym2612)" "1"
DEFINES += _ASM_YM2612_C
OBJS += pico/sound/ym2612_arm.o
endif
ifeq "$(asm_misc)" "1"
DEFINES += _ASM_MISC_C
OBJS += pico/misc_arm.o
OBJS += pico/cd/misc_arm.o
endif
ifeq "$(asm_cdpico)" "1"
DEFINES += _ASM_CD_PICO_C
OBJS += pico/cd/pico_arm.o
endif
ifeq "$(asm_cdmemory)" "1"
DEFINES += _ASM_CD_MEMORY_C
OBJS += pico/cd/memory_arm.o
endif
ifeq "$(asm_32xdraw)" "1"
DEFINES += _ASM_32X_DRAW
OBJS += pico/32x/draw_arm.o
endif
# === Pico core ===
# Pico
OBJS += pico/state.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o pico/z80if.o \
@ -48,6 +79,10 @@ OBJS += pico/carthw/carthw.o
# SVP
OBJS += pico/carthw/svp/svp.o pico/carthw/svp/memory.o \
pico/carthw/svp/ssp16.o
ifeq "$(ARCH)" "arm"
OBJS += pico/carthw/svp/stub_arm.o
OBJS += pico/carthw/svp/compiler.o
endif
# sound
OBJS += pico/sound/sound.o
OBJS += pico/sound/sn76496.o pico/sound/ym2612.o
@ -61,7 +96,7 @@ OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
endif
ifeq "$(use_cyclone)" "1"
DEFINES += EMU_C68K
OBJS += pico/m68kif_cyclone.o cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
OBJS += pico/m68kif_cyclone.o cpu/cyclone/Cyclone.o cpu/cyclone/tools/idle.o
endif
ifeq "$(use_fame)" "1"
DEFINES += EMU_F68K
@ -104,22 +139,13 @@ OBJS += cpu/sh2/mame/sh2pico.o
endif
endif # !no_32x
DIRS += platform platform/common pico pico/cd pico/pico pico/32x pico/sound pico/carthw/svp \
cpu cpu/musashi cpu/cz80 cpu/fame cpu/sh2/mame cpu/drc
CFLAGS += $(addprefix -D,$(DEFINES))
# common rules
.c.o:
@echo ">>>" $<
$(CC) $(CFLAGS) -c $< -o $@
.s.o:
@echo ">>>" $<
$(CC) $(CFLAGS) -c $< -o $@
mkdirs:
mkdir -p $(DIRS)
tools/textfilter: tools/textfilter.c
make -C tools/ textfilter
@ -138,7 +164,7 @@ cpu/fame/famec.o : cpu/fame/famec.c cpu/fame/famec_opcodes.h
@echo ">>>" $<
$(CC) $(CFLAGS) -Wno-unused -c $< -o $@
cpu/Cyclone/proj/Cyclone.s:
cpu/cyclone/Cyclone.s:
@echo building Cyclone...
@make -C cpu/Cyclone/proj CONFIG_FILE=config_pico.h
@make -C cpu/cyclone CONFIG_FILE='\"../cyclone_config.h\"'

39
platform/common/common_arm.mak
View file

@ -1,39 +0,0 @@
# asm stuff
ifeq "$(asm_render)" "1"
DEFINES += _ASM_DRAW_C
OBJS += pico/draw_arm.o pico/draw2_arm.o
endif
ifeq "$(asm_memory)" "1"
DEFINES += _ASM_MEMORY_C
OBJS += pico/memory_arm.o
endif
ifeq "$(asm_ym2612)" "1"
DEFINES += _ASM_YM2612_C
OBJS += pico/sound/ym2612_arm.o
endif
ifeq "$(asm_misc)" "1"
DEFINES += _ASM_MISC_C
OBJS += pico/misc_arm.o
OBJS += pico/cd/misc_arm.o
endif
ifeq "$(asm_cdpico)" "1"
DEFINES += _ASM_CD_PICO_C
OBJS += pico/cd/pico_arm.o
endif
ifeq "$(asm_cdmemory)" "1"
DEFINES += _ASM_CD_MEMORY_C
OBJS += pico/cd/memory_arm.o
endif
ifeq "$(asm_32xdraw)" "1"
DEFINES += _ASM_32X_DRAW
OBJS += pico/32x/draw_arm.o
endif
DIRS += cpu/Cyclone cpu/Cyclone/proj cpu/Cyclone/tools cpu/DrZ80
# build helix libs
../common/helix/$(CROSS)helix-mp3.a:
make -C ../common/helix CROSS=$(CROSS) clean all

25
platform/common/emu.c
View file

@ -1483,6 +1483,29 @@ void emu_sound_wait(void)
sndout_wait();
}
static void emu_loop_prep(void)
{
static int pal_old = -1;
static int filter_old = -1;
if (currentConfig.CPUclock != plat_target_cpu_clock_get())
plat_target_cpu_clock_set(currentConfig.CPUclock);
if (Pico.m.pal != pal_old) {
plat_target_lcdrate_set(Pico.m.pal);
pal_old = Pico.m.pal;
}
if (currentConfig.filter != filter_old) {
plat_target_hwfilter_set(currentConfig.filter);
filter_old = currentConfig.filter;
}
plat_target_gamma_set(currentConfig.gamma, 0);
pemu_loop_prep();
}
static void skip_frame(int do_audio)
{
PicoSkipFrame = do_audio ? 1 : 2;
@ -1517,7 +1540,7 @@ void emu_loop(void)
PicoCDBufferInit();
plat_video_loop_prepare();
pemu_loop_prep();
emu_loop_prep();
pemu_sound_start();
/* number of ticks per frame */

85
platform/common/menu_pico.c
View file

@ -5,6 +5,7 @@
* This work is licensed under the terms of MAME license.
* See COPYING file in the top-level directory.
*/
#include <stdio.h>
#include <string.h>
#include "emu.h"
@ -16,6 +17,12 @@
#include <pico/pico.h>
#include <pico/patch.h>
#ifdef PANDORA
#define MENU_X2 1
#else
#define MENU_X2 0
#endif
// FIXME
#define REVISION "0"
@ -45,6 +52,8 @@ static unsigned short fname2color(const char *fname)
#include "../libpicofe/menu.c"
static const char *men_dummy[] = { NULL };
/* platform specific options and handlers */
#if defined(__GP2X__)
#include "../gp2x/menu.c"
@ -56,25 +65,48 @@ static unsigned short fname2color(const char *fname)
#define menu_main_plat_draw NULL
#endif
static void make_bg(int no_scale)
{
unsigned short *src = (void *)g_menubg_src_ptr;
int w = g_screen_width, h = g_screen_height;
short *dst;
int x, y;
if (!no_scale && g_menuscreen_w / w >= 2 && g_menuscreen_h / h >= 2)
{
unsigned int t, *d = g_menubg_ptr;
d += (g_menuscreen_h / 2 - h * 2 / 2)
* g_menuscreen_w / 2;
d += (g_menuscreen_w / 2 - w * 2 / 2) / 2;
for (y = 0; y < h; y++, src += w, d += g_menuscreen_w*2/2) {
for (x = 0; x < w; x++) {
t = src[x];
t = ((t & 0xf79e)>>1) - ((t & 0xc618)>>3);
t |= t << 16;
d[x] = d[x + g_menuscreen_w / 2] = t;
}
}
return;
}
if (w > g_menuscreen_w)
w = g_menuscreen_w;
if (h > g_menuscreen_h)
h = g_menuscreen_h;
dst = (short *)g_menubg_ptr +
(g_menuscreen_h / 2 - h / 2) * g_menuscreen_w +
(g_menuscreen_w / 2 - w / 2);
// darken the active framebuffer
for (; h > 0; dst += g_menuscreen_w, src += g_screen_width, h--)
menu_darken_bg(dst, src, w, 1);
}
static void menu_enter(int is_rom_loaded)
{
if (is_rom_loaded)
{
int w = g_screen_width, h = g_screen_height;
short *src, *dst;
if (w > g_menuscreen_w)
w = g_menuscreen_w;
if (h > g_menuscreen_h)
h = g_menuscreen_h;
src = (short *)g_menubg_src_ptr;
dst = (short *)g_menubg_ptr +
(g_menuscreen_h / 2 - h / 2) * g_menuscreen_w +
(g_menuscreen_w / 2 - w / 2);
// darken the active framebuffer
for (; h > 0; dst += g_menuscreen_w, src += g_screen_width, h--)
menu_darken_bg(dst, src, w, 1);
make_bg(0);
}
else
{
@ -105,7 +137,7 @@ static void draw_savestate_bg(int slot)
/* do a frame and fetch menu bg */
pemu_forced_frame(0, 0);
menu_darken_bg(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h, 1);
make_bg(0);
PicoTmpStateRestore(tmp_state);
}
@ -485,12 +517,14 @@ static int menu_loop_adv_options(int id, int keys)
// ------------ gfx options menu ------------
static const char *men_dummy[] = { NULL };
static const char h_gamma[] = "Gamma/brightness adjustment (default 100)";
static menu_entry e_menu_gfx_options[] =
{
mee_enum("Video output mode", MA_OPT_VOUT_MODE, plat_target.vout_method, men_dummy),
mee_enum("Renderer", MA_OPT_RENDERER, currentConfig.renderer, renderer_names),
mee_enum ("Video output mode", MA_OPT_VOUT_MODE, plat_target.vout_method, men_dummy),
mee_enum ("Renderer", MA_OPT_RENDERER, currentConfig.renderer, renderer_names),
mee_enum ("Filter", MA_OPT3_FILTERING, currentConfig.filter, men_dummy),
mee_range_h("Gamma adjustment", MA_OPT3_GAMMA, currentConfig.gamma, 1, 200, h_gamma),
MENU_OPTIONS_GFX
mee_end,
};
@ -775,7 +809,8 @@ static void draw_frame_debug(void)
if (PicoDrawMask & PDRAW_32X_ON) memcpy(layer_str + 26, "32x", 4);
pemu_forced_frame(1, 0);
memcpy(g_menuscreen_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
make_bg(1);
smalltext_out16(4, 1, "build: r" REVISION " "__DATE__ " " __TIME__ " " COMPILER, 0xffff);
smalltext_out16(4, g_menuscreen_h - me_sfont_h, layer_str, 0xffff);
}
@ -803,7 +838,7 @@ static void debug_menu_loop(void)
case 1: draw_frame_debug();
break;
case 2: pemu_forced_frame(1, 0);
menu_darken_bg(g_menuscreen_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h, 0);
make_bg(1);
PDebugShowSpriteStats((unsigned short *)g_menuscreen_ptr + (g_menuscreen_h/2 - 240/2)*g_menuscreen_w +
g_menuscreen_w/2 - 320/2, g_menuscreen_w);
break;
@ -1111,4 +1146,12 @@ void menu_init(void)
e_menu_gfx_options[i].data = plat_target.vout_methods;
me_enable(e_menu_gfx_options, MA_OPT_VOUT_MODE,
plat_target.vout_methods != NULL);
i = me_id2offset(e_menu_gfx_options, MA_OPT3_FILTERING);
e_menu_gfx_options[i].data = plat_target.hwfilters;
me_enable(e_menu_gfx_options, MA_OPT3_FILTERING,
plat_target.hwfilters != NULL);
me_enable(e_menu_gfx_options, MA_OPT3_GAMMA,
plat_target.gamma_set != NULL);
}

2
platform/common/menu_pico.h
View file

@ -65,7 +65,7 @@ typedef enum
MA_OPT3_PRES_FULLSCR,
MA_OPT3_FILTERING,
MA_OPT3_VSYNC,
MA_OPT3_GAMMAA,
MA_OPT3_GAMMA,
MA_OPT3_BLACKLVL,
MA_OPT3_LAYER_X,
MA_OPT3_LAYER_Y,