From: notaz Date: Sat, 20 Dec 2014 19:29:36 +0000 (+0200) Subject: Merge branch 'libretro' into upstream X-Git-Tag: r24l~893^2 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=7931825ed8ef51dab3e37475d8126103ebc9fb6f;hp=3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666 Merge branch 'libretro' into upstream Syncs upstream and libretro trees, leaving out NEON_PC change. --- diff --git a/Makefile b/Makefile index 9568d0ea..58de43a4 100644 --- a/Makefile +++ b/Makefile @@ -107,15 +107,9 @@ endif # builtin gpu OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o ifeq "$(BUILTIN_GPU)" "neon" -ifeq "$(HAVE_NEON)" "1" -plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP -plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o -else -plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP +plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c -OBJS += plugins/gpu_neon/psx_gpu_if.o -endif endif ifeq "$(BUILTIN_GPU)" "peops" # note: code is not safe for strict-aliasing? (Castlevania problems) diff --git a/Makefile.libretro b/Makefile.libretro index 6a90717d..ae95639f 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -1,8 +1,5 @@ # Makefile for PCSX ReARMed (libretro) -DEBUG=1 -MMAP_WIN32=0 - ifeq ($(platform),) platform = unix ifeq ($(shell uname -a),) @@ -24,21 +21,19 @@ CFLAGS ?= TARGET_NAME := pcsx_rearmed +MMAP_WIN32=0 + # Unix ifeq ($(platform), unix) TARGET := $(TARGET_NAME)_libretro.so fpic := -fPIC SHARED := -shared -Wl,--version-script=libretro/link.T - BUILTIN_GPU = neon - CFLAGS += -DNEON_PC # OS X else ifeq ($(platform), osx) TARGET := $(TARGET_NAME)_libretro.dylib fpic := -fPIC SHARED := -dynamiclib - BUILTIN_GPU = neon - CFLAGS += -DNEON_PC OSXVER = `sw_vers -productVersion | cut -d. -f 2` OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` ifeq ($(OSX_LT_MAVERICKS),"YES") @@ -173,10 +168,7 @@ else LD_FLAGS := -fPIC SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=libretro/link.T CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__ - BUILTIN_GPU = neon - CFLAGS += -DNEON_PC MMAP_WIN32=1 - endif CFLAGS += -fPIC diff --git a/frontend/in_tsbutton.c b/frontend/in_tsbutton.c index aee68522..b3e41583 100644 --- a/frontend/in_tsbutton.c +++ b/frontend/in_tsbutton.c @@ -30,7 +30,7 @@ static const char * const in_tsbutton_keys[IN_TSBUTTON_COUNT] = { "TS1", "TS2", "TS3", "TS4", }; -static void in_tsbutton_probe(void) +static void in_tsbutton_probe(const in_drv_t *drv) { struct tsdev *dev = tsdev; if (dev == NULL) { @@ -43,7 +43,7 @@ static void in_tsbutton_probe(void) } static const char * const * -in_tsbutton_get_key_names(int *count) +in_tsbutton_get_key_names(const in_drv_t *drv, int *count) { *count = IN_TSBUTTON_COUNT; return in_tsbutton_keys; @@ -133,6 +133,6 @@ static const in_drv_t in_tsbutton_drv = { void in_tsbutton_init(void) { tsbutton_down_id = last_tsbutton_id = -1; - in_register_driver(&in_tsbutton_drv, NULL); + in_register_driver(&in_tsbutton_drv, NULL, NULL); } diff --git a/frontend/libpicofe b/frontend/libpicofe index da0cc556..d1453cf7 160000 --- a/frontend/libpicofe +++ b/frontend/libpicofe @@ -1 +1 @@ -Subproject commit da0cc55643353ab15725194be64a3d8460fe48b1 +Subproject commit d1453cf7e6d5d6758cc5d72c6d3af7d37156bf72 diff --git a/frontend/libretro.c b/frontend/libretro.c index cd889c21..74b5dbff 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -19,6 +19,7 @@ #include "../libpcsxcore/cdriso.h" #include "../libpcsxcore/cheat.h" #include "../plugins/dfsound/out.h" +#include "../plugins/dfsound/spu_config.h" #include "../plugins/dfinput/externals.h" #include "cspace.h" #include "main.h" @@ -40,7 +41,6 @@ static int vout_doffs_old, vout_fb_dirty; static bool vout_can_dupe; static bool duping_enable; -static int samples_sent, samples_to_send; static int plugins_opened; static int is_pal_mode; @@ -197,7 +197,7 @@ void pl_timing_prepare(int is_pal) is_pal_mode = is_pal; } -void plat_trigger_vibrate(int pad, uint32_t low, uint32_t high) +void plat_trigger_vibrate(int pad, int low, int high) { rumble.set_rumble_state(pad, RETRO_RUMBLE_STRONG, high << 8); rumble.set_rumble_state(pad, RETRO_RUMBLE_WEAK, low ? 0xffff : 0x0); @@ -219,16 +219,13 @@ static void snd_finish(void) static int snd_busy(void) { - if (samples_to_send > samples_sent) - return 0; /* give more samples */ - else - return 1; + return 0; } static void snd_feed(void *buf, int bytes) { - audio_batch_cb(buf, bytes / 4); - samples_sent += bytes / 4; + if (audio_batch_cb != NULL) + audio_batch_cb(buf, bytes / 4); } void out_register_libretro(struct out_driver *drv) @@ -251,12 +248,14 @@ void retro_set_environment(retro_environment_t cb) #ifndef DRC_DISABLE { "pcsx_rearmed_drc", "Dynamic recompiler; enabled|disabled" }, #endif -#if defined(__ARM_NEON__) || defined(NEON_PC) +#ifdef __ARM_NEON__ { "pcsx_rearmed_neon_interlace_enable", "Enable interlacing mode(s); disabled|enabled" }, { "pcsx_rearmed_neon_enhancement_enable", "Enhanced resolution (slow); disabled|enabled" }, { "pcsx_rearmed_neon_enhancement_no_main", "Enhanced resolution speed hack; disabled|enabled" }, #endif { "pcsx_rearmed_duping_enable", "Frame duping; on|off" }, + { "pcsx_rearmed_spu_reverb", "Sound: Reverb; on|off" }, + { "pcsx_rearmed_spu_interpolation", "Sound: Interpolation; simple|gaussian|cubic|off" }, { NULL, NULL }, }; @@ -991,7 +990,7 @@ static void update_variables(bool in_flight) in_type2 = PSE_PAD_TYPE_ANALOGPAD; } -#if defined(__ARM_NEON__) || defined(NEON_PC) +#ifdef __ARM_NEON__ var.value = "NULL"; var.key = "pcsx_rearmed_neon_interlace_enable"; @@ -1059,6 +1058,32 @@ static void update_variables(bool in_flight) } #endif + var.value = "NULL"; + var.key = "pcsx_rearmed_spu_reverb"; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) + { + if (strcmp(var.value, "off") == 0) + spu_config.iUseReverb = false; + else if (strcmp(var.value, "on") == 0) + spu_config.iUseReverb = true; + } + + var.value = "NULL"; + var.key = "pcsx_rearmed_spu_interpolation"; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) + { + if (strcmp(var.value, "simple") == 0) + spu_config.iUseInterpolation = 1; + else if (strcmp(var.value, "gaussian") == 0) + spu_config.iUseInterpolation = 2; + else if (strcmp(var.value, "cubic") == 0) + spu_config.iUseInterpolation = 3; + else if (strcmp(var.value, "off") == 0) + spu_config.iUseInterpolation = 0; + } + if (in_flight) { // inform core things about possible config changes plugin_call_rearmed_cbs(); @@ -1102,8 +1127,6 @@ void retro_run(void) stop = 0; psxCpu->Execute(); - samples_to_send += is_pal_mode ? 44100 / 50 : 44100 / 60; - video_cb((vout_fb_dirty || !vout_can_dupe || !duping_enable) ? vout_buf : NULL, vout_width, vout_height, vout_width * 2); vout_fb_dirty = 0; @@ -1174,7 +1197,7 @@ void retro_init(void) const char *bios[] = { "scph1001", "scph5501", "scph7001" }; const char *dir; char path[256]; - int i, ret, level; + int i, ret; bool found_bios = false; ret = emu_core_preinit(); @@ -1218,9 +1241,6 @@ void retro_init(void) environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&msg); } - level = 1; - environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level); - environ_cb(RETRO_ENVIRONMENT_GET_CAN_DUPE, &vout_can_dupe); environ_cb(RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE, &disk_control); environ_cb(RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE, &rumble); @@ -1228,7 +1248,7 @@ void retro_init(void) /* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times) * we have to do this because cache misses and some IO penalties * are not emulated. Warning: changing this may break compatibility. */ -#ifdef __ARM_ARCH_7A__ +#if !defined(__arm__) || defined(__ARM_ARCH_7A__) cycle_multiplier = 175; #else cycle_multiplier = 200; diff --git a/frontend/main.c b/frontend/main.c index 2ef5f521..426ef138 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -25,6 +25,7 @@ #include "../libpcsxcore/cheat.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/cdrcimg/cdrcimg.h" +#include "../plugins/dfsound/spu_config.h" #include "revision.h" #ifndef NO_FRONTEND @@ -44,12 +45,6 @@ static void check_memcards(void); void StartDebugger(); void StopDebugger(); -// sound plugin -extern int iUseReverb; -extern int iUseInterpolation; -extern int iXAPitch; -extern int iVolume; - int ready_to_go, g_emu_want_quit, g_emu_resetting; unsigned long gpuDisp; char cfgfile_basename[MAXPATHLEN]; @@ -141,13 +136,15 @@ void emu_set_default_config(void) pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64; pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1; - iUseReverb = 2; - iUseInterpolation = 1; - iXAPitch = 0; - iVolume = 768; -#ifndef __ARM_ARCH_7A__ /* XXX */ - iUseReverb = 0; - iUseInterpolation = 0; + spu_config.iUseReverb = 1; + spu_config.iUseInterpolation = 1; + spu_config.iXAPitch = 0; + spu_config.iVolume = 768; + spu_config.iTempo = 0; +#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */ + spu_config.iUseReverb = 0; + spu_config.iUseInterpolation = 0; + spu_config.iTempo = 1; #endif new_dynarec_hacks = 0; cycle_multiplier = 200; @@ -251,7 +248,11 @@ do_state_slot: } case SACTION_VOLUME_UP: case SACTION_VOLUME_DOWN: - plat_target_step_volume(emu_action == SACTION_VOLUME_UP); + { + static int volume; + plat_target_step_volume(&volume, + emu_action == SACTION_VOLUME_UP ? 1 : -1); + } return; case SACTION_MINIMIZE: if (GPU_close != NULL) @@ -849,6 +850,7 @@ static int _OpenPlugins(void) { ret = SPU_open(); if (ret < 0) { SysMessage(_("Error opening SPU plugin!")); return -1; } SPU_registerCallback(SPUirq); + SPU_registerScheduleCb(SPUschedule); // pcsx-rearmed: we handle gpu elsewhere //ret = GPU_open(&gpuDisp, "PCSX", NULL); //if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; } diff --git a/frontend/menu.c b/frontend/menu.c index 199020d2..15627356 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -37,6 +37,7 @@ #include "../libpcsxcore/cheat.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/dfinput/externals.h" +#include "../plugins/dfsound/spu_config.h" #include "psemu_plugin_defs.h" #include "revision.h" @@ -102,12 +103,6 @@ int soft_filter; #define DEFAULT_PSX_CLOCK_S "50" #endif -// sound plugin -extern int iUseReverb; -extern int iUseInterpolation; -extern int iXAPitch; -extern int iVolume; - static const char *bioses[24]; static const char *gpu_plugins[16]; static const char *spu_plugins[16]; @@ -318,7 +313,7 @@ static void menu_sync_config(void) allow_abs_only_old = in_evdev_allow_abs_only; } - iVolume = 768 + 128 * volume_boost; + spu_config.iVolume = 768 + 128 * volume_boost; pl_rearmed_cbs.frameskip = frameskip - 1; pl_timing_prepare(Config.PsxType); } @@ -431,9 +426,10 @@ static const struct { CE_INTVAL_P(gpu_peopsgl.iVRamSize), CE_INTVAL_P(gpu_peopsgl.iTexGarbageCollection), CE_INTVAL_P(gpu_peopsgl.dwActFixes), - CE_INTVAL_V(iUseReverb, 3), - CE_INTVAL_V(iXAPitch, 3), - CE_INTVAL_V(iUseInterpolation, 3), + CE_INTVAL(spu_config.iUseReverb), + CE_INTVAL(spu_config.iXAPitch), + CE_INTVAL(spu_config.iUseInterpolation), + CE_INTVAL(spu_config.iTempo), CE_INTVAL(config_save_counter), CE_INTVAL(in_evdev_allow_abs_only), CE_INTVAL(volume_boost), @@ -1400,13 +1396,16 @@ static int menu_loop_plugin_gpu_peopsgl(int id, int keys) static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL }; static const char h_spu_volboost[] = "Large values cause distortion"; +static const char h_spu_tempo[] = "Slows down audio if emu is too slow\n" + "This is inaccurate and breaks games"; static menu_entry e_menu_plugin_spu[] = { mee_range_h ("Volume boost", 0, volume_boost, -5, 30, h_spu_volboost), - mee_onoff ("Reverb", 0, iUseReverb, 2), - mee_enum ("Interpolation", 0, iUseInterpolation, men_spu_interp), - mee_onoff ("Adjust XA pitch", 0, iXAPitch, 1), + mee_onoff ("Reverb", 0, spu_config.iUseReverb, 1), + mee_enum ("Interpolation", 0, spu_config.iUseInterpolation, men_spu_interp), + mee_onoff ("Adjust XA pitch", 0, spu_config.iXAPitch, 1), + mee_onoff_h ("Adjust tempo", 0, spu_config.iTempo, 1, h_spu_tempo), mee_end, }; diff --git a/frontend/plat_dummy.c b/frontend/plat_dummy.c index baed0d5c..b490cff6 100644 --- a/frontend/plat_dummy.c +++ b/frontend/plat_dummy.c @@ -54,7 +54,7 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp) return 0; } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { } diff --git a/frontend/plat_pandora.c b/frontend/plat_pandora.c index d44513c4..41dc2feb 100644 --- a/frontend/plat_pandora.c +++ b/frontend/plat_pandora.c @@ -45,12 +45,42 @@ static const struct in_default_bind in_evdev_defbinds[] = { { 0, 0, 0 } }; +static const struct menu_keymap key_pbtn_map[] = +{ + { KEY_UP, PBTN_UP }, + { KEY_DOWN, PBTN_DOWN }, + { KEY_LEFT, PBTN_LEFT }, + { KEY_RIGHT, PBTN_RIGHT }, + /* Pandora */ + { KEY_END, PBTN_MOK }, + { KEY_PAGEDOWN, PBTN_MBACK }, + { KEY_HOME, PBTN_MA2 }, + { KEY_PAGEUP, PBTN_MA3 }, + { KEY_LEFTCTRL, PBTN_MENU }, + { KEY_RIGHTSHIFT, PBTN_L }, + { KEY_RIGHTCTRL, PBTN_R }, + /* "normal" keyboards */ + { KEY_ENTER, PBTN_MOK }, + { KEY_ESC, PBTN_MBACK }, + { KEY_SEMICOLON, PBTN_MA2 }, + { KEY_APOSTROPHE, PBTN_MA3 }, + { KEY_BACKSLASH, PBTN_MENU }, + { KEY_LEFTBRACE, PBTN_L }, + { KEY_RIGHTBRACE, PBTN_R }, +}; + +static const struct in_pdata pandora_evdev_pdata = { + .defbinds = in_evdev_defbinds, + .key_map = key_pbtn_map, + .kmap_size = sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]), +}; + int plat_init(void) { plat_omap_init(); plat_target_init(); - in_evdev_init(in_evdev_defbinds); + in_evdev_init(&pandora_evdev_pdata); in_probe(); plat_target_setup_input(); @@ -76,6 +106,6 @@ void plat_gvideo_open(int is_pal) plat_omap_gvideo_open(); } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { } diff --git a/frontend/plat_pollux.c b/frontend/plat_pollux.c index 252feba7..33e94178 100644 --- a/frontend/plat_pollux.c +++ b/frontend/plat_pollux.c @@ -84,6 +84,36 @@ static const struct in_default_bind in_evdev_defbinds[] = { { 0, 0, 0 }, }; +static const struct menu_keymap key_pbtn_map[] = +{ + { KEY_UP, PBTN_UP }, + { KEY_DOWN, PBTN_DOWN }, + { KEY_LEFT, PBTN_LEFT }, + { KEY_RIGHT, PBTN_RIGHT }, + /* Caanoo */ + { BTN_THUMB2, PBTN_MOK }, + { BTN_THUMB, PBTN_MBACK }, + { BTN_TRIGGER, PBTN_MA2 }, + { BTN_TOP, PBTN_MA3 }, + { BTN_BASE, PBTN_MENU }, + { BTN_TOP2, PBTN_L }, + { BTN_PINKIE, PBTN_R }, + /* "normal" keyboards */ + { KEY_ENTER, PBTN_MOK }, + { KEY_ESC, PBTN_MBACK }, + { KEY_SEMICOLON, PBTN_MA2 }, + { KEY_APOSTROPHE, PBTN_MA3 }, + { KEY_BACKSLASH, PBTN_MENU }, + { KEY_LEFTBRACE, PBTN_L }, + { KEY_RIGHTBRACE, PBTN_R }, +}; + +static const struct in_pdata gp2x_evdev_pdata = { + .defbinds = in_evdev_defbinds, + .key_map = key_pbtn_map, + .kmap_size = sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]), +}; + static void *fb_flip(void) { memregl[0x406C>>2] = memregl[0x446C>>2] = fb_paddrs[fb_work_buf]; @@ -533,7 +563,7 @@ void plat_init(void) DMA_REG(0x0c) = 0x20000; // pending IRQ clear in_tsbutton_init(); - in_evdev_init(in_evdev_defbinds); + in_evdev_init(&gp2x_evdev_pdata); if (gp2x_dev_id == GP2X_DEV_CAANOO) caanoo_init(); else @@ -674,10 +704,15 @@ static int haptic_init(void) return 0; } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { + int is_strong; int ret; + if (low == 0 && high == 0) + return; + is_strong = (high >= 0xf0); + if (hapticdev == -2) return; // it's broken if (hapticdev < 0) { diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index 247437ec..5e11cf84 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -53,6 +53,41 @@ static const struct in_default_bind in_sdl_defbinds[] = { { 0, 0, 0 } }; +const struct menu_keymap in_sdl_key_map[] = +{ + { SDLK_UP, PBTN_UP }, + { SDLK_DOWN, PBTN_DOWN }, + { SDLK_LEFT, PBTN_LEFT }, + { SDLK_RIGHT, PBTN_RIGHT }, + { SDLK_RETURN, PBTN_MOK }, + { SDLK_ESCAPE, PBTN_MBACK }, + { SDLK_SEMICOLON, PBTN_MA2 }, + { SDLK_QUOTE, PBTN_MA3 }, + { SDLK_LEFTBRACKET, PBTN_L }, + { SDLK_RIGHTBRACKET, PBTN_R }, +}; + +const struct menu_keymap in_sdl_joy_map[] = +{ + { SDLK_UP, PBTN_UP }, + { SDLK_DOWN, PBTN_DOWN }, + { SDLK_LEFT, PBTN_LEFT }, + { SDLK_RIGHT, PBTN_RIGHT }, + /* joystick */ + { SDLK_WORLD_0, PBTN_MOK }, + { SDLK_WORLD_1, PBTN_MBACK }, + { SDLK_WORLD_2, PBTN_MA2 }, + { SDLK_WORLD_3, PBTN_MA3 }, +}; + +static const struct in_pdata in_sdl_platform_data = { + .defbinds = in_sdl_defbinds, + .key_map = in_sdl_key_map, + .kmap_size = sizeof(in_sdl_key_map) / sizeof(in_sdl_key_map[0]), + .joy_map = in_sdl_joy_map, + .jmap_size = sizeof(in_sdl_joy_map) / sizeof(in_sdl_joy_map[0]), +}; + static int psx_w, psx_h; static void *shadow_fb, *menubg_img; static int in_menu; @@ -122,7 +157,7 @@ void plat_init(void) exit(1); } - in_sdl_init(in_sdl_defbinds, plat_sdl_event_handler); + in_sdl_init(&in_sdl_platform_data, plat_sdl_event_handler); in_probe(); pl_rearmed_cbs.only_16bpp = 1; pl_rearmed_cbs.pl_get_layer_pos = get_layer_pos; @@ -301,7 +336,7 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp) return 0; } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { } diff --git a/frontend/plugin.c b/frontend/plugin.c index 7e8e5c3f..cf3d575d 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -25,19 +25,20 @@ extern long SPUinit(void); extern long SPUshutdown(void); extern long SPUclose(void); extern void SPUplaySample(unsigned char); -extern void SPUwriteRegister(unsigned long, unsigned short); +extern void SPUwriteRegister(unsigned long, unsigned short, unsigned int); extern unsigned short SPUreadRegister(unsigned long); extern void SPUwriteDMA(unsigned short); extern unsigned short SPUreadDMA(void); -extern void SPUwriteDMAMem(unsigned short *, int); -extern void SPUreadDMAMem(unsigned short *, int); +extern void SPUwriteDMAMem(unsigned short *, int, unsigned int); +extern void SPUreadDMAMem(unsigned short *, int, unsigned int); extern void SPUplayADPCMchannel(void *); -extern void SPUregisterCallback(void (*callback)(void)); +extern void SPUregisterCallback(void (*cb)(void)); +extern void SPUregisterScheduleCb(void (*cb)(unsigned int)); extern long SPUconfigure(void); extern long SPUtest(void); extern void SPUabout(void); -extern long SPUfreeze(unsigned int, void *); -extern void SPUasync(unsigned int); +extern long SPUfreeze(unsigned int, void *, unsigned int); +extern void SPUasync(unsigned int, unsigned int); extern int SPUplayCDDAchannel(short *, int); /* PAD */ @@ -135,6 +136,7 @@ static const struct { DIRECT_SPU(SPUplayADPCMchannel), DIRECT_SPU(SPUfreeze), DIRECT_SPU(SPUregisterCallback), + DIRECT_SPU(SPUregisterScheduleCb), DIRECT_SPU(SPUasync), DIRECT_SPU(SPUplayCDDAchannel), /* PAD */ @@ -254,14 +256,14 @@ pc_hook_func (GPU_readDataMem, (uint32_t *a0, int a1), (a0, a1), PC pc_hook_func_ret(long, GPU_dmaChain, (uint32_t *a0, int32_t a1), (a0, a1), PCNT_GPU) pc_hook_func (GPU_updateLace, (void), (), PCNT_GPU) -pc_hook_func (SPU_writeRegister, (unsigned long a0, unsigned short a1), (a0, a1), PCNT_SPU) +pc_hook_func (SPU_writeRegister, (unsigned long a0, unsigned short a1, uint32_t a2), (a0, a1, a2), PCNT_SPU) pc_hook_func_ret(unsigned short,SPU_readRegister, (unsigned long a0), (a0), PCNT_SPU) pc_hook_func (SPU_writeDMA, (unsigned short a0), (a0), PCNT_SPU) pc_hook_func_ret(unsigned short,SPU_readDMA, (void), (), PCNT_SPU) -pc_hook_func (SPU_writeDMAMem, (unsigned short *a0, int a1), (a0, a1), PCNT_SPU) -pc_hook_func (SPU_readDMAMem, (unsigned short *a0, int a1), (a0, a1), PCNT_SPU) +pc_hook_func (SPU_writeDMAMem, (unsigned short *a0, int a1, uint32_t a2), (a0, a1, a2), PCNT_SPU) +pc_hook_func (SPU_readDMAMem, (unsigned short *a0, int a1, uint32_t a2), (a0, a1, a2), PCNT_SPU) pc_hook_func (SPU_playADPCMchannel, (void *a0), (a0), PCNT_SPU) -pc_hook_func (SPU_async, (unsigned int a0), (a0), PCNT_SPU) +pc_hook_func (SPU_async, (uint32_t a0, uint32_t a1), (a0, a1), PCNT_SPU) pc_hook_func_ret(int, SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), PCNT_SPU) #define hook_it(name) { \ diff --git a/include/psemu_plugin_defs.h b/include/psemu_plugin_defs.h index b40c77cd..99866540 100644 --- a/include/psemu_plugin_defs.h +++ b/include/psemu_plugin_defs.h @@ -5,8 +5,6 @@ extern "C" { #endif -#include - // header version #define _PPDK_HEADER_VERSION 3 @@ -207,11 +205,10 @@ typedef struct // values are in range -128 - 127 unsigned char moveX, moveY; - uint8_t Vib[2]; - - volatile uint8_t VibF[2]; + unsigned char Vib[2]; + unsigned char VibF[2]; - unsigned char reserved[87]; + unsigned char reserved[87]; } PadDataS; diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index a27f60fb..917a5677 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -601,11 +601,11 @@ int SaveState(const char *file) { // spu spufP = (SPUFreeze_t *) malloc(16); - SPU_freeze(2, spufP); + SPU_freeze(2, spufP, psxRegs.cycle); Size = spufP->Size; SaveFuncs.write(f, &Size, 4); free(spufP); spufP = (SPUFreeze_t *) malloc(Size); - SPU_freeze(1, spufP); + SPU_freeze(1, spufP, psxRegs.cycle); SaveFuncs.write(f, spufP, Size); free(spufP); @@ -670,7 +670,7 @@ int LoadState(const char *file) { SaveFuncs.read(f, &Size, 4); spufP = (SPUFreeze_t *)malloc(Size); SaveFuncs.read(f, spufP, Size); - SPU_freeze(0, spufP); + SPU_freeze(0, spufP, psxRegs.cycle); free(spufP); sioFreeze(f, 0); diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c index cb95cb1c..89e2bd6f 100644 --- a/libpcsxcore/new_dynarec/emu_if.c +++ b/libpcsxcore/new_dynarec/emu_if.c @@ -60,6 +60,7 @@ static irq_func * const irq_funcs[] = { [PSXINT_CDRDMA] = cdrDmaInterrupt, [PSXINT_CDRLID] = cdrLidSeekInterrupt, [PSXINT_CDRPLAY] = cdrPlayInterrupt, + [PSXINT_SPU_UPDATE] = spuUpdate, [PSXINT_RCNT] = psxRcntUpdate, }; diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c index 0a75442b..d5c32be4 100644 --- a/libpcsxcore/new_dynarec/pcsxmem.c +++ b/libpcsxcore/new_dynarec/pcsxmem.c @@ -210,7 +210,7 @@ make_dma_func(6) static void io_spu_write16(u32 value) { // meh - SPU_writeRegister(address, value); + SPU_writeRegister(address, value, psxRegs.cycle); } static void io_spu_write32(u32 value) @@ -218,8 +218,8 @@ static void io_spu_write32(u32 value) SPUwriteRegister wfunc = SPU_writeRegister; u32 a = address; - wfunc(a, value & 0xffff); - wfunc(a + 2, value >> 16); + wfunc(a, value & 0xffff, psxRegs.cycle); + wfunc(a + 2, value >> 16, psxRegs.cycle); } static u32 io_gpu_read_status(void) diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c index 57078bad..e6d8a11e 100644 --- a/libpcsxcore/plugins.c +++ b/libpcsxcore/plugins.c @@ -88,6 +88,7 @@ SPUreadDMAMem SPU_readDMAMem; SPUplayADPCMchannel SPU_playADPCMchannel; SPUfreeze SPU_freeze; SPUregisterCallback SPU_registerCallback; +SPUregisterScheduleCb SPU_registerScheduleCb; SPUasync SPU_async; SPUplayCDDAchannel SPU_playCDDAchannel; @@ -320,6 +321,7 @@ void *hSPUDriver = NULL; long CALLBACK SPU__configure(void) { return 0; } void CALLBACK SPU__about(void) {} long CALLBACK SPU__test(void) { return 0; } +void CALLBACK SPU__registerScheduleCb(void (CALLBACK *cb)(unsigned int)) {} #define LoadSpuSym1(dest, name) \ LoadSym(SPU_##dest, SPU##dest, name, TRUE); @@ -356,6 +358,7 @@ static int LoadSPUplugin(const char *SPUdll) { LoadSpuSym1(playADPCMchannel, "SPUplayADPCMchannel"); LoadSpuSym1(freeze, "SPUfreeze"); LoadSpuSym1(registerCallback, "SPUregisterCallback"); + LoadSpuSym0(registerScheduleCb, "SPUregisterScheduleCb"); LoadSpuSymN(async, "SPUasync"); LoadSpuSymN(playCDDAchannel, "SPUplayCDDAchannel"); diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h index dfa87221..e6ac694d 100644 --- a/libpcsxcore/plugins.h +++ b/libpcsxcore/plugins.h @@ -184,14 +184,15 @@ typedef long (CALLBACK* SPUinit)(void); typedef long (CALLBACK* SPUshutdown)(void); typedef long (CALLBACK* SPUclose)(void); typedef void (CALLBACK* SPUplaySample)(unsigned char); -typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short); +typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short, unsigned int); typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long); typedef void (CALLBACK* SPUwriteDMA)(unsigned short); typedef unsigned short (CALLBACK* SPUreadDMA)(void); -typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int); -typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int); +typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int, unsigned int); +typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int, unsigned int); typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *); typedef void (CALLBACK* SPUregisterCallback)(void (CALLBACK *callback)(void)); +typedef void (CALLBACK* SPUregisterScheduleCb)(void (CALLBACK *callback)(unsigned int cycles_after)); typedef long (CALLBACK* SPUconfigure)(void); typedef long (CALLBACK* SPUtest)(void); typedef void (CALLBACK* SPUabout)(void); @@ -204,8 +205,8 @@ typedef struct { xa_decode_t xa; unsigned char *SPUInfo; } SPUFreeze_t; -typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *); -typedef void (CALLBACK* SPUasync)(uint32_t); +typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *, uint32_t); +typedef void (CALLBACK* SPUasync)(uint32_t, uint32_t); typedef int (CALLBACK* SPUplayCDDAchannel)(short *, int); // SPU function pointers @@ -226,6 +227,7 @@ extern SPUreadDMAMem SPU_readDMAMem; extern SPUplayADPCMchannel SPU_playADPCMchannel; extern SPUfreeze SPU_freeze; extern SPUregisterCallback SPU_registerCallback; +extern SPUregisterScheduleCb SPU_registerScheduleCb; extern SPUasync SPU_async; extern SPUplayCDDAchannel SPU_playCDDAchannel; diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index 50f17929..35823dac 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -61,7 +61,6 @@ static const u32 CountToTarget = 1; static const u32 FrameRate[] = { 60, 50 }; static const u32 HSyncTotal[] = { 263, 313 }; -static const u32 SpuUpdInterval[] = { 32, 32 }; #define VBlankStart 240 #define VERBOSE_LEVEL 0 @@ -73,7 +72,6 @@ Rcnt rcnts[ CounterQuantity ]; u32 hSyncCount = 0; u32 frame_counter = 0; -static u32 spuSyncCount = 0; static u32 hsync_steps = 0; static u32 base_cycle = 0; @@ -323,22 +321,10 @@ void psxRcntUpdate() if( cycle - rcnts[3].cycleStart >= rcnts[3].cycle ) { u32 leftover_cycles = cycle - rcnts[3].cycleStart - rcnts[3].cycle; - u32 next_vsync, next_lace; + u32 next_vsync; - spuSyncCount += hsync_steps; hSyncCount += hsync_steps; - // Update spu. - if( spuSyncCount >= SpuUpdInterval[Config.PsxType] ) - { - spuSyncCount = 0; - - if( SPU_async ) - { - SPU_async( SpuUpdInterval[Config.PsxType] * rcnts[3].target ); - } - } - // VSync irq. if( hSyncCount == VBlankStart ) { @@ -348,6 +334,11 @@ void psxRcntUpdate() EmuUpdate(); GPU_updateLace(); + + if( SPU_async ) + { + SPU_async( cycle, 1 ); + } } // Update lace. (with InuYasha fix) @@ -363,13 +354,10 @@ void psxRcntUpdate() } // Schedule next call, in hsyncs - hsync_steps = SpuUpdInterval[Config.PsxType] - spuSyncCount; + hsync_steps = HSyncTotal[Config.PsxType] - hSyncCount; next_vsync = VBlankStart - hSyncCount; // ok to overflow - next_lace = HSyncTotal[Config.PsxType] - hSyncCount; if( next_vsync && next_vsync < hsync_steps ) hsync_steps = next_vsync; - if( next_lace && next_lace < hsync_steps ) - hsync_steps = next_lace; rcnts[3].cycleStart = cycle - leftover_cycles; if (Config.PsxType) @@ -493,7 +481,6 @@ void psxRcntInit() } hSyncCount = 0; - spuSyncCount = 0; hsync_steps = 1; psxRcntSet(); @@ -503,6 +490,7 @@ void psxRcntInit() s32 psxRcntFreeze( void *f, s32 Mode ) { + u32 spuSyncCount = 0; u32 count; s32 i; diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c index 63c2724d..ff7d6a3b 100644 --- a/libpcsxcore/psxdma.c +++ b/libpcsxcore/psxdma.c @@ -51,7 +51,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU #endif break; } - SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2); + SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2, psxRegs.cycle); SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2); return; @@ -67,7 +67,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU break; } size = (bcr >> 16) * (bcr & 0xffff) * 2; - SPU_readDMAMem(ptr, size); + SPU_readDMAMem(ptr, size, psxRegs.cycle); psxCpu->Clear(madr, size); break; diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c index 6b9125d7..c90f8c73 100644 --- a/libpcsxcore/psxhw.c +++ b/libpcsxcore/psxhw.c @@ -493,7 +493,7 @@ void psxHwWrite16(u32 add, u16 value) { default: if (add>=0x1f801c00 && add<0x1f801e00) { - SPU_writeRegister(add, value); + SPU_writeRegister(add, value, psxRegs.cycle); return; } @@ -747,8 +747,8 @@ void psxHwWrite32(u32 add, u32 value) { default: // Dukes of Hazard 2 - car engine noise if (add>=0x1f801c00 && add<0x1f801e00) { - SPU_writeRegister(add, value&0xffff); - SPU_writeRegister(add + 2, value>>16); + SPU_writeRegister(add, value&0xffff, psxRegs.cycle); + SPU_writeRegister(add + 2, value>>16, psxRegs.cycle); return; } diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c index ff494913..cf3de798 100644 --- a/libpcsxcore/psxinterpreter.c +++ b/libpcsxcore/psxinterpreter.c @@ -727,9 +727,9 @@ void psxLWR() { */ } -void psxSB() { psxMemWrite8 (_oB_, _u8 (_rRt_)); } -void psxSH() { psxMemWrite16(_oB_, _u16(_rRt_)); } -void psxSW() { psxMemWrite32(_oB_, _u32(_rRt_)); } +void psxSB() { psxMemWrite8 (_oB_, _rRt_ & 0xff); } +void psxSH() { psxMemWrite16(_oB_, _rRt_ & 0xffff); } +void psxSW() { psxMemWrite32(_oB_, _rRt_); } u32 SWL_MASK[4] = { 0xffffff00, 0xffff0000, 0xff000000, 0 }; u32 SWL_SHIFT[4] = { 24, 16, 8, 0 }; diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index f5996acf..82eb8857 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -185,6 +185,12 @@ void psxBranchTest() { cdrLidSeekInterrupt(); } } + if (psxRegs.interrupt & (1 << PSXINT_SPU_UPDATE)) { // scheduled spu update + if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SPU_UPDATE].sCycle) >= psxRegs.intCycle[PSXINT_SPU_UPDATE].cycle) { + psxRegs.interrupt &= ~(1 << PSXINT_SPU_UPDATE); + spuUpdate(); + } + } } if (psxHu32(0x1070) & psxHu32(0x1074)) { diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h index 13aaa595..a6a6254e 100644 --- a/libpcsxcore/r3000a.h +++ b/libpcsxcore/r3000a.h @@ -160,6 +160,7 @@ enum { PSXINT_RCNT, PSXINT_CDRLID, PSXINT_CDRPLAY, + PSXINT_SPU_UPDATE, PSXINT_COUNT }; diff --git a/libpcsxcore/spu.c b/libpcsxcore/spu.c index a60c0478..90d2f4db 100644 --- a/libpcsxcore/spu.c +++ b/libpcsxcore/spu.c @@ -26,3 +26,15 @@ void CALLBACK SPUirq(void) { psxHu32ref(0x1070) |= SWAPu32(0x200); } + +// spuUpdate +void CALLBACK SPUschedule(unsigned int cycles_after) { + psxRegs.interrupt |= (1 << PSXINT_SPU_UPDATE); + psxRegs.intCycle[PSXINT_SPU_UPDATE].cycle = cycles_after; + psxRegs.intCycle[PSXINT_SPU_UPDATE].sCycle = psxRegs.cycle; + new_dyna_set_event(PSXINT_SPU_UPDATE, cycles_after); +} + +void spuUpdate() { + SPU_async(psxRegs.cycle, 0); +} diff --git a/libpcsxcore/spu.h b/libpcsxcore/spu.h index 85010cbd..44a35d5f 100644 --- a/libpcsxcore/spu.h +++ b/libpcsxcore/spu.h @@ -40,6 +40,8 @@ extern "C" { #define H_SPUoff2 0x0d8e void CALLBACK SPUirq(void); +void CALLBACK SPUschedule(unsigned int cycles_after); +void spuUpdate(); #ifdef __cplusplus } diff --git a/maemo/hildon.c b/maemo/hildon.c index bd895c96..7e9cd9fe 100644 --- a/maemo/hildon.c +++ b/maemo/hildon.c @@ -805,7 +805,7 @@ void plat_step_volume(int is_up) { } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { const int vDuration = 10; @@ -817,7 +817,8 @@ void plat_trigger_vibrate(int is_strong) "req_start_manual_vibration"); if (msg) { dbus_message_iter_init_append(msg, &args); - int speed = is_strong ? 200 : 150; + // FIXME: somebody with hardware should tune this + int speed = high; // is_strong ? 200 : 150; int duration = vDuration; if (dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &speed)) { if (dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &duration)) { diff --git a/maemo/main.c b/maemo/main.c index 87e0e2c9..85db400b 100644 --- a/maemo/main.c +++ b/maemo/main.c @@ -18,16 +18,13 @@ #include "../libpcsxcore/cdriso.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/dfinput/main.h" +#include "../plugins/dfsound/spu_config.h" #include "maemo_common.h" extern int in_enable_vibration; extern int cycle_multiplier; extern int in_type1, in_type2; -// sound plugin -extern int iUseReverb; -extern int iUseInterpolation; - accel_option accelOptions; int ready_to_go, g_emu_want_quit, g_emu_resetting; int g_menuscreen_w, g_menuscreen_h; @@ -198,8 +195,8 @@ int main(int argc, char **argv) Config.PsxAuto = 1; pl_rearmed_cbs.frameskip = -1; strcpy(Config.Bios, "HLE"); - iUseReverb = 0; - iUseInterpolation = 0; + spu_config.iUseReverb = 1; + spu_config.iUseInterpolation = 1; in_type1 = PSE_PAD_TYPE_STANDARD; in_type2 = PSE_PAD_TYPE_STANDARD; @@ -288,8 +285,8 @@ int main(int argc, char **argv) } } - else if (!strcmp(argv[i], "-spu_reverb")) { if (atol(argv[++i]) > 0) iUseReverb = 2; } - else if (!strcmp(argv[i], "-spu_interpolation")) iUseInterpolation = atol(argv[++i]); + else if (!strcmp(argv[i], "-spu_reverb")) spu_config.iUseReverb = atol(argv[++i]); + else if (!strcmp(argv[i], "-spu_interpolation")) spu_config.iUseInterpolation = atol(argv[++i]); else if (!strcmp(argv[i], "-enhance")) pl_rearmed_cbs.gpu_neon.enhancement_enable = 1; else if (!strcmp(argv[i], "-enhancehack")) pl_rearmed_cbs.gpu_neon.enhancement_no_main = 1; diff --git a/plugins/dfinput/externals.h b/plugins/dfinput/externals.h index 042d9dcf..a446956e 100644 --- a/plugins/dfinput/externals.h +++ b/plugins/dfinput/externals.h @@ -11,4 +11,4 @@ extern void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in); /* vibration trigger to frontend */ extern int in_enable_vibration; -extern void plat_trigger_vibrate(int pad, uint32_t low, uint32_t high); +extern void plat_trigger_vibrate(int pad, int low, int high); diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index 348bb8f3..7e00a113 100644 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -206,21 +206,24 @@ static void do_cmd2(unsigned char value) } } -static void do_cmd3(unsigned char value) +static void do_vibration(unsigned char value) { + int changed = 0; int i; + switch (CurCmd) { case CMD_READ_DATA_AND_VIBRATE: - if (!in_enable_vibration) - break; - if (padstate[CurPad].pad.controllerType != PSE_PAD_TYPE_ANALOGPAD) - break; - for (i = 0; i < 2; i++) { - if (padstate[CurPad].pad.Vib[i] == CurByte) + if (padstate[CurPad].pad.Vib[i] == CurByte + && padstate[CurPad].pad.VibF[i] != value) { padstate[CurPad].pad.VibF[i] = value; + changed = 1; + } } + if (!in_enable_vibration || !changed) + break; + plat_trigger_vibrate(CurPad, padstate[CurPad].pad.VibF[0], padstate[CurPad].pad.VibF[1]); @@ -252,7 +255,7 @@ unsigned char PADpoll(unsigned char value) { #endif unsigned char PADpoll_pad(unsigned char value) { - if (CurByte == 0) { + if (CurByte == 0) { CurCmd = value; CurByte++; @@ -261,15 +264,16 @@ unsigned char PADpoll_pad(unsigned char value) { CurCmd = CMD_READ_DATA_AND_VIBRATE; return do_cmd(); - } + } - if (CurByte >= CmdLen) - return 0xff; // verified + if (CurByte >= CmdLen) + return 0xff; // verified - if (CurByte == 2) + if (CurByte == 2) do_cmd2(value); - do_cmd3(value); + if (padstate[CurPad].pad.controllerType == PSE_PAD_TYPE_ANALOGPAD) + do_vibration(value); return buf[CurByte++]; } diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c index 79f593ca..c1e98b32 100644 --- a/plugins/dfsound/adsr.c +++ b/plugins/dfsound/adsr.c @@ -218,7 +218,7 @@ done: stop: memset(&ChanBuf[ns], 0, (ns_to - ns) * sizeof(ChanBuf[0])); s_chan[ch].ADSRX.EnvelopeVol = 0; - dwChannelOn &= ~(1< +#include #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API #include @@ -184,10 +185,17 @@ static int alsa_busy(void) // FEED SOUND DATA static void alsa_feed(void *pSound, int lBytes) { + char sbuf[4096]; + if (handle == NULL) return; if (snd_pcm_state(handle) == SND_PCM_STATE_XRUN) - snd_pcm_prepare(handle); + { + memset(sbuf, 0, sizeof(sbuf)); + snd_pcm_prepare(handle); + snd_pcm_writei(handle, sbuf, sizeof(sbuf) / 4); + snd_pcm_writei(handle, sbuf, sizeof(sbuf) / 4); + } snd_pcm_writei(handle,pSound, lBytes / 4); } diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S index 40794719..1726389a 100644 --- a/plugins/dfsound/arm_utils.S +++ b/plugins/dfsound/arm_utils.S @@ -15,7 +15,6 @@ .align 2 ptr_ChanBuf: .word ESYM(ChanBuf) ptr_SSumLR: .word ESYM(SSumLR) -ptr_sRVBStart: .word ESYM(sRVBStart) #endif .text @@ -70,14 +69,13 @@ mc_finish: bx lr -FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv) +FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb) vmov.32 d14[0], r2 vmov.32 d14[1], r3 @ multipliers mov r12, r0 load_varadr r0, ChanBuf - load_varadr r3, sRVBStart + ldr r3, [sp] @ rvb load_varadr r2, SSumLR - ldr r3, [r3] add r0, r12, lsl #2 add r2, r12, lsl #3 add r3, r12, lsl #3 @@ -143,14 +141,13 @@ mc_finish: ldmfd sp!, {r4-r8,pc} -FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv) +FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb) stmfd sp!, {r4-r8,lr} orr lr, r2, r3, lsl #16 lsl lr, #1 - load_varadr r3, sRVBStart + ldr r3, [sp] @ rvb load_varadr r2, SSumLR load_varadr r4, ChanBuf - ldr r3, [r3] add r2, r2, r0, lsl #3 add r3, r3, r0, lsl #3 add r0, r4, r0, lsl #2 diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c index 7c164ac6..d3706b92 100644 --- a/plugins/dfsound/dma.c +++ b/plugins/dfsound/dma.c @@ -27,9 +27,9 @@ unsigned short CALLBACK SPUreadDMA(void) { - unsigned short s=spuMem[spuAddr>>1]; - spuAddr+=2; - if(spuAddr>0x7ffff) spuAddr=0; + unsigned short s=spu.spuMem[spu.spuAddr>>1]; + spu.spuAddr+=2; + if(spu.spuAddr>0x7ffff) spu.spuAddr=0; return s; } @@ -38,15 +38,18 @@ unsigned short CALLBACK SPUreadDMA(void) // READ DMA (many values) //////////////////////////////////////////////////////////////////////// -void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize) +void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize, + unsigned int cycles) { int i; + do_samples_if_needed(cycles); + for(i=0;i>1]; // spu addr got by writeregister - spuAddr+=2; // inc spu addr - if(spuAddr>0x7ffff) spuAddr=0; // wrap + *pusPSXMem++=spu.spuMem[spu.spuAddr>>1]; // spu addr got by writeregister + spu.spuAddr+=2; // inc spu addr + if(spu.spuAddr>0x7ffff) spu.spuAddr=0; // wrap } } @@ -64,34 +67,35 @@ void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize) void CALLBACK SPUwriteDMA(unsigned short val) { - spuMem[spuAddr>>1] = val; // spu addr got by writeregister + spu.spuMem[spu.spuAddr>>1] = val; // spu addr got by writeregister - spuAddr+=2; // inc spu addr - if(spuAddr>0x7ffff) spuAddr=0; // wrap + spu.spuAddr+=2; // inc spu addr + if(spu.spuAddr>0x7ffff) spu.spuAddr=0; // wrap } //////////////////////////////////////////////////////////////////////// // WRITE DMA (many values) //////////////////////////////////////////////////////////////////////// -void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize) +void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize, + unsigned int cycles) { int i; - had_dma = 1; + do_samples_if_needed(cycles); - if(spuAddr + iSize*2 < 0x80000) + if(spu.spuAddr + iSize*2 < 0x80000) { - memcpy(&spuMem[spuAddr>>1], pusPSXMem, iSize*2); - spuAddr += iSize*2; + memcpy(&spu.spuMem[spu.spuAddr>>1], pusPSXMem, iSize*2); + spu.spuAddr += iSize*2; return; } for(i=0;i>1] = *pusPSXMem++; // spu addr got by writeregister - spuAddr+=2; // inc spu addr - spuAddr&=0x7ffff; // wrap + spu.spuMem[spu.spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister + spu.spuAddr+=2; // inc spu addr + spu.spuAddr&=0x7ffff; // wrap } } diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 2f3028ee..7935cb99 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -46,10 +46,8 @@ // num of channels #define MAXCHAN 24 -// ~ FRAG_MSECS ms of data // note: must be even due to the way reverb works now -#define FRAG_MSECS 2 -#define NSSIZE ((44100 * FRAG_MSECS / 1000 + 1) & ~1) +#define NSSIZE ((44100 / 50 + 16) & ~1) /////////////////////////////////////////////////////////// // struct defines @@ -90,6 +88,7 @@ typedef struct int iSBPos; // mixing stuff int spos; int sinc; + int sinc_inv; unsigned char * pCurr; // current pos in sound mem unsigned char * pLoop; // loop ptr in sound mem @@ -167,86 +166,82 @@ typedef struct } REVERBInfo; /////////////////////////////////////////////////////////// -// SPU.C globals -/////////////////////////////////////////////////////////// - -#ifndef _IN_SPU // psx buffers / addresses -extern unsigned short regArea[]; -extern unsigned short spuMem[]; -extern unsigned char * spuMemC; -extern unsigned char * pSpuIrq; -extern unsigned char * pSpuBuffer; +typedef struct +{ + unsigned short spuCtrl; + unsigned short spuStat; + + unsigned int spuAddr; + unsigned char * spuMemC; + unsigned char * pSpuIrq; -#define regAreaGet(ch,offset) \ - regArea[((ch<<4)|(offset))>>1] + unsigned int cycles_played; + int decode_pos; + int decode_dirty_ch; + unsigned int bSpuInit:1; + unsigned int bSPUIsOpen:1; -// user settings + unsigned int dwNoiseVal; // global noise generator + unsigned int dwNoiseCount; + unsigned int dwNewChannel; // flags for faster testing, if new channel starts + unsigned int dwChannelOn; // not silent channels + unsigned int dwChannelDead; // silent+not useful channels -extern int iVolume; -extern int iXAPitch; -extern int iUseReverb; -extern int iUseInterpolation; -// MISC + unsigned char * pSpuBuffer; + short * pS; -extern int had_dma; -extern int decode_pos; + void (CALLBACK *irqCallback)(void); // func of main emu, called on spu irq + void (CALLBACK *cddavCallback)(unsigned short,unsigned short); + void (CALLBACK *scheduleCallback)(unsigned int); -extern SPUCHAN s_chan[]; -extern REVERBInfo rvb; + int * sRVBStart; -extern unsigned short spuCtrl; -extern unsigned short spuStat; -extern unsigned short spuIrq; -extern unsigned int spuAddr; -extern int bSpuInit; -extern unsigned int dwNewChannel; -extern unsigned int dwChannelOn; -extern unsigned int dwPendingChanOff; -extern unsigned int dwChannelDead; + xa_decode_t * xapGlobal; + unsigned int * XAFeed; + unsigned int * XAPlay; + unsigned int * XAStart; + unsigned int * XAEnd; -extern int SSumR[]; -extern int SSumL[]; -extern int iCycle; -extern short * pS; + unsigned int * CDDAFeed; + unsigned int * CDDAPlay; + unsigned int * CDDAStart; + unsigned int * CDDAEnd; -extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short); + unsigned int XARepeat; + unsigned int XALastVal; -#endif + int iLeftXAVol; + int iRightXAVol; + + int pad[32]; + unsigned short regArea[0x400]; + unsigned short spuMem[256*1024]; +} SPUInfo; /////////////////////////////////////////////////////////// -// XA.C globals +// SPU.C globals /////////////////////////////////////////////////////////// -#ifndef _IN_XA +#ifndef _IN_SPU -extern xa_decode_t * xapGlobal; +extern SPUInfo spu; +extern SPUCHAN s_chan[]; +extern REVERBInfo rvb; -extern uint32_t * XAFeed; -extern uint32_t * XAPlay; -extern uint32_t * XAStart; -extern uint32_t * XAEnd; +void do_samples(unsigned int cycles_to); +void schedule_next_irq(void); -extern uint32_t * CDDAFeed; -extern uint32_t * CDDAPlay; -extern uint32_t * CDDAStart; -extern uint32_t * CDDAEnd; +#define regAreaGet(ch,offset) \ + spu.regArea[((ch<<4)|(offset))>>1] -extern int iLeftXAVol; -extern int iRightXAVol; +#define do_samples_if_needed(c) \ + do { \ + if ((int)((c) - spu.cycles_played) >= 16 * 768) \ + do_samples(c); \ + } while (0) #endif -/////////////////////////////////////////////////////////// -// REVERB.C globals -/////////////////////////////////////////////////////////// - -#ifndef _IN_REVERB - -extern int * sRVBPlay; -extern int * sRVBEnd; -extern int * sRVBStart; - -#endif diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c index 0601bf5c..b865b848 100644 --- a/plugins/dfsound/freeze.c +++ b/plugins/dfsound/freeze.c @@ -132,16 +132,14 @@ typedef struct //////////////////////////////////////////////////////////////////////// void LoadStateV5(SPUFreeze_t * pF); // newest version -void LoadStateUnknown(SPUFreeze_t * pF); // unknown format - -extern int lastch; +void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format // we want to retain compatibility between versions, // so use original channel struct static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch) { memset(d, 0, sizeof(*d)); - d->bNew = !!(dwNewChannel & (1<bNew = !!(spu.dwNewChannel & (1<iSBPos = s->iSBPos; d->spos = s->spos; d->sinc = s->sinc; @@ -149,7 +147,7 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch) d->iStart = (regAreaGet(ch,6)&~1)<<3; d->iCurr = 0; // set by the caller d->iLoop = 0; // set by the caller - d->bOn = !!(dwChannelOn & (1<bOn = !!(spu.dwChannelOn & (1<bStop = s->bStop; d->bReverb = s->bReverb; d->iActFreq = 1; @@ -181,10 +179,12 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch) static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch) { memset(d, 0, sizeof(*d)); - if (s->bNew) dwNewChannel |= 1<bNew) spu.dwNewChannel |= 1<iSBPos = s->iSBPos; + if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27; d->spos = s->spos; d->sinc = s->sinc; + d->sinc_inv = 0; memcpy(d->SB, s->SB, sizeof(d->SB)); d->pCurr = (void *)((long)s->iCurr & 0x7fff0); d->pLoop = (void *)((long)s->iLoop & 0x7fff0); @@ -208,15 +208,24 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch) d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp; d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate; d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol; - if (s->bOn) dwChannelOn |= 1<bOn) spu.dwChannelOn |= 1<ADSRX.EnvelopeVol = 0; } +// force load from regArea to variables +static void load_register(unsigned long reg, unsigned int cycles) +{ + unsigned short *r = &spu.regArea[((reg & 0xfff) - 0xc00) >> 1]; + *r ^= 1; + SPUwriteRegister(reg, *r ^ 1, cycles); +} + //////////////////////////////////////////////////////////////////////// // SPUFREEZE: called by main emu on savestate load/save //////////////////////////////////////////////////////////////////////// -long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) +long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF, + uint32_t cycles) { int i;SPUOSSFreeze_t * pFO; @@ -233,31 +242,33 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) if(ulFreezeMode==2) return 1; // info mode? ok, bye // save mode: - memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos - memcpy(pF->cSPUPort,regArea,0x200); + do_samples(cycles); + + memcpy(pF->cSPURam,spu.spuMem,0x80000); // copy common infos + memcpy(pF->cSPUPort,spu.regArea,0x200); - if(xapGlobal && XAPlay!=XAFeed) // some xa + if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed) // some xa { - pF->xaS=*xapGlobal; + pF->xaS=*spu.xapGlobal; } else memset(&pF->xaS,0,sizeof(xa_decode_t)); // or clean xa pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff - pFO->spuIrq=spuIrq; - if(pSpuIrq) pFO->pSpuIrq = (unsigned long)pSpuIrq-(unsigned long)spuMemC; + pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2]; + if(spu.pSpuIrq) pFO->pSpuIrq = (unsigned long)spu.pSpuIrq-(unsigned long)spu.spuMemC; - pFO->spuAddr=spuAddr; + pFO->spuAddr=spu.spuAddr; if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d; for(i=0;is_chan[i],&s_chan[i],i); if(s_chan[i].pCurr) - pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC; + pFO->s_chan[i].iCurr=s_chan[i].pCurr-spu.spuMemC; if(s_chan[i].pLoop) - pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC; + pFO->s_chan[i].iLoop=s_chan[i].pLoop-spu.spuMemC; } return 1; @@ -266,36 +277,35 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) if(ulFreezeMode!=0) return 0; // bad mode? bye - memcpy(spuMem,pF->cSPURam,0x80000); // get ram - memcpy(regArea,pF->cSPUPort,0x200); + memcpy(spu.spuMem,pF->cSPURam,0x80000); // get ram + memcpy(spu.regArea,pF->cSPUPort,0x200); if(pF->xaS.nsamples<=4032) // start xa again SPUplayADPCMchannel(&pF->xaS); - xapGlobal=0; + spu.xapGlobal=0; if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5) LoadStateV5(pF); - else LoadStateUnknown(pF); - - lastch = -1; + else LoadStateUnknown(pF, cycles); // repair some globals for(i=0;i<=62;i+=2) - SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]); - SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]); - SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]); - SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]); + load_register(H_Reverb+i, cycles); + load_register(H_SPUReverbAddr, cycles); + load_register(H_SPUrvolL, cycles); + load_register(H_SPUrvolR, cycles); - SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000)); - SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]); - SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]); - SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]); + load_register(H_SPUctrl, cycles); + load_register(H_SPUstat, cycles); + load_register(H_CDLeft, cycles); + load_register(H_CDRight, cycles); // fix to prevent new interpolations from crashing for(i=0;ispuIrq; - if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL; + if(pFO->pSpuIrq) spu.pSpuIrq = spu.spuMemC+((long)pFO->pSpuIrq&0x7fff0); else spu.pSpuIrq=NULL; if(pFO->spuAddr) { - spuAddr = pFO->spuAddr; - if (spuAddr == 0xbaadf00d) spuAddr = 0; + spu.spuAddr = pFO->spuAddr; + if (spu.spuAddr == 0xbaadf00d) spu.spuAddr = 0; } - dwNewChannel=0; - dwChannelOn=0; - dwChannelDead=0; + spu.dwNewChannel=0; + spu.dwChannelOn=0; + spu.dwChannelDead=0; for(i=0;is_chan[i],i); - s_chan[i].pCurr+=(unsigned long)spuMemC; - s_chan[i].pLoop+=(unsigned long)spuMemC; + s_chan[i].pCurr+=(unsigned long)spu.spuMemC; + s_chan[i].pLoop+=(unsigned long)spu.spuMemC; } } //////////////////////////////////////////////////////////////////////// -void LoadStateUnknown(SPUFreeze_t * pF) +void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles) { int i; for(i=0;i +#include #include #include #include @@ -153,7 +154,20 @@ static int oss_busy(void) static void oss_feed(void *buf, int bytes) { + audio_buf_info info; + char sbuf[4096]; + if(oss_audio_fd == -1) return; + if(ioctl(oss_audio_fd,SNDCTL_DSP_GETOSPACE,&info)==0) + { + if(info.fragments==info.fragstotal) + { + memset(sbuf, 0, sizeof(sbuf)); + write(oss_audio_fd, sbuf, sizeof(sbuf)); + write(oss_audio_fd, sbuf, sizeof(sbuf)); + } + } + write(oss_audio_fd, buf, bytes); } diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c index b9c1256a..210adb2d 100644 --- a/plugins/dfsound/registers.c +++ b/plugins/dfsound/registers.c @@ -21,6 +21,7 @@ #include "externals.h" #include "registers.h" +#include "spu_config.h" static void SoundOn(int start,int end,unsigned short val); static void SoundOff(int start,int end,unsigned short val); @@ -35,10 +36,28 @@ static void ReverbOn(int start,int end,unsigned short val); // WRITE REGISTERS: called by main emu //////////////////////////////////////////////////////////////////////// -void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) +static const uint32_t ignore_dupe[8] = { + // ch 0-15 c40 c80 cc0 + 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f, + // ch 16-24 d40 control reverb + 0x7f7f7f7f, 0x7f7f7f7f, 0xff05ff0f, 0xffffffff +}; + +void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, + unsigned int cycles) { - const unsigned long r=reg&0xfff; - regArea[(r-0xc00)>>1] = val; + int r = reg & 0xfff; + int rofs = (r - 0xc00) >> 1; + int changed = spu.regArea[rofs] != val; + spu.regArea[rofs] = val; + + if (!changed && (ignore_dupe[rofs >> 5] & (1 << (rofs & 0x1f)))) + return; + // zero keyon/keyoff? + if (val == 0 && (r & 0xff8) == 0xd88) + return; + + do_samples_if_needed(cycles); if(r>=0x0c00 && r<0x0d80) // some channel info? { @@ -56,7 +75,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) //------------------------------------------------// pitch case 4: SetPitch(ch,val); - break; + goto upd_irq; //------------------------------------------------// start case 6: // taken from regArea later @@ -92,8 +111,8 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) break; //------------------------------------------------// case 14: // loop? - s_chan[ch].pLoop=spuMemC+((val&~1)<<3); - break; + s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3); + goto upd_irq; //------------------------------------------------// } return; @@ -103,23 +122,26 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) { //-------------------------------------------------// case H_SPUaddr: - spuAddr = (unsigned long) val<<3; + spu.spuAddr = (unsigned long) val<<3; break; //-------------------------------------------------// case H_SPUdata: - spuMem[spuAddr>>1] = val; - spuAddr+=2; - if(spuAddr>0x7ffff) spuAddr=0; + spu.spuMem[spu.spuAddr>>1] = val; + spu.spuAddr+=2; + if(spu.spuAddr>0x7ffff) spu.spuAddr=0; break; //-------------------------------------------------// case H_SPUctrl: - if(!(spuCtrl & CTRL_IRQ)) - spuStat&=~STAT_IRQ; - spuCtrl=val; + if (!(spu.spuCtrl & CTRL_IRQ)) { + spu.spuStat&=~STAT_IRQ; + if (val & CTRL_IRQ) + schedule_next_irq(); + } + spu.spuCtrl=val; break; //-------------------------------------------------// case H_SPUstat: - spuStat=val & 0xf800; + spu.spuStat=val&0xf800; break; //-------------------------------------------------// case H_SPUReverbAddr: @@ -132,18 +154,13 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) { rvb.StartAddr=(unsigned long)val<<2; rvb.CurrAddr=rvb.StartAddr; - // sync-with-decode-buffers hack.. - if(rvb.StartAddr==0x3ff00) - rvb.CurrAddr+=decode_pos/2; } } - rvb.dirty = 1; - break; + goto rvbd; //-------------------------------------------------// case H_SPUirqAddr: - spuIrq = val; - pSpuIrq=spuMemC+(((unsigned long) val<<3)&~0xf); - break; + spu.pSpuIrq=spu.spuMemC+(((unsigned long) val<<3)&~0xf); + goto upd_irq; //-------------------------------------------------// case H_SPUrvolL: rvb.VolLeft=val; @@ -197,12 +214,12 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) break; //-------------------------------------------------// case H_CDLeft: - iLeftXAVol=val & 0x7fff; - if(cddavCallback) cddavCallback(0,val); + spu.iLeftXAVol=val & 0x7fff; + if(spu.cddavCallback) spu.cddavCallback(0,val); break; case H_CDRight: - iRightXAVol=val & 0x7fff; - if(cddavCallback) cddavCallback(1,val); + spu.iRightXAVol=val & 0x7fff; + if(spu.cddavCallback) spu.cddavCallback(1,val); break; //-------------------------------------------------// case H_FMod1: @@ -229,42 +246,48 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) ReverbOn(16,24,val); break; //-------------------------------------------------// - case H_Reverb+0 : rvb.FB_SRC_A=val*4; break; - case H_Reverb+2 : rvb.FB_SRC_B=val*4; break; - case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; break; - case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; break; - case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; break; - case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; break; - case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; break; - case H_Reverb+14 : rvb.IIR_COEF=(short)val; break; - case H_Reverb+16 : rvb.FB_ALPHA=(short)val; break; - case H_Reverb+18 : rvb.FB_X=(short)val; break; - case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; break; - case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; break; - case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; break; - case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; break; - case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; break; - case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; break; - case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; break; - case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; break; - case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; break; - case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; break; - case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; break; - case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; break; - case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; break; - case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; break; - case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; break; - case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; break; - case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; break; - case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; break; - case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; break; - case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; break; - case H_Reverb+60 : rvb.IN_COEF_L=(short)val; break; - case H_Reverb+62 : rvb.IN_COEF_R=(short)val; break; + case H_Reverb+0 : rvb.FB_SRC_A=val*4; goto rvbd; + case H_Reverb+2 : rvb.FB_SRC_B=val*4; goto rvbd; + case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; goto rvbd; + case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; goto rvbd; + case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; goto rvbd; + case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; goto rvbd; + case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; goto rvbd; + case H_Reverb+14 : rvb.IIR_COEF=(short)val; goto rvbd; + case H_Reverb+16 : rvb.FB_ALPHA=(short)val; goto rvbd; + case H_Reverb+18 : rvb.FB_X=(short)val; goto rvbd; + case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; goto rvbd; + case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; goto rvbd; + case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; goto rvbd; + case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; goto rvbd; + case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; goto rvbd; + case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; goto rvbd; + case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; goto rvbd; + case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; goto rvbd; + case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; goto rvbd; + case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; goto rvbd; + case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; goto rvbd; + case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; goto rvbd; + case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; goto rvbd; + case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; goto rvbd; + case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; goto rvbd; + case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; goto rvbd; + case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; goto rvbd; + case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; goto rvbd; + case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; goto rvbd; + case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; goto rvbd; + case H_Reverb+60 : rvb.IN_COEF_L=(short)val; goto rvbd; + case H_Reverb+62 : rvb.IN_COEF_R=(short)val; goto rvbd; } + return; - if ((r & ~0x3f) == H_Reverb) - rvb.dirty = 1; // recalculate on next update +upd_irq: + if (spu.spuCtrl & CTRL_IRQ) + schedule_next_irq(); + return; + +rvbd: + rvb.dirty = 1; // recalculate on next update } //////////////////////////////////////////////////////////////////////// @@ -282,8 +305,8 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg) case 12: // get adsr vol { const int ch=(r>>4)-0xc0; - if(dwNewChannel&(1<>16); @@ -292,7 +315,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg) case 14: // get loop address { const int ch=(r>>4)-0xc0; - return (unsigned short)((s_chan[ch].pLoop-spuMemC)>>3); + return (unsigned short)((s_chan[ch].pLoop-spu.spuMemC)>>3); } } } @@ -300,25 +323,22 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg) switch(r) { case H_SPUctrl: - return spuCtrl; + return spu.spuCtrl; case H_SPUstat: - return spuStat; + return spu.spuStat; case H_SPUaddr: - return (unsigned short)(spuAddr>>3); + return (unsigned short)(spu.spuAddr>>3); case H_SPUdata: { - unsigned short s=spuMem[spuAddr>>1]; - spuAddr+=2; - if(spuAddr>0x7ffff) spuAddr=0; + unsigned short s=spu.spuMem[spu.spuAddr>>1]; + spu.spuAddr+=2; + if(spu.spuAddr>0x7ffff) spu.spuAddr=0; return s; } - case H_SPUirqAddr: - return spuIrq; - //case H_SPUIsOn1: // return IsSoundOn(0,16); @@ -327,7 +347,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg) } - return regArea[(r-0xc00)>>1]; + return spu.regArea[(r-0xc00)>>1]; } //////////////////////////////////////////////////////////////////////// @@ -345,13 +365,13 @@ static void SoundOn(int start,int end,unsigned short val) // do this here, not in StartSound // - fixes fussy timing issues s_chan[ch].bStop=0; - s_chan[ch].pCurr=spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned - s_chan[ch].pLoop=spuMemC+((regAreaGet(ch,14)&~1)<<3); + s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned + s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3); s_chan[ch].prevflags=2; - dwNewChannel|=(1< freq change in simple interpolation mode: set flag + s_chan[ch].sinc_inv=0; + if(spu_config.iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag } //////////////////////////////////////////////////////////////////////// diff --git a/plugins/dfsound/registers.h b/plugins/dfsound/registers.h index cb95bc15..3bca5180 100644 --- a/plugins/dfsound/registers.h +++ b/plugins/dfsound/registers.h @@ -152,5 +152,5 @@ /////////////////////////////////////////////////////////// -void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val); +void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned int cycles); diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c index ebb709bd..bb5ee8e9 100644 --- a/plugins/dfsound/reverb.c +++ b/plugins/dfsound/reverb.c @@ -26,25 +26,15 @@ // will be included from spu.c #ifdef _IN_SPU -//////////////////////////////////////////////////////////////////////// -// globals -//////////////////////////////////////////////////////////////////////// - -// REVERB info and timing vars... - -int * sRVBPlay = 0; -int * sRVBEnd = 0; -int * sRVBStart = 0; - //////////////////////////////////////////////////////////////////////// // START REVERB //////////////////////////////////////////////////////////////////////// INLINE void StartREVERB(int ch) { - if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible? + if(s_chan[ch].bReverb && (spu.spuCtrl&0x80)) // reverb possible? { - s_chan[ch].bRVBActive=!!iUseReverb; + s_chan[ch].bRVBActive=!!spu_config.iUseReverb; } else s_chan[ch].bRVBActive=0; // else -> no reverb } @@ -53,21 +43,9 @@ INLINE void StartREVERB(int ch) // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf //////////////////////////////////////////////////////////////////////// -INLINE void InitREVERB(void) -{ - memset(sRVBStart,0,NSSIZE*2*4); -} - -//////////////////////////////////////////////////////////////////////// -// STORE REVERB -//////////////////////////////////////////////////////////////////////// - -INLINE void StoreREVERB(int ch,int ns,int l,int r) +INLINE void InitREVERB(int ns_to) { - ns<<=1; - - sRVBStart[ns] +=l; // -> we mix all active reverb channels into an extra buffer - sRVBStart[ns+1]+=r; + memset(spu.sRVBStart,0,ns_to*sizeof(spu.sRVBStart[0])*2); } //////////////////////////////////////////////////////////////////////// @@ -81,36 +59,36 @@ INLINE int rvb2ram_offs(int curr, int space, int iOff) // get_buffer content helper: takes care about wraps #define g_buffer(var) \ - ((int)(signed short)spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)]) + ((int)(signed short)spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)]) // saturate iVal and store it as var #define s_buffer(var, iVal) \ ssat32_to_16(iVal); \ - spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal + spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal #define s_buffer1(var, iVal) \ ssat32_to_16(iVal); \ - spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal + spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal //////////////////////////////////////////////////////////////////////// // portions based on spu2-x from PCSX2 -static void MixREVERB(void) +static void MixREVERB(int ns_to) { int l_old = rvb.iRVBLeft; int r_old = rvb.iRVBRight; int curr_addr = rvb.CurrAddr; int space = 0x40000 - rvb.StartAddr; - int l, r, ns; + int l = 0, r = 0, ns; - for (ns = 0; ns < NSSIZE*2; ) + for (ns = 0; ns < ns_to * 2; ) { int IIR_ALPHA = rvb.IIR_ALPHA; int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1; int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1; - int input_L = sRVBStart[ns] * rvb.IN_COEF_L; - int input_R = sRVBStart[ns+1] * rvb.IN_COEF_R; + int input_L = spu.sRVBStart[ns] * rvb.IN_COEF_L; + int input_R = spu.sRVBStart[ns+1] * rvb.IN_COEF_R; int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15; int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15; @@ -180,15 +158,15 @@ static void MixREVERB(void) rvb.CurrAddr = curr_addr; } -static void MixREVERB_off(void) +static void MixREVERB_off(int ns_to) { int l_old = rvb.iRVBLeft; int r_old = rvb.iRVBRight; int curr_addr = rvb.CurrAddr; int space = 0x40000 - rvb.StartAddr; - int l, r, ns; + int l = 0, r = 0, ns; - for (ns = 0; ns < NSSIZE*2; ) + for (ns = 0; ns < ns_to * 2; ) { l = (g_buffer(MIX_DEST_A0) + g_buffer(MIX_DEST_B0)) / 2; r = (g_buffer(MIX_DEST_A1) + g_buffer(MIX_DEST_B1)) / 2; @@ -258,7 +236,7 @@ static void prepare_offsets(void) rvb.dirty = 0; } -INLINE void REVERBDo(void) +INLINE void REVERBDo(int ns_to) { if (!rvb.StartAddr) // reverb is off { @@ -266,24 +244,24 @@ INLINE void REVERBDo(void) return; } - if (spuCtrl & 0x80) // -> reverb on? oki + if (spu.spuCtrl & 0x80) // -> reverb on? oki { if (unlikely(rvb.dirty)) prepare_offsets(); - MixREVERB(); + MixREVERB(ns_to); } else if (rvb.VolLeft || rvb.VolRight) { if (unlikely(rvb.dirty)) prepare_offsets(); - MixREVERB_off(); + MixREVERB_off(ns_to); } else // -> reverb off { // reverb runs anyway - rvb.CurrAddr += NSSIZE/2; + rvb.CurrAddr += ns_to / 2; while (rvb.CurrAddr >= 0x40000) rvb.CurrAddr -= 0x40000 - rvb.StartAddr; } diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 6cefd112..ca362b7f 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -26,6 +26,7 @@ #include "registers.h" #include "out.h" #include "arm_features.h" +#include "spu_config.h" #ifdef ENABLE_NLS #include @@ -49,6 +50,9 @@ #define PSXCLK 33868800 /* 33.8688 MHz */ +// intended to be ~1 frame +#define IRQ_NEAR_BLOCKS 32 + /* #if defined (USEMACOSX) static char * libraryName = N_("Mac OS X Sound"); @@ -69,44 +73,14 @@ static char * libraryInfo = N_("P.E.Op.S. Sound Driver V1.7\nCoded by Pete B // globals -// psx buffer / addresses - -unsigned short regArea[10000]; -unsigned short spuMem[256*1024]; -unsigned char * spuMemC; -unsigned char * pSpuIrq=0; -unsigned char * pSpuBuffer; - -// user settings - -int iVolume=768; // 1024 is 1.0 -int iXAPitch=1; -int iUseReverb=2; -int iUseInterpolation=2; +SPUInfo spu; +SPUConfig spu_config; // MAIN infos struct for each channel SPUCHAN s_chan[MAXCHAN+1]; // channel + 1 infos (1 is security for fmod handling) REVERBInfo rvb; -unsigned int dwNoiseVal; // global noise generator -unsigned int dwNoiseCount; - -unsigned short spuCtrl=0; // some vars to store psx reg infos -unsigned short spuStat=0; -unsigned short spuIrq=0; -unsigned long spuAddr=0xffffffff; // address into spu mem -int bSpuInit=0; -int bSPUIsOpen=0; - -unsigned int dwNewChannel=0; // flags for faster testing, if new channel starts -unsigned int dwChannelOn=0; // not silent channels -unsigned int dwPendingChanOff=0; -unsigned int dwChannelDead=0; // silent+not useful channels - -void (CALLBACK *irqCallback)(void)=0; // func of main emu, called on spu irq -void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0; - // certain globals (were local before, but with the new timeproc I need em global) static const int f[8][2] = { { 0, 0 }, @@ -114,18 +88,9 @@ static const int f[8][2] = { { 0, 0 }, { 115, -52 }, { 98, -55 }, { 122, -60 } }; -int ChanBuf[NSSIZE+3]; -int SSumLR[(NSSIZE+3)*2]; +int ChanBuf[NSSIZE]; +int SSumLR[NSSIZE*2]; int iFMod[NSSIZE]; -int iCycle = 0; -short * pS; - -static int decode_dirty_ch; -int decode_pos; -int had_dma; -int lastch=-1; // last channel processed on spu irq in timer mode -static int lastns=0; // last ns pos -static int cycles_since_update; #define CDDA_BUFFER_SIZE (16384 * sizeof(uint32_t)) // must be power of 2 @@ -243,7 +208,7 @@ INLINE void InterpolateDown(int ch) //////////////////////////////////////////////////////////////////////// // helpers for gauss interpolation -#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos]) +#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos&3]) #define gval(x) ((int)((short*)(&s_chan[ch].SB[29]))[(gpos+x)&3]) #include "gauss_i.h" @@ -254,18 +219,18 @@ INLINE void InterpolateDown(int ch) static void do_irq(void) { - //if(!(spuStat & STAT_IRQ)) + //if(!(spu.spuStat & STAT_IRQ)) { - spuStat |= STAT_IRQ; // asserted status? - if(irqCallback) irqCallback(); + spu.spuStat |= STAT_IRQ; // asserted status? + if(spu.irqCallback) spu.irqCallback(); } } static int check_irq(int ch, unsigned char *pos) { - if((spuCtrl & CTRL_IRQ) && pos == pSpuIrq) + if((spu.spuCtrl & CTRL_IRQ) && pos == spu.pSpuIrq) { - //printf("ch%d irq %04x\n", ch, pos - spuMemC); + //printf("ch%d irq %04x\n", ch, pos - spu.spuMemC); do_irq(); return 1; } @@ -293,11 +258,11 @@ INLINE void StartSound(int ch) s_chan[ch].SB[29]=0; // init our interpolation helpers s_chan[ch].SB[30]=0; - if(iUseInterpolation>=2) // gauss interpolation? + if(spu_config.iUseInterpolation>=2) // gauss interpolation? {s_chan[ch].spos=0x30000L;s_chan[ch].SB[28]=0;} // -> start with more decoding else {s_chan[ch].spos=0x10000L;s_chan[ch].SB[31]=0;} // -> no/simple interpolation starts with one 44100 decoding - dwNewChannel&=~(1<=2) // gauss/cubic interpolation + if(spu_config.iUseInterpolation>=2) // gauss/cubic interpolation { int gpos = s_chan[ch].SB[28]; gval0 = fa; @@ -340,7 +305,7 @@ INLINE void StoreInterpolationVal(int ch,int fa) s_chan[ch].SB[28] = gpos; } else - if(iUseInterpolation==1) // simple interpolation + if(spu_config.iUseInterpolation==1) // simple interpolation { s_chan[ch].SB[28] = 0; s_chan[ch].SB[29] = s_chan[ch].SB[30]; // -> helpers for simple linear interpolation: delay real val for two slots, and calc the two deltas, for a 'look at the future behaviour' @@ -360,7 +325,7 @@ INLINE int iGetInterpolationVal(int ch, int spos) if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29]; - switch(iUseInterpolation) + switch(spu_config.iUseInterpolation) { //--------------------------------------------------// case 3: // cubic interpolation @@ -448,7 +413,7 @@ static int decode_block(int ch) int ret = 0; start = s_chan[ch].pCurr; // set up the current pos - if(start == spuMemC) // ? + if(start == spu.spuMemC) // ? stop = 1; if(s_chan[ch].prevflags&1) // 1: stop/loop @@ -463,7 +428,7 @@ static int decode_block(int ch) if(stop) { - dwChannelOn &= ~(1< turn everything off + spu.dwChannelOn &= ~(1< turn everything off s_chan[ch].bStop = 1; s_chan[ch].ADSRX.EnvelopeVol = 0; } @@ -485,8 +450,8 @@ static int decode_block(int ch) ret |= check_irq(ch, start); // hack.. :( } - if (start - spuMemC >= 0x80000) - start = spuMemC; + if (start - spu.spuMemC >= 0x80000) + start = spu.spuMemC; s_chan[ch].pCurr = start; // store values for next cycle s_chan[ch].prevflags = flags; @@ -518,8 +483,48 @@ static int skip_block(int ch) return ret; } +// if irq is going to trigger sooner than in upd_samples, set upd_samples +static void scan_for_irq(int ch, unsigned int *upd_samples) +{ + int pos, sinc, sinc_inv, end; + unsigned char *block; + int flags; + + block = s_chan[ch].pCurr; + pos = s_chan[ch].spos; + sinc = s_chan[ch].sinc; + end = pos + *upd_samples * sinc; + + pos += (28 - s_chan[ch].iSBPos) << 16; + while (pos < end) + { + if (block == spu.pSpuIrq) + break; + flags = block[1]; + block += 16; + if (flags & 1) { // 1: stop/loop + block = s_chan[ch].pLoop; + if (block == spu.pSpuIrq) // hack.. (see decode_block) + break; + } + pos += 28 << 16; + } + + if (pos < end) + { + sinc_inv = s_chan[ch].sinc_inv; + if (sinc_inv == 0) + sinc_inv = s_chan[ch].sinc_inv = (0x80000000u / (uint32_t)sinc) << 1; + + pos -= s_chan[ch].spos; + *upd_samples = (((uint64_t)pos * sinc_inv) >> 32) + 1; + //xprintf("ch%02d: irq sched: %3d %03d\n", + // ch, *upd_samples, *upd_samples * 60 * 263 / 44100); + } +} + #define make_do_samples(name, fmod_code, interp_start, interp1_code, interp2_code, interp_end) \ -static int do_samples_##name(int ch, int ns, int ns_to) \ +static noinline int do_samples_##name(int ch, int ns, int ns_to) \ { \ int sinc = s_chan[ch].sinc; \ int spos = s_chan[ch].spos; \ @@ -533,23 +538,23 @@ static int do_samples_##name(int ch, int ns, int ns_to) \ { \ fmod_code; \ \ + spos += sinc; \ while (spos >= 0x10000) \ { \ - if(sbpos == 28) \ + fa = SB[sbpos++]; \ + if(sbpos >= 28) \ { \ sbpos = 0; \ d = decode_block(ch); \ if(d) \ - ret = ns_to = ns + 1; \ + ret = /*ns_to =*/ ns + 1; \ } \ \ - fa = SB[sbpos++]; \ interp1_code; \ spos -= 0x10000; \ } \ \ interp2_code; \ - spos += sinc; \ } \ \ s_chan[ch].sinc = sinc; \ @@ -585,7 +590,7 @@ make_do_samples(noint, , fa = s_chan[ch].SB[29], , ChanBuf[ns] = fa, s_chan[ch]. make_do_samples(simple, , , simple_interp_store, simple_interp_get, ) -static int do_samples_noise(int ch, int ns, int ns_to) +static noinline int do_samples_noise(int ch, int ns, int ns_to) { int level, shift, bit; int ret = -1, d; @@ -600,23 +605,23 @@ static int do_samples_noise(int ch, int ns, int ns_to) } // modified from DrHell/shalma, no fraction - level = (spuCtrl >> 10) & 0x0f; + level = (spu.spuCtrl >> 10) & 0x0f; level = 0x8000 >> level; for (; ns < ns_to; ns++) { - dwNoiseCount += 2; - if (dwNoiseCount >= level) + spu.dwNoiseCount += 2; + if (spu.dwNoiseCount >= level) { - dwNoiseCount -= level; - shift = (dwNoiseVal >> 10) & 0x1f; + spu.dwNoiseCount -= level; + shift = (spu.dwNoiseVal >> 10) & 0x1f; bit = (0x69696969 >> shift) & 1; - if (dwNoiseVal & 0x8000) + if (spu.dwNoiseVal & 0x8000) bit ^= 1; - dwNoiseVal = (dwNoiseVal << 1) | bit; + spu.dwNoiseVal = (spu.dwNoiseVal << 1) | bit; } - ChanBuf[ns] = (signed short)dwNoiseVal; + ChanBuf[ns] = (signed short)spu.dwNoiseVal; } return ret; @@ -625,7 +630,7 @@ static int do_samples_noise(int ch, int ns, int ns_to) #ifdef HAVE_ARMV5 // asm code; lv and rv must be 0-3fff extern void mix_chan(int start, int count, int lv, int rv); -extern void mix_chan_rvb(int start, int count, int lv, int rv); +extern void mix_chan_rvb(int start, int count, int lv, int rv, int *rvb); #else static void mix_chan(int start, int count, int lv, int rv) { @@ -644,10 +649,10 @@ static void mix_chan(int start, int count, int lv, int rv) } } -static void mix_chan_rvb(int start, int count, int lv, int rv) +static void mix_chan_rvb(int start, int count, int lv, int rv, int *rvb) { int *dst = SSumLR + start * 2; - int *drvb = sRVBStart + start * 2; + int *drvb = rvb + start * 2; const int *src = ChanBuf + start; int l, r; @@ -667,11 +672,11 @@ static void mix_chan_rvb(int start, int count, int lv, int rv) // 0x0800-0x0bff Voice 1 // 0x0c00-0x0fff Voice 3 -static void noinline do_decode_bufs(int which, int start, int count) +static noinline void do_decode_bufs(int which, int start, int count) { const int *src = ChanBuf + start; - unsigned short *dst = &spuMem[0x800/2 + which*0x400/2]; - int cursor = decode_pos + start; + unsigned short *dst = &spu.spuMem[0x800/2 + which*0x400/2]; + int cursor = spu.decode_pos + start; while (count-- > 0) { @@ -689,83 +694,111 @@ static void noinline do_decode_bufs(int which, int start, int count) // basically the whole sound processing is done in this fat func! //////////////////////////////////////////////////////////////////////// -static int do_samples(int forced_updates) +void do_samples(unsigned int cycles_to) { - int volmult = iVolume; - int ns,ns_from,ns_to; + const int ns_from = 0; + int ns,ns_to,ns_len; + int volmult = spu_config.iVolume; int ch,d,silentch; - int bIRQReturn=0; + int cycle_diff; - // ok, at the beginning we are looking if there is - // enuff free place in the dsound/oss buffer to - // fill in new data, or if there is a new channel to start. - // if not, we return until enuff free place is available - // /a new channel gets started + cycle_diff = cycles_to - spu.cycles_played; + if (cycle_diff < -2*1048576 || cycle_diff > 2*1048576) + { + //xprintf("desync %u %d\n", cycles_to, cycle_diff); + spu.cycles_played = cycles_to; + return; + } - if(!forced_updates && out_current->busy()) // still enuff data in sound buffer? - return 0; + if (cycle_diff < 2 * 768) + return; - while(!bIRQReturn) - { - ns_from=0; - ns_to=NSSIZE; - ch=0; - if(lastch>=0) // will be -1 if no continue is pending - { - ch=lastch; ns_from=lastns; lastch=-1; // -> setup all kind of vars to continue - } + ns_to = (cycle_diff / 768 + 1) & ~1; + if (ns_to > NSSIZE) { + // should never happen + //xprintf("ns_to oflow %d %d\n", ns_to, NSSIZE); + ns_to = NSSIZE; + } + + ////////////////////////////////////////////////////// + // special irq handling in the decode buffers (0x0000-0x1000) + // we know: + // the decode buffers are located in spu memory in the following way: + // 0x0000-0x03ff CD audio left + // 0x0400-0x07ff CD audio right + // 0x0800-0x0bff Voice 1 + // 0x0c00-0x0fff Voice 3 + // and decoded data is 16 bit for one sample + // we assume: + // even if voices 1/3 are off or no cd audio is playing, the internal + // play positions will move on and wrap after 0x400 bytes. + // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and + // increase this pointer on each sample by 2 bytes. If this pointer + // (or 0x400 offsets of this pointer) hits the spuirq address, we generate + // an IRQ. + + if (unlikely((spu.spuCtrl & CTRL_IRQ) + && spu.pSpuIrq && spu.pSpuIrq < spu.spuMemC+0x1000)) + { + int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff; + int left = (irq_pos - spu.decode_pos) & 0x1ff; + if (0 < left && left <= ns_to) + { + //xprintf("decoder irq %x\n", spu.decode_pos); + do_irq(); + } + } - silentch=~(dwChannelOn|dwNewChannel); + InitREVERB(ns_to); + + { + silentch=~(spu.dwChannelOn|spu.dwNewChannel); //--------------------------------------------------// //- main channel loop -// //--------------------------------------------------// { - for(;ch=0) - { - bIRQReturn=1; - lastch=ch; - lastns=ns_to=d; - } + do_samples_default(ch, ns_from, ns_to); + + ns_len = ns_to - ns_from; MixADSR(ch, ns_from, ns_to); if(ch==1 || ch==3) { - do_decode_bufs(ch/2, ns_from, ns_to-ns_from); - decode_dirty_ch |= 1< pSpuIrq && s_chan[ch].pLoop > pSpuIrq) + if(spu.dwChannelDead&(1< spu.pSpuIrq && s_chan[ch].pLoop > spu.pSpuIrq) continue; s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns_from); @@ -773,12 +806,11 @@ static int do_samples(int forced_updates) { unsigned char *start = s_chan[ch].pCurr; - // no need for bIRQReturn since the channel is silent skip_block(ch); - if(start == s_chan[ch].pCurr || start - spuMemC < 0x1000) + if(start == s_chan[ch].pCurr || start - spu.spuMemC < 0x1000) { // looping on self or stopped(?) - dwChannelDead |= 1<> 10; ssat32_to_16(d); - *pS++ = d; + *spu.pS++ = d; ns++; d = SSumLR[ns]; SSumLR[ns] = 0; d = d * volmult >> 10; ssat32_to_16(d); - *pS++ = d; + *spu.pS++ = d; ns++; } - cycles_since_update -= PSXCLK / 44100 * NSSIZE; + spu.cycles_played += ns_to * 768; - ////////////////////////////////////////////////////// - // special irq handling in the decode buffers (0x0000-0x1000) - // we know: - // the decode buffers are located in spu memory in the following way: - // 0x0000-0x03ff CD audio left - // 0x0400-0x07ff CD audio right - // 0x0800-0x0bff Voice 1 - // 0x0c00-0x0fff Voice 3 - // and decoded data is 16 bit for one sample - // we assume: - // even if voices 1/3 are off or no cd audio is playing, the internal - // play positions will move on and wrap after 0x400 bytes. - // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and - // increase this pointer on each sample by 2 bytes. If this pointer - // (or 0x400 offsets of this pointer) hits the spuirq address, we generate - // an IRQ. Only problem: the "wait for cpu" option is kinda hard to do here - // in some of Peops timer modes. So: we ignore this option here (for now). - - if(unlikely((spuCtrl&CTRL_IRQ) && pSpuIrq && pSpuIrq 0x200 && irq_pos < ((decode_pos+NSSIZE) & 0x1ff))) - { - //printf("decoder irq %x\n", decode_pos); - do_irq(); - bIRQReturn = 1; - } - } - decode_pos = (decode_pos + NSSIZE) & 0x1ff; + spu.decode_pos = (spu.decode_pos + ns_to) & 0x1ff; + } +} - InitREVERB(); +void schedule_next_irq(void) +{ + unsigned int upd_samples; + int ch; - // feed the sound - // wanna have around 1/60 sec (16.666 ms) updates - if (iCycle++ >= 16/FRAG_MSECS) - { - out_current->feed(pSpuBuffer, (unsigned char *)pS - pSpuBuffer); - pS = (short *)pSpuBuffer; - iCycle = 0; + if (spu.scheduleCallback == NULL) + return; - if(!forced_updates && out_current->busy()) - break; - } + upd_samples = 44100 / 50; - if(forced_updates > 0) - { - forced_updates--; - if(forced_updates == 0 && out_current->busy()) - break; - } + for (ch = 0; ch < MAXCHAN; ch++) + { + if (spu.dwChannelDead & (1 << ch)) + continue; + if ((unsigned long)(spu.pSpuIrq - s_chan[ch].pCurr) > IRQ_NEAR_BLOCKS * 16 + && (unsigned long)(spu.pSpuIrq - s_chan[ch].pLoop) > IRQ_NEAR_BLOCKS * 16) + continue; - if(cycles_since_update <= -PSXCLK/60 / 4) - break; + scan_for_irq(ch, &upd_samples); } - // this may cause desync, but help audio when the emu can't keep up.. - if(cycles_since_update < 0) - cycles_since_update = 0; + if (unlikely(spu.pSpuIrq < spu.spuMemC + 0x1000)) + { + int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff; + int left = (irq_pos - spu.decode_pos) & 0x1ff; + if (0 < left && left < upd_samples) { + //xprintf("decode: %3d (%3d/%3d)\n", left, spu.decode_pos, irq_pos); + upd_samples = left; + } + } - return 0; + if (upd_samples < 44100 / 50) + spu.scheduleCallback(upd_samples * 768); } // SPU ASYNC... even newer epsxe func // 1 time every 'cycle' cycles... harhar -// rearmed: called every 2ms now +// rearmed: called dynamically now -void CALLBACK SPUasync(unsigned long cycle) +void CALLBACK SPUasync(unsigned int cycle, unsigned int flags) { - int forced_updates = 0; - int do_update = 0; + do_samples(cycle); - if(!bSpuInit) return; // -> no init, no call + if (spu.spuCtrl & CTRL_IRQ) + schedule_next_irq(); - cycles_since_update += cycle; + if (flags & 1) { + out_current->feed(spu.pSpuBuffer, (unsigned char *)spu.pS - spu.pSpuBuffer); + spu.pS = (short *)spu.pSpuBuffer; - if(dwNewChannel || had_dma) - { - forced_updates = 1; - do_update = 1; - had_dma = 0; + if (spu_config.iTempo) { + if (!out_current->busy()) + // cause more samples to be generated + // (and break some games because of bad sync) + spu.cycles_played -= 44100 / 60 / 2 * 768; } - - if(cycles_since_update > PSXCLK/60 * 5/4) - do_update = 1; - - if(do_update) - do_samples(forced_updates); + } } // SPU UPDATE... new epsxe func @@ -939,7 +939,6 @@ void CALLBACK SPUasync(unsigned long cycle) void CALLBACK SPUupdate(void) { - SPUasync(0); } // XA AUDIO @@ -966,7 +965,7 @@ void ClearWorkingState(void) { memset(SSumLR,0,sizeof(SSumLR)); // init some mixing buffers memset(iFMod,0,sizeof(iFMod)); - pS=(short *)pSpuBuffer; // setup soundbuffer pointer + spu.pS=(short *)spu.pSpuBuffer; // setup soundbuffer pointer } // SETUPSTREAMS: init most of the spu buffers @@ -974,54 +973,46 @@ void SetupStreams(void) { int i; - pSpuBuffer=(unsigned char *)malloc(32768); // alloc mixing buffer + spu.pSpuBuffer = (unsigned char *)malloc(32768); // alloc mixing buffer + spu.sRVBStart = (int *)malloc(NSSIZE*2*4); // alloc reverb buffer + memset(spu.sRVBStart,0,NSSIZE*2*4); - if(iUseReverb==1) i=88200*2; - else i=NSSIZE*2; - - sRVBStart = (int *)malloc(i*4); // alloc reverb buffer - memset(sRVBStart,0,i*4); - sRVBEnd = sRVBStart + i; - sRVBPlay = sRVBStart; - - XAStart = // alloc xa buffer + spu.XAStart = // alloc xa buffer (uint32_t *)malloc(44100 * sizeof(uint32_t)); - XAEnd = XAStart + 44100; - XAPlay = XAStart; - XAFeed = XAStart; + spu.XAEnd = spu.XAStart + 44100; + spu.XAPlay = spu.XAStart; + spu.XAFeed = spu.XAStart; - CDDAStart = // alloc cdda buffer + spu.CDDAStart = // alloc cdda buffer (uint32_t *)malloc(CDDA_BUFFER_SIZE); - CDDAEnd = CDDAStart + 16384; - CDDAPlay = CDDAStart; - CDDAFeed = CDDAStart; + spu.CDDAEnd = spu.CDDAStart + 16384; + spu.CDDAPlay = spu.CDDAStart; + spu.CDDAFeed = spu.CDDAStart; for(i=0;i init sustain - s_chan[i].pLoop=spuMemC; - s_chan[i].pCurr=spuMemC; + s_chan[i].ADSRX.SustainIncrease = 1; + s_chan[i].pLoop=spu.spuMemC; + s_chan[i].pCurr=spu.spuMemC; } ClearWorkingState(); - bSpuInit=1; // flag: we are inited + spu.bSpuInit=1; // flag: we are inited } // REMOVESTREAMS: free most buffer void RemoveStreams(void) { - free(pSpuBuffer); // free mixing buffer - pSpuBuffer = NULL; - free(sRVBStart); // free reverb buffer - sRVBStart = NULL; - free(XAStart); // free XA buffer - XAStart = NULL; - free(CDDAStart); // free CDDA buffer - CDDAStart = NULL; + free(spu.pSpuBuffer); // free mixing buffer + spu.pSpuBuffer = NULL; + free(spu.sRVBStart); // free reverb buffer + spu.sRVBStart = NULL; + free(spu.XAStart); // free XA buffer + spu.XAStart = NULL; + free(spu.CDDAStart); // free CDDA buffer + spu.CDDAStart = NULL; } // INIT/EXIT STUFF @@ -1029,31 +1020,31 @@ void RemoveStreams(void) // SPUINIT: this func will be called first by the main emu long CALLBACK SPUinit(void) { - spuMemC = (unsigned char *)spuMem; // just small setup + spu.spuMemC = (unsigned char *)spu.spuMem; // just small setup memset((void *)&rvb, 0, sizeof(REVERBInfo)); InitADSR(); - spuIrq = 0; - spuAddr = 0xffffffff; - spuMemC = (unsigned char *)spuMem; - decode_pos = 0; - memset((void *)s_chan, 0, (MAXCHAN + 1) * sizeof(SPUCHAN)); - pSpuIrq = 0; - lastch = -1; + spu.spuAddr = 0xffffffff; + spu.decode_pos = 0; + memset((void *)s_chan, 0, sizeof(s_chan)); + spu.pSpuIrq = 0; SetupStreams(); // prepare streaming + if (spu_config.iVolume == 0) + spu_config.iVolume = 768; // 1024 is 1.0 + return 0; } // SPUOPEN: called by main emu after init long CALLBACK SPUopen(void) { - if (bSPUIsOpen) return 0; // security for some stupid main emus + if (spu.bSPUIsOpen) return 0; // security for some stupid main emus SetupSound(); // setup sound (before init!) - bSPUIsOpen = 1; + spu.bSPUIsOpen = 1; return PSE_SPU_ERR_SUCCESS; } @@ -1061,9 +1052,9 @@ long CALLBACK SPUopen(void) // SPUCLOSE: called before shutdown long CALLBACK SPUclose(void) { - if (!bSPUIsOpen) return 0; // some security + if (!spu.bSPUIsOpen) return 0; // some security - bSPUIsOpen = 0; // no more open + spu.bSPUIsOpen = 0; // no more open out_current->finish(); // no more sound handling @@ -1075,7 +1066,7 @@ long CALLBACK SPUshutdown(void) { SPUclose(); RemoveStreams(); // no more streaming - bSpuInit=0; + spu.bSpuInit=0; return 0; } @@ -1112,12 +1103,17 @@ void CALLBACK SPUabout(void) // passes a callback that should be called on SPU-IRQ/cdda volume change void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void)) { - irqCallback = callback; + spu.irqCallback = callback; } void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned short,unsigned short)) { - cddavCallback = CDDAVcallback; + spu.cddavCallback = CDDAVcallback; +} + +void CALLBACK SPUregisterScheduleCb(void (CALLBACK *callback)(unsigned int)) +{ + spu.scheduleCallback = callback; } // COMMON PLUGIN INFO FUNCS @@ -1150,18 +1146,18 @@ void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int for(;ch 0) + if(spu.XAPlay != spu.XAFeed || spu.XARepeat > 0) { - if(XAPlay == XAFeed) - XARepeat--; + if(spu.XAPlay == spu.XAFeed) + spu.XARepeat--; - v = XALastVal; - for(ns=0;ns> 15; - r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15; + l = ((int)(short)v * spu.iLeftXAVol) >> 15; + r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15; SSumLR[ns++] += l; SSumLR[ns++] += r; - spuMem[cursor] = v; - spuMem[cursor + 0x400/2] = v >> 16; + spu.spuMem[cursor] = v; + spu.spuMem[cursor + 0x400/2] = v >> 16; cursor = (cursor + 1) & 0x1ff; } - XALastVal = v; + spu.XALastVal = v; } - for(ns=0;ns> 15; - r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15; + l = ((int)(short)v * spu.iLeftXAVol) >> 15; + r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15; SSumLR[ns++] += l; SSumLR[ns++] += r; - spuMem[cursor] = v; - spuMem[cursor + 0x400/2] = v >> 16; + spu.spuMem[cursor] = v; + spu.spuMem[cursor + 0x400/2] = v >> 16; cursor = (cursor + 1) & 0x1ff; } } @@ -121,10 +103,10 @@ INLINE void FeedXA(xa_decode_t *xap) { int sinc,spos,i,iSize,iPlace,vl,vr; - if(!bSPUIsOpen) return; + if(!spu.bSPUIsOpen) return; - xapGlobal = xap; // store info for save states - XARepeat = 100; // set up repeat + spu.xapGlobal = xap; // store info for save states + spu.XARepeat = 100; // set up repeat #if 0//def XA_HACK iSize=((45500*xap->nsamples)/xap->freq); // get size @@ -133,13 +115,13 @@ INLINE void FeedXA(xa_decode_t *xap) #endif if(!iSize) return; // none? bye - if(XAFeedpcm; uint32_t l=0; - if(iXAPitch) + if(spu_config.iXAPitch) { int32_t l1,l2;short s; for(i=0;i=0x10000L) { @@ -231,12 +213,12 @@ INLINE void FeedXA(xa_decode_t *xap) ssat32_to_16(l2); l=(l1&0xffff)|(l2<<16); - *XAFeed++=l; + *spu.XAFeed++=l; - if(XAFeed==XAEnd) XAFeed=XAStart; - if(XAFeed==XAPlay) + if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart; + if(spu.XAFeed==spu.XAPlay) { - if(XAPlay!=XAStart) XAFeed=XAPlay-1; + if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1; break; } @@ -247,7 +229,7 @@ INLINE void FeedXA(xa_decode_t *xap) { for(i=0;i=0x10000L) { @@ -278,12 +260,12 @@ INLINE void FeedXA(xa_decode_t *xap) } } - *XAFeed++=l; + *spu.XAFeed++=l; - if(XAFeed==XAEnd) XAFeed=XAStart; - if(XAFeed==XAPlay) + if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart; + if(spu.XAFeed==spu.XAPlay) { - if(XAPlay!=XAStart) XAFeed=XAPlay-1; + if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1; break; } @@ -296,12 +278,12 @@ INLINE void FeedXA(xa_decode_t *xap) unsigned short * pS=(unsigned short *)xap->pcm; uint32_t l;short s=0; - if(iXAPitch) + if(spu_config.iXAPitch) { int32_t l1; for(i=0;i=0x10000L) { @@ -330,12 +312,12 @@ INLINE void FeedXA(xa_decode_t *xap) l1=(l1*iPlace)/iSize; ssat32_to_16(l1); l=(l1&0xffff)|(l1<<16); - *XAFeed++=l; + *spu.XAFeed++=l; - if(XAFeed==XAEnd) XAFeed=XAStart; - if(XAFeed==XAPlay) + if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart; + if(spu.XAFeed==spu.XAPlay) { - if(XAPlay!=XAStart) XAFeed=XAPlay-1; + if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1; break; } @@ -346,7 +328,7 @@ INLINE void FeedXA(xa_decode_t *xap) { for(i=0;i=0x10000L) { @@ -372,12 +354,12 @@ INLINE void FeedXA(xa_decode_t *xap) } l &= 0xffff; - *XAFeed++=(l|(l<<16)); + *spu.XAFeed++=(l|(l<<16)); - if(XAFeed==XAEnd) XAFeed=XAStart; - if(XAFeed==XAPlay) + if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart; + if(spu.XAFeed==spu.XAPlay) { - if(XAPlay!=XAStart) XAFeed=XAPlay-1; + if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1; break; } @@ -394,21 +376,21 @@ INLINE void FeedXA(xa_decode_t *xap) INLINE int FeedCDDA(unsigned char *pcm, int nBytes) { int space; - space=(CDDAPlay-CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1); + space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1); if(space0) { - if(CDDAFeed==CDDAEnd) CDDAFeed=CDDAStart; - space=(CDDAPlay-CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1); - if(CDDAFeed+space/4>CDDAEnd) - space=(CDDAEnd-CDDAFeed)*4; + if(spu.CDDAFeed==spu.CDDAEnd) spu.CDDAFeed=spu.CDDAStart; + space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1); + if(spu.CDDAFeed+space/4>spu.CDDAEnd) + space=(spu.CDDAEnd-spu.CDDAFeed)*4; if(space>nBytes) space=nBytes; - memcpy(CDDAFeed,pcm,space); - CDDAFeed+=space/4; + memcpy(spu.CDDAFeed,pcm,space); + spu.CDDAFeed+=space/4; nBytes-=space; pcm+=space; } diff --git a/plugins/gpu_neon/psx_gpu/common.h b/plugins/gpu_neon/psx_gpu/common.h index 6c2a99b5..d5cf3e91 100644 --- a/plugins/gpu_neon/psx_gpu/common.h +++ b/plugins/gpu_neon/psx_gpu/common.h @@ -1,18 +1,6 @@ #ifndef COMMON_H #define COMMON_H -#include - -#ifdef NEON_PC -typedef int8_t s8; -typedef uint8_t u8; -typedef int16_t s16; -typedef uint16_t u16; -typedef int32_t s32; -typedef uint32_t u32; -typedef int64_t s64; -typedef uint64_t u64; -#else typedef signed char s8; typedef unsigned char u8; typedef signed short s16; @@ -21,8 +9,8 @@ typedef signed int s32; typedef unsigned int u32; typedef signed long long int s64; typedef unsigned long long int u64; -#endif +#include #include #include #include diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu.c b/plugins/gpu_neon/psx_gpu/psx_gpu.c index 24f663b8..e113f064 100644 --- a/plugins/gpu_neon/psx_gpu/psx_gpu.c +++ b/plugins/gpu_neon/psx_gpu/psx_gpu.c @@ -4130,11 +4130,7 @@ void setup_sprite_untextured_simple(psx_gpu_struct *psx_gpu, s32 x, s32 y, num_width = width; vram_ptr = (void *)vram_ptr16; -#ifdef NEON_PC - if((int32_t)vram_ptr16 & 2) -#else if((long)vram_ptr16 & 2) -#endif { *vram_ptr16 = color_32bpp; vram_ptr = (void *)(vram_ptr16 + 1); diff --git a/plugins/gpu_neon/psx_gpu_if.c b/plugins/gpu_neon/psx_gpu_if.c index 86103f33..ad017614 100644 --- a/plugins/gpu_neon/psx_gpu_if.c +++ b/plugins/gpu_neon/psx_gpu_if.c @@ -8,7 +8,7 @@ * See the COPYING file in the top-level directory. */ -#include +#include #include extern const unsigned char cmd_lengths[256]; diff --git a/plugins/spunull/spunull.c b/plugins/spunull/spunull.c index 4390be30..96bd3906 100644 --- a/plugins/spunull/spunull.c +++ b/plugins/spunull/spunull.c @@ -59,7 +59,7 @@ void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0; // CODE AREA //////////////////////////////////////////////////////////////////////// -void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) +void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned int cycles) { unsigned long r=reg&0xfff; regArea[(r-0xc00)>>1] = val; @@ -252,7 +252,7 @@ void CALLBACK SPUwriteDMA(unsigned short val) //////////////////////////////////////////////////////////////////////// -void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize) +void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize,unsigned int cycles) { int i; for(i=0;i