frontend: show C64x option

diff --git a/Makefile b/Makefile
index c15f6ff..b23d33e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ endif
 ifeq "$(HAVE_C64_TOOLS)" "1"
 plugins/dfsound/spu.o: CFLAGS += -DC64X_DSP
 plugins/dfsound/spu.o: plugins/dfsound/spu_c64x.c
 ifeq "$(HAVE_C64_TOOLS)" "1"
 plugins/dfsound/spu.o: CFLAGS += -DC64X_DSP
 plugins/dfsound/spu.o: plugins/dfsound/spu_c64x.c

+frontend/menu.o: CFLAGS += -DC64X_DSP

 endif
 ifneq ($(findstring oss,$(SOUND_DRIVERS)),)
 plugins/dfsound/out.o: CFLAGS += -DHAVE_OSS
 endif
 ifneq ($(findstring oss,$(SOUND_DRIVERS)),)
 plugins/dfsound/out.o: CFLAGS += -DHAVE_OSS


@@ -292,7 +293,7 @@ endif
 ifeq "$(PLATFORM)" "pandora"
 PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
 ifeq "$(PLATFORM)" "pandora"
 PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 

-rel: pcsx $(PLUGINS) \
+rel: pcsx plugins/dfsound/pcsxr_spu_area3.out $(PLUGINS) \

                frontend/pandora/pcsx.sh frontend/pandora/pcsx.pxml.templ frontend/pandora/pcsx.png \
                frontend/pandora/picorestore frontend/pandora/skin readme.txt COPYING
        rm -rf out
                frontend/pandora/pcsx.sh frontend/pandora/pcsx.pxml.templ frontend/pandora/pcsx.png \
                frontend/pandora/picorestore frontend/pandora/skin readme.txt COPYING
        rm -rf out

diff --git a/frontend/menu.c b/frontend/menu.c
index a1edac2..675ec26 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1606,7 +1606,11 @@ static menu_entry e_menu_options[] =
        mee_onoff     ("Show FPS",                 0, g_opts, OPT_SHOWFPS),
        mee_enum      ("Region",                   0, region, men_region),
        mee_range     ("CPU clock",                MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
        mee_onoff     ("Show FPS",                 0, g_opts, OPT_SHOWFPS),
        mee_enum      ("Region",                   0, region, men_region),
        mee_range     ("CPU clock",                MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),

+#ifdef C64X_DSP
+       mee_onoff     ("Use C64x DSP for sound",   MA_OPT_SPU_THREAD, spu_config.iUseThread, 1),
+#else

        mee_onoff     ("Threaded SPU",             MA_OPT_SPU_THREAD, spu_config.iUseThread, 1),
        mee_onoff     ("Threaded SPU",             MA_OPT_SPU_THREAD, spu_config.iUseThread, 1),

+#endif

        mee_handler_id("[Display]",                MA_OPT_DISP_OPTS, menu_loop_gfx_options),
        mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
        mee_handler   ("[Advanced]",               menu_loop_adv_options),
        mee_handler_id("[Display]",                MA_OPT_DISP_OPTS, menu_loop_gfx_options),
        mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
        mee_handler   ("[Advanced]",               menu_loop_adv_options),


@@ -1619,10 +1623,9 @@ static menu_entry e_menu_options[] =
 static int menu_loop_options(int id, int keys)
 {
        static int sel = 0;
 static int menu_loop_options(int id, int keys)
 {
        static int sel = 0;

-       int i;

 
 

-       i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
-       e_menu_options[i].enabled = cpu_clock_st > 0 ? 1 : 0;
+       me_enable(e_menu_options, MA_OPT_CPU_CLOCKS, cpu_clock_st > 0);
+       me_enable(e_menu_options, MA_OPT_SPU_THREAD, spu_config.iThreadAvail);

        me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
 
        me_loop(e_menu_options, &sel);
        me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
 
        me_loop(e_menu_options, &sel);

diff --git a/frontend/pandora/pcsx.sh b/frontend/pandora/pcsx.sh
index a69ca31..710f641 100755 (executable)
--- a/frontend/pandora/pcsx.sh
+++ b/frontend/pandora/pcsx.sh
@@ -10,6 +10,9 @@ nub1mode=`cat /proc/pandora/nub1/mode`
 # no big deal if this fails, only performance loss
 sudo -n /usr/pandora/scripts/op_hugetlb.sh 24
 
 # no big deal if this fails, only performance loss
 sudo -n /usr/pandora/scripts/op_hugetlb.sh 24
 

+# C64x DSP for SPU
+sudo -n /usr/pandora/scripts/op_dsp_c64.sh
+

 ./pcsx "$@"
 
 # restore stuff if pcsx crashes
 ./pcsx "$@"
 
 # restore stuff if pcsx crashes