From: notaz Date: Mon, 24 Jun 2013 22:39:21 +0000 (+0300) Subject: add configure, revive pnd build, unify/refactor things X-Git-Tag: v1.85~89 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4d626658a7a999f48009f408b4a22d280ab80ea;p=picodrive.git add configure, revive pnd build, unify/refactor things --- diff --git a/.gitignore b/.gitignore index 81907193..260eabe6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ cpu/musashi/m68kops.h skin config.cfg srm/ +brm/ +mds/ diff --git a/Makefile b/Makefile index f0fdc5ae..8e1a0309 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,51 @@ -# settings -#use_fbdev = 1 -#fake_in_gp2x = 1 +TARGET ?= PicoDrive +CFLAGS += -Wall -ggdb -falign-functions=2 +CFLAGS += -I. +# FIXME +CFLAGS += -Iplatform/linux/ +ifndef DEBUG +CFLAGS += -O2 -DNDEBUG +endif -use_musashi = 1 -#use_fame = 1 -use_cz80 = 1 -#use_sh2drc = 1 -use_sh2mame = 1 +all: config.mak target_ + +ifndef NO_CONFIG_MAK +ifneq ($(wildcard config.mak),) +config.mak: ./configure + @echo $@ is out-of-date, running configure + @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh +include config.mak +else +config.mak: + @echo "Please run ./configure before running make!" + @exit 1 +endif +else # NO_CONFIG_MAK +config.mak: +endif + +# default settings +ifeq "$(ARCH)" "arm" +use_cyclone ?= 1 +use_drz80 ?= 1 +use_sh2drc ?= 1 + +asm_memory = 1 +#asm_render = 1 +asm_ym2612 = 1 +asm_misc = 1 +asm_cdpico = 1 +asm_cdmemory = 1 +else # if not arm +ifneq "$(ARCH)" "x86_64" +# no 64bit support +use_fame ?= 1 +else +use_musashi ?= 1 +endif +use_cz80 ?= 1 +use_sh2mame ?= 1 +endif #drc_debug = 3 #drc_debug_interp = 1 @@ -14,55 +53,60 @@ use_sh2mame = 1 -include Makefile.local -ifndef ARCH -ARCH = x86 +ifeq "$(use_musashi)" "1" +# due to CPU stop flag acces +asm_cdpico = 0 +asm_cdmemory = 0 endif -CC ?= $(CROSS_COMPILE)gcc - -DEFINES = _UNZIP_SUPPORT IO_STATS IN_EVDEV -CFLAGS += -ggdb -Wall -falign-functions=2 -CFLAGS += -I. -CFLAGS += -Iplatform/linux/ -LDLIBS += -lm -lpng - -# tmp -CFLAGS += `sdl-config --cflags` -DHAVE_SDL -LDLIBS += `sdl-config --libs` - -all: PicoDrive - -# frontend -OBJS += platform/linux/emu.o platform/linux/blit.o \ - platform/linux/log_io.o - # common -OBJS += platform/common/main.o platform/common/emu.o platform/common/menu_pico.o \ - platform/common/config_file.o platform/common/plat_sdl.o \ - platform/common/mp3_dummy.o +OBJS += platform/common/main.o platform/common/emu.o \ + platform/common/menu_pico.o platform/common/config_file.o # libpicofe OBJS += platform/libpicofe/input.o platform/libpicofe/readpng.o \ platform/libpicofe/fonts.o platform/libpicofe/linux/in_evdev.o \ - platform/libpicofe/linux/plat.o platform/libpicofe/linux/sndout_oss.o \ - platform/libpicofe/plat_sdl.o platform/libpicofe/in_sdl.o \ - platform/libpicofe/sndout.o platform/libpicofe/sndout_sdl.o + platform/libpicofe/linux/plat.o -OBJS += platform/libpicofe/plat_dummy.o +# libpicofe - sound +OBJS += platform/libpicofe/sndout.o +ifneq ($(findstring oss,$(SOUND_DRIVERS)),) +platform/libpicofe/sndout.o: CFLAGS += -DHAVE_OSS +OBJS += platform/libpicofe/linux/sndout_oss.o +endif +ifneq ($(findstring alsa,$(SOUND_DRIVERS)),) +platform/libpicofe/sndout.o: CFLAGS += -DHAVE_ALSA +OBJS += platform/libpicofe/linux/sndout_alsa.o +endif +ifneq ($(findstring sdl,$(SOUND_DRIVERS)),) +platform/libpicofe/sndout.o: CFLAGS += -DHAVE_SDL +OBJS += platform/libpicofe/sndout_sdl.o +endif -ifeq "$(use_fbdev)" "1" -DEFINES += FBDEV -OBJS += fbdev.o -else -LDLIBS += -lpthread -LDLIBS += -lX11 +# frontend +OBJS += platform/common/mp3_dummy.o +ifeq "$(PLATFORM)" "generic" +OBJS += platform/linux/emu.o platform/linux/blit.o # FIXME +OBJS += platform/common/plat_sdl.o +OBJS += platform/libpicofe/plat_sdl.o platform/libpicofe/in_sdl.o +OBJS += platform/libpicofe/plat_dummy.o +endif +ifeq "$(PLATFORM)" "pandora" +platform/common/menu_pico.o: CFLAGS += -DPANDORA +OBJS += platform/pandora/plat.o +OBJS += platform/pandora/asm_utils.o +OBJS += platform/common/arm_utils.o +OBJS += platform/libpicofe/linux/fbdev.o +OBJS += platform/libpicofe/linux/xenv.o +OBJS += platform/libpicofe/pandora/plat.o endif ifeq "$(ARCH)" "arm" -OBJS += pico/carthw/svp/stub_arm.o -endif +OBJS += platform/libpicofe/arm_linux.o +OBJS += pico/sound/mix_arm.o +else OBJS += pico/sound/mix.o -OBJS += pico/carthw/svp/compiler.o +endif # zlib OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \ @@ -70,15 +114,42 @@ OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \ # unzip OBJS += unzip/unzip.o unzip/unzip_stream.o + include platform/common/common.mak -CFLAGS += $(addprefix -D,$(DEFINES)) +target_: $(TARGET) clean: - $(RM) PicoDrive $(OBJS) + $(RM) $(TARGET) $(OBJS) -PicoDrive : $(OBJS) - $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=PicoDrive.map -o $@ +$(TARGET): $(OBJS) + $(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$(TARGET).map pprof: platform/linux/pprof.c $(CC) -O2 -ggdb -DPPROF -DPPROF_TOOL -I../../ -I. $^ -o $@ + +# ----------- release ----------- + +VER ?= $(shell head -n 1 platform/common/version.h | \ + sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g') + +ifeq "$(PLATFORM)" "pandora" + +PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh + +/tmp/readme.txt: tools/textfilter platform/base_readme.txt + tools/textfilter platform/base_readme.txt $@ PANDORA + +/tmp/PicoDrive.pxml: platform/pandora/PicoDrive.pxml.template + platform/pandora/make_pxml.sh $^ $@ + +rel: PicoDrive platform/pandora/PicoDrive.run platform/pandora/picorestore \ + pico/carthw.cfg /tmp/readme.txt platform/pandora/skin \ + platform/pandora/PicoDrive.png platform/pandora/PicoDrive_p.png \ + /tmp/PicoDrive.pxml + rm -rf out + mkdir out + cp -r $^ out/ + $(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x out/PicoDrive.pxml -i out/PicoDrive.png -c + +endif diff --git a/configure b/configure new file mode 100755 index 00000000..0e96a993 --- /dev/null +++ b/configure @@ -0,0 +1,364 @@ +#!/bin/sh +# some elements originated from qemu configure +set -e + +TMPC="/tmp/pcsx-conf-${RANDOM}-$$-${RANDOM}.c" +TMPO="/tmp/pcsx-conf-${RANDOM}-$$-${RANDOM}.o" +TMPB="/tmp/pcsx-conf-${RANDOM}-$$-${RANDOM}" +trap "rm -f $TMPC $TMPO $TMPB" EXIT INT QUIT TERM +rm -f config.log + +compile_object() +{ + c="$CC $CFLAGS -c $TMPC -o $TMPO $@" + echo $c >> config.log + $c >> config.log 2>&1 +} + +compile_binary() +{ + c="$CC $CFLAGS $TMPC -o $TMPB $LDFLAGS $MAIN_LDLIBS $@" + echo $c >> config.log + $c >> config.log 2>&1 +} + +check_define() +{ + $CC -E -dD $CFLAGS pico/arm_features.h | grep -q $1 || return 1 + return 0 +} + +# setting options to "yes" or "no" will make that choice default, +# "" means "autodetect". + +platform_list="generic pandora" +platform="generic" +sound_driver_list="oss alsa sdl" +sound_drivers="" +have_armv5="" +have_armv6="" +have_armv7="" +have_arm_neon="" +have_tslib="" +enable_dynarec="yes" +need_sdl="no" +need_xlib="no" +# these are for known platforms +optimize_cortexa8="no" +optimize_arm926ej="no" + +# hardcoded stuff +CC="${CC-${CROSS_COMPILE}gcc}" +CXX="${CXX-${CROSS_COMPILE}g++}" +AS="${AS-${CROSS_COMPILE}as}" +MAIN_LDLIBS="$LDLIBS -lm" +config_mak="config.mak" + +fail() +{ + echo "$@" + exit 1 +} + +# call during arg parsing, so that cmd line can override platform defaults +set_platform() +{ + platform=$1 + case "$platform" in + generic) + ;; + pandora) + sound_drivers="oss alsa" + optimize_cortexa8="yes" + have_arm_neon="yes" + ;; + *) + fail "unsupported platform: $platform" + ;; + esac +} + +for opt do + optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'` || true + case "$opt" in + --help|-h) show_help="yes" + ;; + --platform=*) set_platform "$optarg" + ;; + --sound-drivers=*) sound_drivers="$optarg" + ;; + --enable-neon) have_arm_neon="yes" + ;; + --disable-neon) have_arm_neon="no" + ;; + --disable-dynarec) enable_dynarec="no" + ;; + *) echo "ERROR: unknown option $opt"; show_help="yes" + ;; + esac +done + +if [ "$show_help" = "yes" ]; then + echo "options:" + echo " --help print this message" + echo " --platform=NAME target platform [$platform]" + echo " available: $platform_list" + echo " --sound-drivers=LIST sound output drivers [guessed]" + echo " available: $sound_driver_list" + echo " --enable-neon" + echo " --disable-neon enable/disable ARM NEON optimizations [guessed]" + echo " --disable-dynarec disable dynamic recompiler" + echo " (dynarec is only available and enabled on ARM)" + echo "influential environment variables:" + echo " CROSS_COMPILE CC CXX AS CFLAGS ASFLAGS LDFLAGS LDLIBS" + exit 1 +fi + +# validate selections +if [ "x$sound_drivers" != "x" ]; then + for d in $sound_drivers; do + if ! echo $sound_driver_list | grep -q "\<$d\>"; then + fail "unsupported sound driver: $sound_driver" + fi + done +fi + +if [ "$need_libpicofe" = "yes" ]; then + if ! test -f "frontend/libpicofe/README"; then + fail "libpicofe is missing, please run 'git submodule init && git submodule update'" + fi +fi + +#if [ "$need_warm" = "yes" ]; then +# if ! test -f "frontend/warm/README"; then +# fail "wARM is missing, please run 'git submodule init && git submodule update'" +# fi +#fi + +# basic compiler test +cat > $TMPC < $TMPC < + int main(void) { uncompress(0, 0, 0, 0); } +EOF + compile_binary +} + +check_libpng() +{ + cat > $TMPC < + void main() { png_init_io(0, 0); } +EOF + compile_binary +} + +check_oss() +{ + cat > $TMPC < + #include + void main() { int a=0; ioctl(0, SNDCTL_DSP_SETFMT, &a); } +EOF + compile_binary +} + +check_alsa() +{ + cat > $TMPC < + void main() { snd_pcm_open(0, 0, 0, 0); } +EOF + compile_binary "$@" +} + +check_sdl() +{ + cat > $TMPC < + void main() { SDL_OpenAudio(0, 0); } +EOF + compile_binary "$@" +} + +#MAIN_LDLIBS="$MAIN_LDLIBS -lz" +#check_zlib || fail "please install zlib (libz-dev)" + +MAIN_LDLIBS="-lpng $MAIN_LDLIBS" +check_libpng || fail "please install libpng (libpng-dev)" + +# find what audio support we can compile +if [ "x$sound_drivers" = "x" ]; then + if check_oss; then sound_drivers="$sound_drivers oss"; fi + if check_alsa -lasound; then + sound_drivers="$sound_drivers alsa" + MAIN_LDLIBS="-lasound $MAIN_LDLIBS" + fi + if [ "$need_sdl" = "yes" ] || check_sdl `sdl-config --cflags --libs`; then + sound_drivers="$sound_drivers sdl" + need_sdl="yes" + fi +else + if echo $sound_drivers | grep -q "\"; then + check_oss || fail "oss support is missing" + fi + if echo $sound_drivers | grep -q "\"; then + MAIN_LDLIBS="-lasound $MAIN_LDLIBS" + check_alsa || fail "please install libasound2-dev" + fi +fi + +if [ "$need_sdl" = "yes" ]; then + which sdl-config > /dev/null || \ + fail "sdl-config is missing; please install libsdl (libsdl1.2-dev)" + CFLAGS="$CFLAGS `sdl-config --cflags`" + MAIN_LDLIBS="`sdl-config --libs` $MAIN_LDLIBS" + check_sdl || fail "please install libsdl (libsdl1.2-dev)" +fi + +cat > $TMPC < $config_mak +printf "# Configured with:" >> $config_mak +printf " '%s'" "$0" "$@" >> $config_mak +echo >> $config_mak + +echo "CC = $CC" >> $config_mak +echo "CXX = $CXX" >> $config_mak +echo "AS = $AS" >> $config_mak +echo "CFLAGS += $CFLAGS" >> $config_mak +echo "ASFLAGS += $ASFLAGS" >> $config_mak +echo "LDFLAGS += $LDFLAGS" >> $config_mak +echo "LDLIBS += $MAIN_LDLIBS" >> $config_mak +echo >> $config_mak + +echo "ARCH = $ARCH" >> $config_mak +echo "PLATFORM = $platform" >> $config_mak +echo "SOUND_DRIVERS = $sound_drivers" >> $config_mak +if [ "$have_arm_neon" = "yes" ]; then + echo "HAVE_NEON = 1" >> $config_mak +fi +if [ "$enable_dynarec" = "yes" ]; then + echo "USE_DYNAREC = 1" >> $config_mak +fi + +# use pandora's skin (for now) +test -e skin || ln -s platform/pandora/skin skin + +# vim:shiftwidth=2:expandtab diff --git a/cpu/cyclone b/cpu/cyclone index a6905b4d..194104e3 160000 --- a/cpu/cyclone +++ b/cpu/cyclone @@ -1 +1 @@ -Subproject commit a6905b4de17f4d772c7742065f2863b77ddf0b31 +Subproject commit 194104e334f7c26015b99c862486a73be0d80162 diff --git a/cpu/sh2/compiler.c b/cpu/sh2/compiler.c index a79f510f..43f2bc39 100644 --- a/cpu/sh2/compiler.c +++ b/cpu/sh2/compiler.c @@ -159,7 +159,7 @@ typedef struct { // note: reg_temp[] must have at least the amount of // registers used by handlers in worst case (currently 4) -#ifdef ARM +#ifdef __arm__ #include "../drc/emit_arm.c" static const int reg_map_g2h[] = { diff --git a/pico/arm_features.h b/pico/arm_features.h new file mode 100644 index 00000000..fdec5229 --- /dev/null +++ b/pico/arm_features.h @@ -0,0 +1,52 @@ +#ifndef __ARM_FEATURES_H__ +#define __ARM_FEATURES_H__ + +#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ + || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ + || defined(__ARM_ARCH_7EM__) + +#define HAVE_ARMV7 +#define HAVE_ARMV6 +#define HAVE_ARMV5 + +#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ + || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) + +#define HAVE_ARMV6 +#define HAVE_ARMV5 + +#elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5E__) \ + || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__) + +#define HAVE_ARMV5 + +#endif + +/* no need for HAVE_NEON - GCC defines __ARM_NEON__ consistently */ + +/* global function/external symbol */ +#ifndef __MACH__ +#define ESYM(name) name + +#define FUNCTION(name) \ + .globl name; \ + .type name, %function; \ + name + +#define EXTRA_UNSAVED_REGS + +#else +#define ESYM(name) _##name + +#define FUNCTION(name) \ + .globl ESYM(name); \ + name: \ + ESYM(name) + +// r7 is preserved, but add it for EABI alignment.. +#define EXTRA_UNSAVED_REGS r7, r9, + +#endif + +#endif /* __ARM_FEATURES_H__ */ diff --git a/pico/carthw/svp/compiler.c b/pico/carthw/svp/compiler.c index e7d5b9e8..758d9261 100644 --- a/pico/carthw/svp/compiler.c +++ b/pico/carthw/svp/compiler.c @@ -31,7 +31,7 @@ extern ssp1601_t *ssp; #define SSP_FLAG_Z (1<<0xd) #define SSP_FLAG_N (1<<0xf) -#ifndef ARM +#ifndef __arm__ //#define DUMP_BLOCK 0x0c9a void ssp_drc_next(void){} void ssp_drc_next_patch(void){} @@ -1794,7 +1794,7 @@ void *ssp_translate_block(int pc) exit(0); #endif -#ifdef ARM +#ifdef __arm__ cache_flush_d_inval_i(tcache, tcache_ptr); #endif @@ -1839,7 +1839,7 @@ int ssp1601_dyn_startup(void) PicoLoadStateHook = ssp1601_state_load; n_in_ops = 0; -#ifdef ARM +#ifdef __arm__ // hle'd blocks ssp_block_table[0x800/2] = (void *) ssp_hle_800; ssp_block_table[0x902/2] = (void *) ssp_hle_902; @@ -1879,7 +1879,7 @@ void ssp1601_dyn_run(int cycles) #ifdef DUMP_BLOCK ssp_translate_block(DUMP_BLOCK >> 1); #endif -#ifdef ARM +#ifdef __arm__ ssp_drc_entry(cycles); #endif } diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c index d09ebeb2..38e7a4f5 100644 --- a/pico/carthw/svp/svp.c +++ b/pico/carthw/svp/svp.c @@ -56,7 +56,7 @@ static void PicoSVPReset(void) memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800); ssp1601_reset(&svp->ssp1601); -#ifndef PSP +#ifdef __arm__ if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready) ssp1601_dyn_reset(&svp->ssp1601); #endif @@ -66,7 +66,7 @@ static void PicoSVPReset(void) static void PicoSVPLine(void) { int count = 1; -#if defined(ARM) || defined(PSP) +#if defined(__arm__) || defined(PSP) // performance hack static int delay_lines = 0; delay_lines++; @@ -76,7 +76,7 @@ static void PicoSVPLine(void) delay_lines = 0; #endif -#ifndef PSP +#ifdef __arm__ if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready) ssp1601_dyn_run(PicoSVPCycles * count); else @@ -118,7 +118,7 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig void PicoSVPInit(void) { -#ifndef PSP +#ifdef __arm__ // this is to unmap tcache and make // mem available for large ROMs, MCD, etc. drc_cmn_cleanup(); @@ -127,7 +127,7 @@ void PicoSVPInit(void) static void PicoSVPExit(void) { -#ifndef PSP +#ifdef __arm__ ssp1601_dyn_exit(); #endif } @@ -150,7 +150,7 @@ void PicoSVPStartup(void) // init SVP compiler svp_dyn_ready = 0; -#ifndef PSP +#ifdef __arm__ if (PicoOpt & POPT_EN_SVP_DRC) { if (ssp1601_dyn_startup()) return; diff --git a/pico/pico_int.h b/pico/pico_int.h index 5975c111..3e4083f8 100644 --- a/pico/pico_int.h +++ b/pico/pico_int.h @@ -35,7 +35,7 @@ extern "C" { // ----------------------- 68000 CPU ----------------------- #ifdef EMU_C68K -#include "../cpu/Cyclone/Cyclone.h" +#include "../cpu/cyclone/Cyclone.h" extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k; #define SekCyclesLeftNoMCD PicoCpuCM68k.cycles // cycles left for this run #define SekCyclesLeft \ @@ -46,7 +46,7 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k; #define SekEndTimesliceS68k(after) PicoCpuCS68k.cycles=after #define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase) #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase) -#define SekDar(x) PicoCpuCM68k.d[x] +#define SekDar(x) (x < 8 ? PicoCpuCM68k.d[x] : PicoCpuCM68k.a[x - 8]) #define SekSr CycloneGetSr(&PicoCpuCM68k) #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } } #define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } } @@ -73,7 +73,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k; #define SekEndTimesliceS68k(after) PicoCpuFS68k.io_cycle_counter=after #define SekPc fm68k_get_pc(&PicoCpuFM68k) #define SekPcS68k fm68k_get_pc(&PicoCpuFS68k) -#define SekDar(x) PicoCpuFM68k.dreg[x].D +#define SekDar(x) (x < 8 ? PicoCpuFM68k.dreg[x].D : PicoCpuFM68k.areg[x - 8].D) #define SekSr PicoCpuFM68k.sr #define SekSetStop(x) { \ PicoCpuFM68k.execinfo &= ~FM68K_HALTED; \ diff --git a/pico/sek.c b/pico/sek.c index f42e2d97..39168a9a 100644 --- a/pico/sek.c +++ b/pico/sek.c @@ -261,7 +261,7 @@ PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub) /* idle loop detection, not to be used in CD mode */ #ifdef EMU_C68K -#include "cpu/Cyclone/tools/idle.h" +#include "cpu/cyclone/tools/idle.h" #endif static unsigned short **idledet_ptrs = NULL; diff --git a/platform/common/common.mak b/platform/common/common.mak index 7d2599e7..ae145b2e 100644 --- a/platform/common/common.mak +++ b/platform/common/common.mak @@ -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\"' diff --git a/platform/common/common_arm.mak b/platform/common/common_arm.mak deleted file mode 100644 index c14df933..00000000 --- a/platform/common/common_arm.mak +++ /dev/null @@ -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 - diff --git a/platform/common/emu.c b/platform/common/emu.c index 36539c65..8eda13a8 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -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 */ diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c index b6a8b044..90d058ac 100644 --- a/platform/common/menu_pico.c +++ b/platform/common/menu_pico.c @@ -5,6 +5,7 @@ * This work is licensed under the terms of MAME license. * See COPYING file in the top-level directory. */ +#include #include #include "emu.h" @@ -16,6 +17,12 @@ #include #include +#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); } diff --git a/platform/common/menu_pico.h b/platform/common/menu_pico.h index 4302ded9..c609e836 100644 --- a/platform/common/menu_pico.h +++ b/platform/common/menu_pico.h @@ -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, diff --git a/platform/libpicofe b/platform/libpicofe index 26d3ca0d..b57ed12e 160000 --- a/platform/libpicofe +++ b/platform/libpicofe @@ -1 +1 @@ -Subproject commit 26d3ca0d29e87a14943d29fcafc93da753df60cd +Subproject commit b57ed12e39ff8b0b678d18e5a729ea54ffb0542a diff --git a/platform/linux/host_dasm.c b/platform/linux/host_dasm.c index 3d1b116d..5117a240 100644 --- a/platform/linux/host_dasm.c +++ b/platform/linux/host_dasm.c @@ -18,7 +18,7 @@ extern char **g_argv; static struct disassemble_info di; -#ifdef ARM +#ifdef __arm__ #define print_insn_func print_insn_little_arm #define BFD_ARCH bfd_arch_arm #define BFD_MACH bfd_mach_arm_4T diff --git a/platform/linux/port_config.h b/platform/linux/port_config.h index 71543f31..e69c6297 100644 --- a/platform/linux/port_config.h +++ b/platform/linux/port_config.h @@ -35,7 +35,6 @@ // platform #define PATH_SEP "/" #define PATH_SEP_C '/' -#define MENU_X2 0 #endif //PORT_CONFIG_H diff --git a/platform/pandora/Makefile b/platform/pandora/Makefile deleted file mode 100644 index 2cae5d49..00000000 --- a/platform/pandora/Makefile +++ /dev/null @@ -1,107 +0,0 @@ -#export CROSS = arm-none-linux-gnueabi- -CROSS ?= $(CROSS_COMPILE) -LIBROOT = /home/notaz/dev/pnd/libroot -PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh - -# settings -use_cyclone = 1 -#use_musashi = 1 -use_drz80 = 1 -use_sh2drc = 1 -#use_sh2mame = 1 - -asm_memory = 1 -asm_render = 1 -asm_ym2612 = 1 -asm_misc = 1 -asm_cdpico = 1 -asm_cdmemory = 1 -#profile = 1 -#drc_debug = 3 - --include Makefile.local - -ifeq "$(use_musashi)" "1" -# due to CPU stop flag acces -asm_cdpico = 0 -asm_cdmemory = 0 -endif - -ARCH = arm -DEFINES += ARM PANDORA IN_EVDEV -CFLAGS += -I../.. -I. -I$(LIBROOT)/include -CFLAGS += -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a -ifeq ($(DEBUG),) -CFLAGS += -O2 -fomit-frame-pointer -fstrict-aliasing -ffast-math -endif -LDFLAGS += -L$(LIBROOT)/lib -Wl,-Bstatic -lpng -Wl,-Bdynamic -lm -lpthread -ldl -ASFLAGS = -mcpu=cortex-a8 -CC = $(CROSS)gcc -STRIP = $(CROSS)strip -AS = $(CROSS)as -LD = $(CROSS)ld -OBJCOPY = $(CROSS)objcopy - -# frontend -OBJS += plat.o asm_utils.o - -# common -OBJS += platform/common/emu.o platform/common/menu_pico.o platform/common/fonts.o platform/common/config.o \ - platform/common/arm_utils.o platform/common/mp3_helix.o platform/common/arm_linux.o \ - platform/common/readpng.o platform/common/input.o platform/common/main.o platform/common/mp3.o \ - platform/linux/fbdev.o platform/linux/in_evdev.o platform/linux/sndout_oss.o \ - platform/linux/plat.o platform/linux/xenv.o - -# ARM stuff -OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o -OBJS += pico/sound/mix_arm.o - -# zlib -OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \ - zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o -# unzip -OBJS += unzip/unzip.o unzip/unzip_stream.o - -vpath %.c = ../.. -vpath %.s = ../.. -vpath %.S = ../.. -DIRS += platform/linux zlib unzip - -all: mkdirs PicoDrive picorestore - -include ../common/common.mak -include ../common/common_arm.mak -include ../common/revision.mak - -CFLAGS += $(addprefix -D,$(DEFINES)) - -PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a - @echo ">>>" $@ - $(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=PicoDrive.map -ifeq ($(DEBUG),) - $(STRIP) $@ -endif - -clean: tidy - $(RM) PicoDrive -tidy: - $(RM) $(OBJS) - -readme.txt: ../../tools/textfilter ../base_readme.txt - ../../tools/textfilter ../base_readme.txt $@ PANDORA - -PicoDrive.pxml: PicoDrive.pxml.template - ./make_pxml.sh PicoDrive.pxml.template PicoDrive.pxml - -platform/common/menu_pico.o: platform/common/menu.c menu.c - -# ----------- release ----------- - -VER ?= $(shell head -n 1 version.h | sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g') - -rel: PicoDrive PicoDrive.run picorestore ../../pico/carthw.cfg readme.txt \ - skin PicoDrive.png PicoDrive_p.png PicoDrive.pxml - rm -rf out - mkdir out - cp -r $^ out/ - $(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x PicoDrive.pxml -i PicoDrive.png -c diff --git a/platform/pandora/menu.c b/platform/pandora/menu.c index be822cfc..f591ec14 100644 --- a/platform/pandora/menu.c +++ b/platform/pandora/menu.c @@ -5,8 +5,6 @@ static const char h_scaler[] = "Scalers for 40 and 32 column modes\n" "(320 and 256 pixel wide horizontal)"; static const char h_cscaler[] = "Displays the scaler layer, you can resize it\n" "using d-pad or move it using R+d-pad"; -static const char *men_dummy[] = { NULL }; -char **pnd_filter_list; static int menu_loop_cscaler(int id, int keys) { @@ -19,12 +17,13 @@ static int menu_loop_cscaler(int id, int keys) for (;;) { - menu_draw_begin(0); + menu_draw_begin(0, 1); 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); menu_draw_end(); - inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_R|PBTN_MOK|PBTN_MBACK, 40); + inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT + |PBTN_R|PBTN_MOK|PBTN_MBACK, NULL, 40); if (inp & PBTN_UP) g_layer_cy--; if (inp & PBTN_DOWN) g_layer_cy++; if (inp & PBTN_LEFT) g_layer_cx--; @@ -61,7 +60,6 @@ static int menu_loop_cscaler(int id, int keys) #define MENU_OPTIONS_GFX \ mee_enum_h ("Scaler", MA_OPT_SCALING, currentConfig.scaling, \ men_scaler, h_scaler), \ - mee_enum ("Filter", MA_OPT3_FILTERING, currentConfig.filter, men_dummy), \ mee_onoff ("Vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, EOPT_VSYNC), \ mee_cust_h ("Setup custom scaler", MA_NONE, menu_loop_cscaler, NULL, h_cscaler), \ mee_range_hide("layer_x", MA_OPT3_LAYER_X, g_layer_cx, 0, 640), \ @@ -75,70 +73,13 @@ static int menu_loop_cscaler(int id, int keys) #define menu_main_plat_draw NULL -#include -#include - static menu_entry e_menu_gfx_options[]; static menu_entry e_menu_options[]; static menu_entry e_menu_keyconfig[]; void pnd_menu_init(void) { - struct dirent *ent; - int i, count = 0; - char **mfilters; - char buff[64], *p; - DIR *dir; - - dir = opendir("/etc/pandora/conf/dss_fir"); - if (dir == NULL) { - perror("filter opendir"); - return; - } - - while (1) { - errno = 0; - ent = readdir(dir); - if (ent == NULL) { - if (errno != 0) - perror("readdir"); - break; - } - p = strstr(ent->d_name, "_up"); - if (p != NULL && (p[3] == 0 || !strcmp(p + 3, "_h"))) - count++; - } - - if (count == 0) - return; - - mfilters = calloc(count + 1, sizeof(mfilters[0])); - if (mfilters == NULL) - return; - - rewinddir(dir); - for (i = 0; (ent = readdir(dir)); ) { - size_t len; - - p = strstr(ent->d_name, "_up"); - if (p == NULL || (p[3] != 0 && strcmp(p + 3, "_h"))) - continue; - - len = p - ent->d_name; - if (len > sizeof(buff) - 1) - continue; - - strncpy(buff, ent->d_name, len); - buff[len] = 0; - mfilters[i] = strdup(buff); - if (mfilters[i] != NULL) - i++; - } - closedir(dir); - - i = me_id2offset(e_menu_gfx_options, MA_OPT3_FILTERING); - e_menu_gfx_options[i].data = (void *)mfilters; - pnd_filter_list = mfilters; + int i; i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS); e_menu_options[i].name = "Max CPU clock"; diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c index 9863a326..49b8da6b 100644 --- a/platform/pandora/plat.c +++ b/platform/pandora/plat.c @@ -15,23 +15,24 @@ #include #include #include +#include #include "../common/emu.h" -#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 "../linux/xenv.h" +#include "../common/input_pico.h" +#include "../common/version.h" +#include "../libpicofe/input.h" +#include "../libpicofe/menu.h" +#include "../libpicofe/plat.h" +#include "../libpicofe/linux/in_evdev.h" +#include "../libpicofe/linux/sndout_oss.h" +#include "../libpicofe/linux/fbdev.h" +#include "../libpicofe/linux/xenv.h" #include "plat.h" #include "asm_utils.h" -#include "version.h" #include -#include - static struct vout_fbdev *main_fb, *layer_fb; // g_layer_* - in use, g_layer_c* - configured custom int g_layer_cx, g_layer_cy, g_layer_cw, g_layer_ch; @@ -40,8 +41,7 @@ static int g_layer_w = 320, g_layer_h = 240; static int g_osd_fps_x, g_osd_y, doing_bg_frame; static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts"; -static short __attribute__((aligned(4))) sndBuffer[2*44100/50]; -static unsigned char __attribute__((aligned(4))) fb_copy[g_screen_width * g_screen_height * 2]; +static unsigned char __attribute__((aligned(4))) fb_copy[320 * 240 * 2]; static void *temp_frame; unsigned char *PicoDraw2FB; const char *renderer_names[] = { NULL }; @@ -64,42 +64,29 @@ static const char * const pandora_gpio_keys[KEY_MAX + 1] = { [KEY_MENU] = "Pandora", }; -struct in_default_bind in_evdev_defbinds[] = -{ - /* MXYZ SACB RLDU */ - { KEY_UP, IN_BINDTYPE_PLAYER12, 0 }, - { KEY_DOWN, IN_BINDTYPE_PLAYER12, 1 }, - { KEY_LEFT, IN_BINDTYPE_PLAYER12, 2 }, - { KEY_RIGHT, IN_BINDTYPE_PLAYER12, 3 }, - { KEY_S, IN_BINDTYPE_PLAYER12, 4 }, /* B */ - { KEY_D, IN_BINDTYPE_PLAYER12, 5 }, /* C */ - { KEY_A, IN_BINDTYPE_PLAYER12, 6 }, /* A */ - { KEY_ENTER, IN_BINDTYPE_PLAYER12, 7 }, +static struct in_default_bind in_evdev_defbinds[] = +{ + { KEY_UP, IN_BINDTYPE_PLAYER12, GBTN_UP }, + { KEY_DOWN, IN_BINDTYPE_PLAYER12, GBTN_DOWN }, + { KEY_LEFT, IN_BINDTYPE_PLAYER12, GBTN_LEFT }, + { KEY_RIGHT, IN_BINDTYPE_PLAYER12, GBTN_RIGHT }, + { KEY_A, IN_BINDTYPE_PLAYER12, GBTN_A }, + { KEY_S, IN_BINDTYPE_PLAYER12, GBTN_B }, + { KEY_D, IN_BINDTYPE_PLAYER12, GBTN_C }, + { KEY_ENTER, IN_BINDTYPE_PLAYER12, GBTN_START }, { KEY_BACKSLASH, IN_BINDTYPE_EMU, PEVB_MENU }, { KEY_SPACE, IN_BINDTYPE_EMU, PEVB_MENU }, /* Pandora */ - { KEY_PAGEDOWN, IN_BINDTYPE_PLAYER12, 4 }, - { KEY_END, IN_BINDTYPE_PLAYER12, 5 }, - { KEY_HOME, IN_BINDTYPE_PLAYER12, 6 }, - { KEY_LEFTALT, IN_BINDTYPE_PLAYER12, 7 }, + { KEY_HOME, IN_BINDTYPE_PLAYER12, GBTN_A }, + { KEY_PAGEDOWN, IN_BINDTYPE_PLAYER12, GBTN_B }, + { KEY_END, IN_BINDTYPE_PLAYER12, GBTN_C }, + { KEY_LEFTALT, IN_BINDTYPE_PLAYER12, GBTN_START }, { KEY_RIGHTSHIFT,IN_BINDTYPE_EMU, PEVB_STATE_SAVE }, { KEY_RIGHTCTRL, IN_BINDTYPE_EMU, PEVB_STATE_LOAD }, { KEY_LEFTCTRL, IN_BINDTYPE_EMU, PEVB_MENU }, { 0, 0, 0 } }; -static int get_cpu_clock(void) -{ - FILE *f; - int ret = 0; - f = fopen("/proc/pandora/cpu_mhz_max", "r"); - if (f) { - fscanf(f, "%d", &ret); - fclose(f); - } - return ret; -} - void pemu_prep_defconfig(void) { defaultConfig.EmuOpt |= EOPT_VSYNC|EOPT_16BPP; @@ -109,7 +96,7 @@ void pemu_prep_defconfig(void) void pemu_validate_config(void) { - currentConfig.CPUclock = get_cpu_clock(); + currentConfig.CPUclock = plat_target_cpu_clock_get(); } static void osd_text(int x, int y, const char *text) @@ -175,8 +162,7 @@ void plat_video_flip(void) g_screen_ptr = vout_fbdev_flip(layer_fb); // XXX: drain OS event queue here, maybe we'll actually use it someday.. - int dummy; - xenv_update(&dummy); + xenv_update(NULL, NULL, NULL, NULL); } void plat_video_toggle_renderer(int change, int is_menu) @@ -196,6 +182,10 @@ void plat_video_menu_end(void) g_menuscreen_ptr = vout_fbdev_flip(main_fb); } +void plat_video_menu_leave(void) +{ +} + void plat_video_wait_vsync(void) { vout_fbdev_wait_vsync(main_fb); @@ -222,53 +212,6 @@ void plat_status_msg_busy_first(const char *msg) void plat_update_volume(int has_changed, int is_up) { - static int prev_frame = 0, wait_frames = 0; - int vol = currentConfig.volume; - - if (has_changed) - { - if (is_up) { - if (vol < 99) vol++; - } else { - if (vol > 0) vol--; - } - wait_frames = 0; - sndout_oss_setvol(vol, vol); - currentConfig.volume = vol; - emu_status_msg("VOL: %02i", vol); - prev_frame = Pico.m.frame_count; - } -} - -static void make_bg(int no_scale) -{ - unsigned short *s = (void *)fb_copy; - int x, y; - - memset32(g_menubg_src_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2 / 4); - - if (!no_scale && g_menuscreen_w >= 640 && g_menuscreen_h >= 480) { - unsigned int t, *d = g_menubg_src_ptr; - d += (g_menuscreen_h / 2 - 480 / 2) * g_menuscreen_w / 2; - d += (g_menuscreen_w / 2 - 640 / 2) / 2; - for (y = 0; y < 240; y++, s += 320, d += g_menuscreen_w*2/2) { - for (x = 0; x < 320; x++) { - t = s[x]; - t |= t << 16; - d[x] = d[x + g_menuscreen_w / 2] = t; - } - } - return; - } - - if (g_menuscreen_w >= 320 && g_menuscreen_h >= 240) { - unsigned short *d = g_menubg_src_ptr; - d += (g_menuscreen_h / 2 - 240 / 2) * g_menuscreen_w; - d += (g_menuscreen_w / 2 - 320 / 2); - for (y = 0; y < 240; y++, s += 320, d += g_menuscreen_w) - memcpy(d, s, 320*2); - return; - } } void pemu_forced_frame(int no_scale, int do_emu) @@ -278,55 +221,13 @@ void pemu_forced_frame(int no_scale, int do_emu) doing_bg_frame = 0; // making a copy because enabling the layer clears it's mem - memcpy32((void *)fb_copy, g_screen_ptr, sizeof(fb_copy) / 4); - make_bg(no_scale); -} - -static void oss_write_nonblocking(int len) -{ - // sndout_oss_can_write() is not reliable, only use with no_frmlimit - if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len)) - return; - - sndout_oss_write_nb(PsndOut, len); + memcpy((void *)fb_copy, g_screen_ptr, sizeof(fb_copy)); + g_menubg_src_ptr = fb_copy; } void pemu_sound_start(void) { - PsndOut = NULL; - - if (currentConfig.EmuOpt & EOPT_EN_SOUND) - { - int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0; - - PsndRerate(Pico.m.frame_count ? 1 : 0); - - /* - * for 44k stereo, we do 1470 samples/emu_frame - * OMAP driver does power of 2 buffers, so we need at least 4K buffer. - * The most we can lag is 1K samples, size of OMAP's McBSP FIFO, - * with 2K sample buffer we might sometimes lag more than that, - * thus causing underflows. - */ - printf("starting audio: %i len: %i stereo: %i, pal: %i\n", - PsndRate, PsndLen, is_stereo, Pico.m.pal); - sndout_oss_start(PsndRate, is_stereo, 2); - //sndout_oss_setvol(currentConfig.volume, currentConfig.volume); - PicoWriteSound = oss_write_nonblocking; - plat_update_volume(0, 0); - memset(sndBuffer, 0, sizeof(sndBuffer)); - PsndOut = sndBuffer; - } -} - -void pemu_sound_stop(void) -{ - sndout_oss_stop(); -} - -void pemu_sound_wait(void) -{ - // don't need to do anything, writes will block by themselves + emu_sound_start(); } void plat_debug_cat(char *str) @@ -395,29 +296,10 @@ void pnd_restore_layer_data(void) if ((t[0] | t[5] | t[13]) == 0) memset32((void *)fb_copy, 0x07000700, sizeof(fb_copy) / 4); - memcpy32(g_screen_ptr, (void *)fb_copy, 320*240*2 / 4); + memcpy(g_screen_ptr, (void *)fb_copy, 320*240*2); plat_video_flip(); } -static void apply_filter(int which) -{ - char buf[128]; - int i; - - if (pnd_filter_list == NULL) - return; - - for (i = 0; i < which; i++) - if (pnd_filter_list[i] == NULL) - return; - - if (pnd_filter_list[i] == NULL) - return; - - snprintf(buf, sizeof(buf), "%s/op_videofir.sh %s", pnd_script_base, pnd_filter_list[i]); - system(buf); -} - void emu_video_mode_change(int start_line, int line_count, int is_32cols) { int fb_w = 320, fb_h = 240, fb_left = 0, fb_right = 0, fb_top = 0, fb_bottom = 0; @@ -480,47 +362,24 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols) plat_video_flip(); } -void pemu_loop_prep(void) +void plat_video_loop_prepare(void) { - static int pal_old = -1; - static int filter_old = -1; - char buf[128]; - - if (currentConfig.CPUclock != get_cpu_clock()) { - snprintf(buf, sizeof(buf), "unset DISPLAY; echo y | %s/op_cpuspeed.sh %d", - pnd_script_base, currentConfig.CPUclock); - system(buf); - } - - if (Pico.m.pal != pal_old) { - snprintf(buf, sizeof(buf), "%s/op_lcdrate.sh %d", - pnd_script_base, Pico.m.pal ? 50 : 60); - system(buf); - pal_old = Pico.m.pal; - } - - if (currentConfig.filter != filter_old) { - apply_filter(currentConfig.filter); - filter_old = currentConfig.filter; - } - // make sure there is no junk left behind the layer - memset32(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2 / 4); + memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2); g_menuscreen_ptr = vout_fbdev_flip(main_fb); // emu_video_mode_change will call pnd_setup_layer() +} +void pemu_loop_prep(void) +{ // dirty buffers better go now than during gameplay sync(); sleep(0); - - pemu_sound_start(); } void pemu_loop_end(void) { - pemu_sound_stop(); - /* do one more frame for menu bg */ pemu_forced_frame(0, 1); @@ -582,7 +441,7 @@ void plat_init(void) exit(1); } - xenv_init(); + xenv_init(NULL, "PicoDrive " VERSION); w = h = 0; main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2); @@ -617,11 +476,14 @@ void plat_init(void) g_menubg_src_ptr = temp_frame; PicoDraw2FB = temp_frame; - 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)); + in_evdev_init(in_evdev_defbinds); + in_probe(); + plat_target_setup_input(); + + sndout_oss_frag_frames = 2; + return; fail1: @@ -633,7 +495,6 @@ fail0: void plat_finish(void) { - sndout_oss_exit(); vout_fbdev_finish(main_fb); xenv_finish(); diff --git a/platform/pandora/plat.h b/platform/pandora/plat.h index 6cff3da2..8e6816ad 100644 --- a/platform/pandora/plat.h +++ b/platform/pandora/plat.h @@ -1,5 +1,4 @@ -extern char **pnd_filter_list; extern int g_layer_cx, g_layer_cy; extern int g_layer_cw, g_layer_ch;