Syncs upstream and libretro trees, leaving out NEON_PC change.
# 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)
# Makefile for PCSX ReARMed (libretro)
-DEBUG=1
-MMAP_WIN32=0
-
ifeq ($(platform),)
platform = unix
ifeq ($(shell uname -a),)
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")
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
"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) {
}
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;
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);
}
-Subproject commit da0cc55643353ab15725194be64a3d8460fe48b1
+Subproject commit d1453cf7e6d5d6758cc5d72c6d3af7d37156bf72
#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"
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;
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);
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)
#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 },
};
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";
}
#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();
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;
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();
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);
/* 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;
#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
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];
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;
}
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)
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; }
#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"
#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];
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);
}
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),
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,
};
return 0;
}
-void plat_trigger_vibrate(int is_strong)
+void plat_trigger_vibrate(int pad, int low, int high)
{
}
{ 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();
plat_omap_gvideo_open();
}
-void plat_trigger_vibrate(int is_strong)
+void plat_trigger_vibrate(int pad, int low, int high)
{
}
{ 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];
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
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) {
{ 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;
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;
return 0;
}
-void plat_trigger_vibrate(int is_strong)
+void plat_trigger_vibrate(int pad, int low, int high)
{
}
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 */
DIRECT_SPU(SPUplayADPCMchannel),
DIRECT_SPU(SPUfreeze),
DIRECT_SPU(SPUregisterCallback),
+ DIRECT_SPU(SPUregisterScheduleCb),
DIRECT_SPU(SPUasync),
DIRECT_SPU(SPUplayCDDAchannel),
/* PAD */
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) { \
extern "C" {
#endif
-#include <stdint.h>
-
// header version
#define _PPDK_HEADER_VERSION 3
// 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;
// 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);
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);
[PSXINT_CDRDMA] = cdrDmaInterrupt,
[PSXINT_CDRLID] = cdrLidSeekInterrupt,
[PSXINT_CDRPLAY] = cdrPlayInterrupt,
+ [PSXINT_SPU_UPDATE] = spuUpdate,
[PSXINT_RCNT] = psxRcntUpdate,
};
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)
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)
SPUplayADPCMchannel SPU_playADPCMchannel;\r
SPUfreeze SPU_freeze;\r
SPUregisterCallback SPU_registerCallback;\r
+SPUregisterScheduleCb SPU_registerScheduleCb;\r
SPUasync SPU_async;\r
SPUplayCDDAchannel SPU_playCDDAchannel;\r
\r
long CALLBACK SPU__configure(void) { return 0; }\r
void CALLBACK SPU__about(void) {}\r
long CALLBACK SPU__test(void) { return 0; }\r
+void CALLBACK SPU__registerScheduleCb(void (CALLBACK *cb)(unsigned int)) {}\r
\r
#define LoadSpuSym1(dest, name) \\r
LoadSym(SPU_##dest, SPU##dest, name, TRUE);\r
LoadSpuSym1(playADPCMchannel, "SPUplayADPCMchannel");\r
LoadSpuSym1(freeze, "SPUfreeze");\r
LoadSpuSym1(registerCallback, "SPUregisterCallback");\r
+ LoadSpuSym0(registerScheduleCb, "SPUregisterScheduleCb");\r
LoadSpuSymN(async, "SPUasync");\r
LoadSpuSymN(playCDDAchannel, "SPUplayCDDAchannel");\r
\r
typedef long (CALLBACK* SPUshutdown)(void); \r
typedef long (CALLBACK* SPUclose)(void); \r
typedef void (CALLBACK* SPUplaySample)(unsigned char); \r
-typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short);\r
+typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short, unsigned int);\r
typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long);\r
typedef void (CALLBACK* SPUwriteDMA)(unsigned short);\r
typedef unsigned short (CALLBACK* SPUreadDMA)(void);\r
-typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int);\r
-typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int);\r
+typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int, unsigned int);\r
+typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int, unsigned int);\r
typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *);\r
typedef void (CALLBACK* SPUregisterCallback)(void (CALLBACK *callback)(void));\r
+typedef void (CALLBACK* SPUregisterScheduleCb)(void (CALLBACK *callback)(unsigned int cycles_after));\r
typedef long (CALLBACK* SPUconfigure)(void);\r
typedef long (CALLBACK* SPUtest)(void);\r
typedef void (CALLBACK* SPUabout)(void);\r
xa_decode_t xa;\r
unsigned char *SPUInfo;\r
} SPUFreeze_t;\r
-typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *);\r
-typedef void (CALLBACK* SPUasync)(uint32_t);\r
+typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *, uint32_t);\r
+typedef void (CALLBACK* SPUasync)(uint32_t, uint32_t);\r
typedef int (CALLBACK* SPUplayCDDAchannel)(short *, int);\r
\r
// SPU function pointers\r
extern SPUplayADPCMchannel SPU_playADPCMchannel;\r
extern SPUfreeze SPU_freeze;\r
extern SPUregisterCallback SPU_registerCallback;\r
+extern SPUregisterScheduleCb SPU_registerScheduleCb;\r
extern SPUasync SPU_async;\r
extern SPUplayCDDAchannel SPU_playCDDAchannel;\r
\r
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
u32 hSyncCount = 0;
u32 frame_counter = 0;
-static u32 spuSyncCount = 0;
static u32 hsync_steps = 0;
static u32 base_cycle = 0;
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 )
{
EmuUpdate();
GPU_updateLace();
+
+ if( SPU_async )
+ {
+ SPU_async( cycle, 1 );
+ }
}
// Update lace. (with InuYasha fix)
}
// 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)
}
hSyncCount = 0;
- spuSyncCount = 0;
hsync_steps = 1;
psxRcntSet();
s32 psxRcntFreeze( void *f, s32 Mode )
{
+ u32 spuSyncCount = 0;
u32 count;
s32 i;
#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;
break;
}
size = (bcr >> 16) * (bcr & 0xffff) * 2;
- SPU_readDMAMem(ptr, size);
+ SPU_readDMAMem(ptr, size, psxRegs.cycle);
psxCpu->Clear(madr, size);
break;
default:
if (add>=0x1f801c00 && add<0x1f801e00) {
- SPU_writeRegister(add, value);
+ SPU_writeRegister(add, value, psxRegs.cycle);
return;
}
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;
}
*/
}
-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 };
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)) {
PSXINT_RCNT,
PSXINT_CDRLID,
PSXINT_CDRPLAY,
+ PSXINT_SPU_UPDATE,
PSXINT_COUNT
};
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);
+}
#define H_SPUoff2 0x0d8e
void CALLBACK SPUirq(void);
+void CALLBACK SPUschedule(unsigned int cycles_after);
+void spuUpdate();
#ifdef __cplusplus
}
{
}
-void plat_trigger_vibrate(int is_strong)
+void plat_trigger_vibrate(int pad, int low, int high)
{
const int vDuration = 10;
"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)) {
#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;
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;
}
}
- 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;
/* 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);
}
}
-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]);
#endif
unsigned char PADpoll_pad(unsigned char value) {
- if (CurByte == 0) {
+ if (CurByte == 0) {
CurCmd = value;
CurByte++;
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++];
}
stop:\r
memset(&ChanBuf[ns], 0, (ns_to - ns) * sizeof(ChanBuf[0]));\r
s_chan[ch].ADSRX.EnvelopeVol = 0;\r
- dwChannelOn &= ~(1<<ch);\r
+ spu.dwChannelOn &= ~(1<<ch);\r
}\r
\r
#endif\r
***************************************************************************/
#include <stdio.h>
+#include <string.h>
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
// 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);
}
.align 2
ptr_ChanBuf: .word ESYM(ChanBuf)
ptr_SSumLR: .word ESYM(SSumLR)
-ptr_sRVBStart: .word ESYM(sRVBStart)
#endif
.text
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
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
\r
unsigned short CALLBACK SPUreadDMA(void)\r
{\r
- unsigned short s=spuMem[spuAddr>>1];\r
- spuAddr+=2;\r
- if(spuAddr>0x7ffff) spuAddr=0;\r
+ unsigned short s=spu.spuMem[spu.spuAddr>>1];\r
+ spu.spuAddr+=2;\r
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;\r
\r
return s;\r
}\r
// READ DMA (many values)\r
////////////////////////////////////////////////////////////////////////\r
\r
-void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)\r
+void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,\r
+ unsigned int cycles)\r
{\r
int i;\r
\r
+ do_samples_if_needed(cycles);\r
+\r
for(i=0;i<iSize;i++)\r
{\r
- *pusPSXMem++=spuMem[spuAddr>>1]; // spu addr got by writeregister\r
- spuAddr+=2; // inc spu addr\r
- if(spuAddr>0x7ffff) spuAddr=0; // wrap\r
+ *pusPSXMem++=spu.spuMem[spu.spuAddr>>1]; // spu addr got by writeregister\r
+ spu.spuAddr+=2; // inc spu addr\r
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0; // wrap\r
}\r
}\r
\r
\r
void CALLBACK SPUwriteDMA(unsigned short val)\r
{\r
- spuMem[spuAddr>>1] = val; // spu addr got by writeregister\r
+ spu.spuMem[spu.spuAddr>>1] = val; // spu addr got by writeregister\r
\r
- spuAddr+=2; // inc spu addr\r
- if(spuAddr>0x7ffff) spuAddr=0; // wrap\r
+ spu.spuAddr+=2; // inc spu addr\r
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0; // wrap\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
// WRITE DMA (many values)\r
////////////////////////////////////////////////////////////////////////\r
\r
-void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize)\r
+void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,\r
+ unsigned int cycles)\r
{\r
int i;\r
\r
- had_dma = 1;\r
+ do_samples_if_needed(cycles);\r
\r
- if(spuAddr + iSize*2 < 0x80000)\r
+ if(spu.spuAddr + iSize*2 < 0x80000)\r
{\r
- memcpy(&spuMem[spuAddr>>1], pusPSXMem, iSize*2);\r
- spuAddr += iSize*2;\r
+ memcpy(&spu.spuMem[spu.spuAddr>>1], pusPSXMem, iSize*2);\r
+ spu.spuAddr += iSize*2;\r
return;\r
}\r
\r
for(i=0;i<iSize;i++)\r
{\r
- spuMem[spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister\r
- spuAddr+=2; // inc spu addr\r
- spuAddr&=0x7ffff; // wrap\r
+ spu.spuMem[spu.spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister\r
+ spu.spuAddr+=2; // inc spu addr\r
+ spu.spuAddr&=0x7ffff; // wrap\r
}\r
}\r
\r
// num of channels\r
#define MAXCHAN 24\r
\r
-// ~ FRAG_MSECS ms of data\r
// note: must be even due to the way reverb works now\r
-#define FRAG_MSECS 2\r
-#define NSSIZE ((44100 * FRAG_MSECS / 1000 + 1) & ~1)\r
+#define NSSIZE ((44100 / 50 + 16) & ~1)\r
\r
///////////////////////////////////////////////////////////\r
// struct defines\r
int iSBPos; // mixing stuff\r
int spos;\r
int sinc;\r
+ int sinc_inv;\r
\r
unsigned char * pCurr; // current pos in sound mem\r
unsigned char * pLoop; // loop ptr in sound mem\r
} REVERBInfo;\r
\r
///////////////////////////////////////////////////////////\r
-// SPU.C globals\r
-///////////////////////////////////////////////////////////\r
-\r
-#ifndef _IN_SPU\r
\r
// psx buffers / addresses\r
\r
-extern unsigned short regArea[]; \r
-extern unsigned short spuMem[];\r
-extern unsigned char * spuMemC;\r
-extern unsigned char * pSpuIrq;\r
-extern unsigned char * pSpuBuffer;\r
+typedef struct\r
+{\r
+ unsigned short spuCtrl;\r
+ unsigned short spuStat;\r
+\r
+ unsigned int spuAddr;\r
+ unsigned char * spuMemC;\r
+ unsigned char * pSpuIrq;\r
\r
-#define regAreaGet(ch,offset) \\r
- regArea[((ch<<4)|(offset))>>1]\r
+ unsigned int cycles_played;\r
+ int decode_pos;\r
+ int decode_dirty_ch;\r
+ unsigned int bSpuInit:1;\r
+ unsigned int bSPUIsOpen:1;\r
\r
-// user settings\r
+ unsigned int dwNoiseVal; // global noise generator\r
+ unsigned int dwNoiseCount;\r
+ unsigned int dwNewChannel; // flags for faster testing, if new channel starts\r
+ unsigned int dwChannelOn; // not silent channels\r
+ unsigned int dwChannelDead; // silent+not useful channels\r
\r
-extern int iVolume;\r
-extern int iXAPitch;\r
-extern int iUseReverb;\r
-extern int iUseInterpolation;\r
-// MISC\r
+ unsigned char * pSpuBuffer;\r
+ short * pS;\r
\r
-extern int had_dma;\r
-extern int decode_pos;\r
+ void (CALLBACK *irqCallback)(void); // func of main emu, called on spu irq\r
+ void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
+ void (CALLBACK *scheduleCallback)(unsigned int);\r
\r
-extern SPUCHAN s_chan[];\r
-extern REVERBInfo rvb;\r
+ int * sRVBStart;\r
\r
-extern unsigned short spuCtrl;\r
-extern unsigned short spuStat;\r
-extern unsigned short spuIrq;\r
-extern unsigned int spuAddr;\r
-extern int bSpuInit;\r
-extern unsigned int dwNewChannel;\r
-extern unsigned int dwChannelOn;\r
-extern unsigned int dwPendingChanOff;\r
-extern unsigned int dwChannelDead;\r
+ xa_decode_t * xapGlobal;\r
+ unsigned int * XAFeed;\r
+ unsigned int * XAPlay;\r
+ unsigned int * XAStart;\r
+ unsigned int * XAEnd;\r
\r
-extern int SSumR[];\r
-extern int SSumL[];\r
-extern int iCycle;\r
-extern short * pS;\r
+ unsigned int * CDDAFeed;\r
+ unsigned int * CDDAPlay;\r
+ unsigned int * CDDAStart;\r
+ unsigned int * CDDAEnd;\r
\r
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
+ unsigned int XARepeat;\r
+ unsigned int XALastVal;\r
\r
-#endif\r
+ int iLeftXAVol;\r
+ int iRightXAVol;\r
+\r
+ int pad[32];\r
+ unsigned short regArea[0x400];\r
+ unsigned short spuMem[256*1024];\r
+} SPUInfo;\r
\r
///////////////////////////////////////////////////////////\r
-// XA.C globals\r
+// SPU.C globals\r
///////////////////////////////////////////////////////////\r
\r
-#ifndef _IN_XA\r
+#ifndef _IN_SPU\r
\r
-extern xa_decode_t * xapGlobal;\r
+extern SPUInfo spu;\r
+extern SPUCHAN s_chan[];\r
+extern REVERBInfo rvb;\r
\r
-extern uint32_t * XAFeed;\r
-extern uint32_t * XAPlay;\r
-extern uint32_t * XAStart;\r
-extern uint32_t * XAEnd;\r
+void do_samples(unsigned int cycles_to);\r
+void schedule_next_irq(void);\r
\r
-extern uint32_t * CDDAFeed;\r
-extern uint32_t * CDDAPlay;\r
-extern uint32_t * CDDAStart;\r
-extern uint32_t * CDDAEnd;\r
+#define regAreaGet(ch,offset) \\r
+ spu.regArea[((ch<<4)|(offset))>>1]\r
\r
-extern int iLeftXAVol;\r
-extern int iRightXAVol;\r
+#define do_samples_if_needed(c) \\r
+ do { \\r
+ if ((int)((c) - spu.cycles_played) >= 16 * 768) \\r
+ do_samples(c); \\r
+ } while (0)\r
\r
#endif\r
\r
-///////////////////////////////////////////////////////////\r
-// REVERB.C globals\r
-///////////////////////////////////////////////////////////\r
-\r
-#ifndef _IN_REVERB\r
-\r
-extern int * sRVBPlay;\r
-extern int * sRVBEnd;\r
-extern int * sRVBStart;\r
-\r
-#endif\r
////////////////////////////////////////////////////////////////////////\r
\r
void LoadStateV5(SPUFreeze_t * pF); // newest version\r
-void LoadStateUnknown(SPUFreeze_t * pF); // unknown format\r
-\r
-extern int lastch;\r
+void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format\r
\r
// we want to retain compatibility between versions,\r
// so use original channel struct\r
static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)\r
{\r
memset(d, 0, sizeof(*d));\r
- d->bNew = !!(dwNewChannel & (1<<ch));\r
+ d->bNew = !!(spu.dwNewChannel & (1<<ch));\r
d->iSBPos = s->iSBPos;\r
d->spos = s->spos;\r
d->sinc = s->sinc;\r
d->iStart = (regAreaGet(ch,6)&~1)<<3;\r
d->iCurr = 0; // set by the caller\r
d->iLoop = 0; // set by the caller\r
- d->bOn = !!(dwChannelOn & (1<<ch));\r
+ d->bOn = !!(spu.dwChannelOn & (1<<ch));\r
d->bStop = s->bStop;\r
d->bReverb = s->bReverb;\r
d->iActFreq = 1;\r
static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)\r
{\r
memset(d, 0, sizeof(*d));\r
- if (s->bNew) dwNewChannel |= 1<<ch;\r
+ if (s->bNew) spu.dwNewChannel |= 1<<ch;\r
d->iSBPos = s->iSBPos;\r
+ if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27;\r
d->spos = s->spos;\r
d->sinc = s->sinc;\r
+ d->sinc_inv = 0;\r
memcpy(d->SB, s->SB, sizeof(d->SB));\r
d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;\r
d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;\r
d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;\r
- if (s->bOn) dwChannelOn |= 1<<ch;\r
+ if (s->bOn) spu.dwChannelOn |= 1<<ch;\r
else d->ADSRX.EnvelopeVol = 0;\r
}\r
\r
+// force load from regArea to variables\r
+static void load_register(unsigned long reg, unsigned int cycles)\r
+{\r
+ unsigned short *r = &spu.regArea[((reg & 0xfff) - 0xc00) >> 1];\r
+ *r ^= 1;\r
+ SPUwriteRegister(reg, *r ^ 1, cycles);\r
+}\r
+\r
////////////////////////////////////////////////////////////////////////\r
// SPUFREEZE: called by main emu on savestate load/save\r
////////////////////////////////////////////////////////////////////////\r
\r
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)\r
+long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,\r
+ uint32_t cycles)\r
{\r
int i;SPUOSSFreeze_t * pFO;\r
\r
\r
if(ulFreezeMode==2) return 1; // info mode? ok, bye\r
// save mode:\r
- memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos\r
- memcpy(pF->cSPUPort,regArea,0x200);\r
+ do_samples(cycles);\r
+\r
+ memcpy(pF->cSPURam,spu.spuMem,0x80000); // copy common infos\r
+ memcpy(pF->cSPUPort,spu.regArea,0x200);\r
\r
- if(xapGlobal && XAPlay!=XAFeed) // some xa\r
+ if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed) // some xa\r
{\r
- pF->xaS=*xapGlobal; \r
+ pF->xaS=*spu.xapGlobal;\r
}\r
else \r
memset(&pF->xaS,0,sizeof(xa_decode_t)); // or clean xa\r
\r
pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff\r
\r
- pFO->spuIrq=spuIrq;\r
- if(pSpuIrq) pFO->pSpuIrq = (unsigned long)pSpuIrq-(unsigned long)spuMemC;\r
+ pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];\r
+ if(spu.pSpuIrq) pFO->pSpuIrq = (unsigned long)spu.pSpuIrq-(unsigned long)spu.spuMemC;\r
\r
- pFO->spuAddr=spuAddr;\r
+ pFO->spuAddr=spu.spuAddr;\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;\r
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
save_channel(&pFO->s_chan[i],&s_chan[i],i);\r
if(s_chan[i].pCurr)\r
- pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;\r
+ pFO->s_chan[i].iCurr=s_chan[i].pCurr-spu.spuMemC;\r
if(s_chan[i].pLoop)\r
- pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;\r
+ pFO->s_chan[i].iLoop=s_chan[i].pLoop-spu.spuMemC;\r
}\r
\r
return 1;\r
\r
if(ulFreezeMode!=0) return 0; // bad mode? bye\r
\r
- memcpy(spuMem,pF->cSPURam,0x80000); // get ram\r
- memcpy(regArea,pF->cSPUPort,0x200);\r
+ memcpy(spu.spuMem,pF->cSPURam,0x80000); // get ram\r
+ memcpy(spu.regArea,pF->cSPUPort,0x200);\r
\r
if(pF->xaS.nsamples<=4032) // start xa again\r
SPUplayADPCMchannel(&pF->xaS);\r
\r
- xapGlobal=0;\r
+ spu.xapGlobal=0;\r
\r
if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
LoadStateV5(pF);\r
- else LoadStateUnknown(pF);\r
-\r
- lastch = -1;\r
+ else LoadStateUnknown(pF, cycles);\r
\r
// repair some globals\r
for(i=0;i<=62;i+=2)\r
- SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);\r
+ load_register(H_Reverb+i, cycles);\r
+ load_register(H_SPUReverbAddr, cycles);\r
+ load_register(H_SPUrvolL, cycles);\r
+ load_register(H_SPUrvolR, cycles);\r
\r
- SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));\r
- SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);\r
- SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);\r
- SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);\r
+ load_register(H_SPUctrl, cycles);\r
+ load_register(H_SPUstat, cycles);\r
+ load_register(H_CDLeft, cycles);\r
+ load_register(H_CDRight, cycles);\r
\r
// fix to prevent new interpolations from crashing\r
for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;\r
\r
ClearWorkingState();\r
+ spu.cycles_played = cycles;\r
\r
return 1;\r
}\r
\r
pFO=(SPUOSSFreeze_t *)(pF+1);\r
\r
- spuIrq = pFO->spuIrq;\r
- if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL;\r
+ if(pFO->pSpuIrq) spu.pSpuIrq = spu.spuMemC+((long)pFO->pSpuIrq&0x7fff0); else spu.pSpuIrq=NULL;\r
\r
if(pFO->spuAddr)\r
{\r
- spuAddr = pFO->spuAddr;\r
- if (spuAddr == 0xbaadf00d) spuAddr = 0;\r
+ spu.spuAddr = pFO->spuAddr;\r
+ if (spu.spuAddr == 0xbaadf00d) spu.spuAddr = 0;\r
}\r
\r
- dwNewChannel=0;\r
- dwChannelOn=0;\r
- dwChannelDead=0;\r
+ spu.dwNewChannel=0;\r
+ spu.dwChannelOn=0;\r
+ spu.dwChannelDead=0;\r
for(i=0;i<MAXCHAN;i++)\r
{\r
load_channel(&s_chan[i],&pFO->s_chan[i],i);\r
\r
- s_chan[i].pCurr+=(unsigned long)spuMemC;\r
- s_chan[i].pLoop+=(unsigned long)spuMemC;\r
+ s_chan[i].pCurr+=(unsigned long)spu.spuMemC;\r
+ s_chan[i].pLoop+=(unsigned long)spu.spuMemC;\r
}\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
-void LoadStateUnknown(SPUFreeze_t * pF)\r
+void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)\r
{\r
int i;\r
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
s_chan[i].bStop=0;\r
- s_chan[i].pLoop=spuMemC;\r
+ s_chan[i].pLoop=spu.spuMemC;\r
}\r
\r
- dwNewChannel=0;\r
- dwChannelOn=0;\r
- dwChannelDead=0;\r
- pSpuIrq=0;\r
+ spu.dwNewChannel=0;\r
+ spu.dwChannelOn=0;\r
+ spu.dwChannelDead=0;\r
+ spu.pSpuIrq=0;\r
\r
for(i=0;i<0xc0;i++)\r
{\r
- SPUwriteRegister(0x1f801c00+i*2,regArea[i]);\r
+ load_register(0x1f801c00 + i*2, cycles);\r
}\r
}\r
\r
***************************************************************************/
#include <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
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);
}
\r
#include "externals.h"\r
#include "registers.h"\r
+#include "spu_config.h"\r
\r
static void SoundOn(int start,int end,unsigned short val);\r
static void SoundOff(int start,int end,unsigned short val);\r
// WRITE REGISTERS: called by main emu\r
////////////////////////////////////////////////////////////////////////\r
\r
-void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)\r
+static const uint32_t ignore_dupe[8] = {\r
+ // ch 0-15 c40 c80 cc0\r
+ 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f,\r
+ // ch 16-24 d40 control reverb\r
+ 0x7f7f7f7f, 0x7f7f7f7f, 0xff05ff0f, 0xffffffff\r
+};\r
+\r
+void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,\r
+ unsigned int cycles)\r
{\r
- const unsigned long r=reg&0xfff;\r
- regArea[(r-0xc00)>>1] = val;\r
+ int r = reg & 0xfff;\r
+ int rofs = (r - 0xc00) >> 1;\r
+ int changed = spu.regArea[rofs] != val;\r
+ spu.regArea[rofs] = val;\r
+\r
+ if (!changed && (ignore_dupe[rofs >> 5] & (1 << (rofs & 0x1f))))\r
+ return;\r
+ // zero keyon/keyoff?\r
+ if (val == 0 && (r & 0xff8) == 0xd88)\r
+ return;\r
+\r
+ do_samples_if_needed(cycles);\r
\r
if(r>=0x0c00 && r<0x0d80) // some channel info?\r
{\r
//------------------------------------------------// pitch\r
case 4: \r
SetPitch(ch,val);\r
- break;\r
+ goto upd_irq;\r
//------------------------------------------------// start\r
case 6: \r
// taken from regArea later\r
break;\r
//------------------------------------------------//\r
case 14: // loop?\r
- s_chan[ch].pLoop=spuMemC+((val&~1)<<3);\r
- break;\r
+ s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);\r
+ goto upd_irq;\r
//------------------------------------------------//\r
}\r
return;\r
{\r
//-------------------------------------------------//\r
case H_SPUaddr:\r
- spuAddr = (unsigned long) val<<3;\r
+ spu.spuAddr = (unsigned long) val<<3;\r
break;\r
//-------------------------------------------------//\r
case H_SPUdata:\r
- spuMem[spuAddr>>1] = val;\r
- spuAddr+=2;\r
- if(spuAddr>0x7ffff) spuAddr=0;\r
+ spu.spuMem[spu.spuAddr>>1] = val;\r
+ spu.spuAddr+=2;\r
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;\r
break;\r
//-------------------------------------------------//\r
case H_SPUctrl:\r
- if(!(spuCtrl & CTRL_IRQ))\r
- spuStat&=~STAT_IRQ;\r
- spuCtrl=val;\r
+ if (!(spu.spuCtrl & CTRL_IRQ)) {\r
+ spu.spuStat&=~STAT_IRQ;\r
+ if (val & CTRL_IRQ)\r
+ schedule_next_irq();\r
+ }\r
+ spu.spuCtrl=val;\r
break;\r
//-------------------------------------------------//\r
case H_SPUstat:\r
- spuStat=val & 0xf800;\r
+ spu.spuStat=val&0xf800;\r
break;\r
//-------------------------------------------------//\r
case H_SPUReverbAddr:\r
{\r
rvb.StartAddr=(unsigned long)val<<2;\r
rvb.CurrAddr=rvb.StartAddr;\r
- // sync-with-decode-buffers hack..\r
- if(rvb.StartAddr==0x3ff00)\r
- rvb.CurrAddr+=decode_pos/2;\r
}\r
}\r
- rvb.dirty = 1;\r
- break;\r
+ goto rvbd;\r
//-------------------------------------------------//\r
case H_SPUirqAddr:\r
- spuIrq = val;\r
- pSpuIrq=spuMemC+(((unsigned long) val<<3)&~0xf);\r
- break;\r
+ spu.pSpuIrq=spu.spuMemC+(((unsigned long) val<<3)&~0xf);\r
+ goto upd_irq;\r
//-------------------------------------------------//\r
case H_SPUrvolL:\r
rvb.VolLeft=val;\r
break;\r
//-------------------------------------------------//\r
case H_CDLeft:\r
- iLeftXAVol=val & 0x7fff;\r
- if(cddavCallback) cddavCallback(0,val);\r
+ spu.iLeftXAVol=val & 0x7fff;\r
+ if(spu.cddavCallback) spu.cddavCallback(0,val);\r
break;\r
case H_CDRight:\r
- iRightXAVol=val & 0x7fff;\r
- if(cddavCallback) cddavCallback(1,val);\r
+ spu.iRightXAVol=val & 0x7fff;\r
+ if(spu.cddavCallback) spu.cddavCallback(1,val);\r
break;\r
//-------------------------------------------------//\r
case H_FMod1:\r
ReverbOn(16,24,val);\r
break;\r
//-------------------------------------------------//\r
- case H_Reverb+0 : rvb.FB_SRC_A=val*4; break;\r
- case H_Reverb+2 : rvb.FB_SRC_B=val*4; break;\r
- case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; break;\r
- case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; break;\r
- case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; break;\r
- case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; break;\r
- case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; break;\r
- case H_Reverb+14 : rvb.IIR_COEF=(short)val; break;\r
- case H_Reverb+16 : rvb.FB_ALPHA=(short)val; break;\r
- case H_Reverb+18 : rvb.FB_X=(short)val; break;\r
- case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; break;\r
- case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; break;\r
- case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; break;\r
- case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; break;\r
- case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; break;\r
- case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; break;\r
- case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; break;\r
- case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; break;\r
- case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; break;\r
- case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; break;\r
- case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; break;\r
- case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; break;\r
- case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; break;\r
- case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; break;\r
- case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; break;\r
- case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; break;\r
- case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; break;\r
- case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; break;\r
- case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; break;\r
- case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; break;\r
- case H_Reverb+60 : rvb.IN_COEF_L=(short)val; break;\r
- case H_Reverb+62 : rvb.IN_COEF_R=(short)val; break;\r
+ case H_Reverb+0 : rvb.FB_SRC_A=val*4; goto rvbd;\r
+ case H_Reverb+2 : rvb.FB_SRC_B=val*4; goto rvbd;\r
+ case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; goto rvbd;\r
+ case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; goto rvbd;\r
+ case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; goto rvbd;\r
+ case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; goto rvbd;\r
+ case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; goto rvbd;\r
+ case H_Reverb+14 : rvb.IIR_COEF=(short)val; goto rvbd;\r
+ case H_Reverb+16 : rvb.FB_ALPHA=(short)val; goto rvbd;\r
+ case H_Reverb+18 : rvb.FB_X=(short)val; goto rvbd;\r
+ case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; goto rvbd;\r
+ case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; goto rvbd;\r
+ case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; goto rvbd;\r
+ case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; goto rvbd;\r
+ case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; goto rvbd;\r
+ case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; goto rvbd;\r
+ case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; goto rvbd;\r
+ case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; goto rvbd;\r
+ case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; goto rvbd;\r
+ case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; goto rvbd;\r
+ case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; goto rvbd;\r
+ case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; goto rvbd;\r
+ case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; goto rvbd;\r
+ case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; goto rvbd;\r
+ case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; goto rvbd;\r
+ case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; goto rvbd;\r
+ case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; goto rvbd;\r
+ case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; goto rvbd;\r
+ case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; goto rvbd;\r
+ case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; goto rvbd;\r
+ case H_Reverb+60 : rvb.IN_COEF_L=(short)val; goto rvbd;\r
+ case H_Reverb+62 : rvb.IN_COEF_R=(short)val; goto rvbd;\r
}\r
+ return;\r
\r
- if ((r & ~0x3f) == H_Reverb)\r
- rvb.dirty = 1; // recalculate on next update\r
+upd_irq:\r
+ if (spu.spuCtrl & CTRL_IRQ)\r
+ schedule_next_irq();\r
+ return;\r
+\r
+rvbd:\r
+ rvb.dirty = 1; // recalculate on next update\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
case 12: // get adsr vol\r
{\r
const int ch=(r>>4)-0xc0;\r
- if(dwNewChannel&(1<<ch)) return 1; // we are started, but not processed? return 1\r
- if((dwChannelOn&(1<<ch)) && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well\r
+ if(spu.dwNewChannel&(1<<ch)) return 1; // we are started, but not processed? return 1\r
+ if((spu.dwChannelOn&(1<<ch)) && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well\r
!s_chan[ch].ADSRX.EnvelopeVol)\r
return 1;\r
return (unsigned short)(s_chan[ch].ADSRX.EnvelopeVol>>16);\r
case 14: // get loop address\r
{\r
const int ch=(r>>4)-0xc0;\r
- return (unsigned short)((s_chan[ch].pLoop-spuMemC)>>3);\r
+ return (unsigned short)((s_chan[ch].pLoop-spu.spuMemC)>>3);\r
}\r
}\r
}\r
switch(r)\r
{\r
case H_SPUctrl:\r
- return spuCtrl;\r
+ return spu.spuCtrl;\r
\r
case H_SPUstat:\r
- return spuStat;\r
+ return spu.spuStat;\r
\r
case H_SPUaddr:\r
- return (unsigned short)(spuAddr>>3);\r
+ return (unsigned short)(spu.spuAddr>>3);\r
\r
case H_SPUdata:\r
{\r
- unsigned short s=spuMem[spuAddr>>1];\r
- spuAddr+=2;\r
- if(spuAddr>0x7ffff) spuAddr=0;\r
+ unsigned short s=spu.spuMem[spu.spuAddr>>1];\r
+ spu.spuAddr+=2;\r
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;\r
return s;\r
}\r
\r
- case H_SPUirqAddr:\r
- return spuIrq;\r
-\r
//case H_SPUIsOn1:\r
// return IsSoundOn(0,16);\r
\r
\r
}\r
\r
- return regArea[(r-0xc00)>>1];\r
+ return spu.regArea[(r-0xc00)>>1];\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
// do this here, not in StartSound\r
// - fixes fussy timing issues\r
s_chan[ch].bStop=0;\r
- s_chan[ch].pCurr=spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned\r
- s_chan[ch].pLoop=spuMemC+((regAreaGet(ch,14)&~1)<<3);\r
+ s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned\r
+ s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);\r
s_chan[ch].prevflags=2;\r
\r
- dwNewChannel|=(1<<ch); // bitfield for faster testing\r
- dwChannelOn|=1<<ch;\r
- dwChannelDead&=~(1<<ch);\r
+ spu.dwNewChannel|=(1<<ch);\r
+ spu.dwChannelOn|=1<<ch;\r
+ spu.dwChannelDead&=~(1<<ch);\r
}\r
}\r
}\r
\r
// Jungle Book - Rhythm 'n Groove\r
// - turns off buzzing sound (loop hangs)\r
- dwNewChannel &= ~(1<<ch);\r
+ spu.dwNewChannel &= ~(1<<ch);\r
} \r
}\r
}\r
\r
s_chan[ch].iRawPitch=NP;\r
s_chan[ch].sinc=(NP<<4)|8;\r
- if(iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag\r
+ s_chan[ch].sinc_inv=0;\r
+ if(spu_config.iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
///////////////////////////////////////////////////////////\r
\r
-void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val);\r
+void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned int cycles);\r
\r
// will be included from spu.c\r
#ifdef _IN_SPU\r
\r
-////////////////////////////////////////////////////////////////////////\r
-// globals\r
-////////////////////////////////////////////////////////////////////////\r
-\r
-// REVERB info and timing vars...\r
-\r
-int * sRVBPlay = 0;\r
-int * sRVBEnd = 0;\r
-int * sRVBStart = 0;\r
-\r
////////////////////////////////////////////////////////////////////////\r
// START REVERB\r
////////////////////////////////////////////////////////////////////////\r
\r
INLINE void StartREVERB(int ch)\r
{\r
- if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible?\r
+ if(s_chan[ch].bReverb && (spu.spuCtrl&0x80)) // reverb possible?\r
{\r
- s_chan[ch].bRVBActive=!!iUseReverb;\r
+ s_chan[ch].bRVBActive=!!spu_config.iUseReverb;\r
}\r
else s_chan[ch].bRVBActive=0; // else -> no reverb\r
}\r
// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf\r
////////////////////////////////////////////////////////////////////////\r
\r
-INLINE void InitREVERB(void)\r
-{\r
- memset(sRVBStart,0,NSSIZE*2*4);\r
-}\r
-\r
-////////////////////////////////////////////////////////////////////////\r
-// STORE REVERB\r
-////////////////////////////////////////////////////////////////////////\r
-\r
-INLINE void StoreREVERB(int ch,int ns,int l,int r)\r
+INLINE void InitREVERB(int ns_to)\r
{\r
- ns<<=1;\r
-\r
- sRVBStart[ns] +=l; // -> we mix all active reverb channels into an extra buffer\r
- sRVBStart[ns+1]+=r;\r
+ memset(spu.sRVBStart,0,ns_to*sizeof(spu.sRVBStart[0])*2);\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
// get_buffer content helper: takes care about wraps\r
#define g_buffer(var) \\r
- ((int)(signed short)spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])\r
+ ((int)(signed short)spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])\r
\r
// saturate iVal and store it as var\r
#define s_buffer(var, iVal) \\r
ssat32_to_16(iVal); \\r
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal\r
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal\r
\r
#define s_buffer1(var, iVal) \\r
ssat32_to_16(iVal); \\r
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal\r
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
// portions based on spu2-x from PCSX2\r
-static void MixREVERB(void)\r
+static void MixREVERB(int ns_to)\r
{\r
int l_old = rvb.iRVBLeft;\r
int r_old = rvb.iRVBRight;\r
int curr_addr = rvb.CurrAddr;\r
int space = 0x40000 - rvb.StartAddr;\r
- int l, r, ns;\r
+ int l = 0, r = 0, ns;\r
\r
- for (ns = 0; ns < NSSIZE*2; )\r
+ for (ns = 0; ns < ns_to * 2; )\r
{\r
int IIR_ALPHA = rvb.IIR_ALPHA;\r
int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1;\r
int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1;\r
\r
- int input_L = sRVBStart[ns] * rvb.IN_COEF_L;\r
- int input_R = sRVBStart[ns+1] * rvb.IN_COEF_R;\r
+ int input_L = spu.sRVBStart[ns] * rvb.IN_COEF_L;\r
+ int input_R = spu.sRVBStart[ns+1] * rvb.IN_COEF_R;\r
\r
int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15;\r
int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15;\r
rvb.CurrAddr = curr_addr;\r
}\r
\r
-static void MixREVERB_off(void)\r
+static void MixREVERB_off(int ns_to)\r
{\r
int l_old = rvb.iRVBLeft;\r
int r_old = rvb.iRVBRight;\r
int curr_addr = rvb.CurrAddr;\r
int space = 0x40000 - rvb.StartAddr;\r
- int l, r, ns;\r
+ int l = 0, r = 0, ns;\r
\r
- for (ns = 0; ns < NSSIZE*2; )\r
+ for (ns = 0; ns < ns_to * 2; )\r
{\r
l = (g_buffer(MIX_DEST_A0) + g_buffer(MIX_DEST_B0)) / 2;\r
r = (g_buffer(MIX_DEST_A1) + g_buffer(MIX_DEST_B1)) / 2;\r
rvb.dirty = 0;\r
}\r
\r
-INLINE void REVERBDo(void)\r
+INLINE void REVERBDo(int ns_to)\r
{\r
if (!rvb.StartAddr) // reverb is off\r
{\r
return;\r
}\r
\r
- if (spuCtrl & 0x80) // -> reverb on? oki\r
+ if (spu.spuCtrl & 0x80) // -> reverb on? oki\r
{\r
if (unlikely(rvb.dirty))\r
prepare_offsets();\r
\r
- MixREVERB();\r
+ MixREVERB(ns_to);\r
}\r
else if (rvb.VolLeft || rvb.VolRight)\r
{\r
if (unlikely(rvb.dirty))\r
prepare_offsets();\r
\r
- MixREVERB_off();\r
+ MixREVERB_off(ns_to);\r
}\r
else // -> reverb off\r
{\r
// reverb runs anyway\r
- rvb.CurrAddr += NSSIZE/2;\r
+ rvb.CurrAddr += ns_to / 2;\r
while (rvb.CurrAddr >= 0x40000)\r
rvb.CurrAddr -= 0x40000 - rvb.StartAddr;\r
}\r
#include "registers.h"
#include "out.h"
#include "arm_features.h"
+#include "spu_config.h"
#ifdef ENABLE_NLS
#include <libintl.h>
#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");
// 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 },
{ 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
////////////////////////////////////////////////////////////////////////
// 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"
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;
}
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<<ch); // clear new channel bit
+ spu.dwNewChannel&=~(1<<ch); // clear new channel bit
}
////////////////////////////////////////////////////////////////////////
if(NP<0x1) NP=0x1;
sinc=NP<<4; // calc frequency
- if(iUseInterpolation==1) // freq change in simple interpolation mode
+ if(spu_config.iUseInterpolation==1) // freq change in simple interpolation mode
s_chan[ch].SB[32]=1;
iFMod[ns]=0;
{
ssat32_to_16(fa);
- if(iUseInterpolation>=2) // gauss/cubic interpolation
+ if(spu_config.iUseInterpolation>=2) // gauss/cubic interpolation
{
int gpos = s_chan[ch].SB[28];
gval0 = 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'
if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29];
- switch(iUseInterpolation)
+ switch(spu_config.iUseInterpolation)
{
//--------------------------------------------------//
case 3: // cubic interpolation
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
if(stop)
{
- dwChannelOn &= ~(1<<ch); // -> turn everything off
+ spu.dwChannelOn &= ~(1<<ch); // -> turn everything off
s_chan[ch].bStop = 1;
s_chan[ch].ADSRX.EnvelopeVol = 0;
}
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;
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; \
{ \
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; \
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;
}
// 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;
#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)
{
}
}
-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;
// 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)
{
// 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<MAXCHAN;ch++) // loop em all... we will collect 1 ms of sound of each playing channel
+ for(ch=0;ch<MAXCHAN;ch++) // loop em all...
{
- if(dwNewChannel&(1<<ch)) StartSound(ch); // start new sound
- if(!(dwChannelOn&(1<<ch))) continue; // channel not playing? next
+ if(spu.dwNewChannel&(1<<ch)) StartSound(ch); // start new sound
+ if(!(spu.dwChannelOn&(1<<ch))) continue; // channel not playing? next
if(s_chan[ch].bNoise)
- d=do_samples_noise(ch, ns_from, ns_to);
- else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && iUseInterpolation==0))
- d=do_samples_noint(ch, ns_from, ns_to);
- else if(s_chan[ch].bFMod==0 && iUseInterpolation==1)
- d=do_samples_simple(ch, ns_from, ns_to);
+ do_samples_noise(ch, ns_from, ns_to);
+ else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && spu_config.iUseInterpolation==0))
+ do_samples_noint(ch, ns_from, ns_to);
+ else if(s_chan[ch].bFMod==0 && spu_config.iUseInterpolation==1)
+ do_samples_simple(ch, ns_from, ns_to);
else
- d=do_samples_default(ch, ns_from, ns_to);
- if(d>=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<<ch;
+ do_decode_bufs(ch/2, ns_from, ns_len);
+ spu.decode_dirty_ch |= 1<<ch;
}
if(s_chan[ch].bFMod==2) // fmod freq channel
- memcpy(iFMod, ChanBuf, sizeof(iFMod));
- else if(s_chan[ch].bRVBActive)
- mix_chan_rvb(ns_from,ns_to-ns_from,s_chan[ch].iLeftVolume,s_chan[ch].iRightVolume);
+ memcpy(&iFMod[ns_from], &ChanBuf[ns_from], ns_len * sizeof(iFMod[0]));
+ if(s_chan[ch].bRVBActive)
+ mix_chan_rvb(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume, spu.sRVBStart);
else
- mix_chan(ns_from,ns_to-ns_from,s_chan[ch].iLeftVolume,s_chan[ch].iRightVolume);
+ mix_chan(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
}
}
// advance "stopped" channels that can cause irqs
// (all chans are always playing on the real thing..)
- if(spuCtrl&CTRL_IRQ)
+ if(spu.spuCtrl&CTRL_IRQ)
for(ch=0;ch<MAXCHAN;ch++)
{
if(!(silentch&(1<<ch))) continue; // already handled
- if(dwChannelDead&(1<<ch)) continue;
- if(s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq)
+ if(spu.dwChannelDead&(1<<ch)) continue;
+ if(s_chan[ch].pCurr > spu.pSpuIrq && s_chan[ch].pLoop > spu.pSpuIrq)
continue;
s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns_from);
{
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<<ch;
+ spu.dwChannelDead |= 1<<ch;
s_chan[ch].spos = 0;
break;
}
}
}
- if(bIRQReturn) // special return for "spu irq - wait for cpu action"
- return 0;
-
- if(unlikely(silentch & decode_dirty_ch & (1<<1))) // must clear silent channel decode buffers
+ if(unlikely(silentch & spu.decode_dirty_ch & (1<<1))) // must clear silent channel decode buffers
{
- memset(&spuMem[0x800/2], 0, 0x400);
- decode_dirty_ch &= ~(1<<1);
+ memset(&spu.spuMem[0x800/2], 0, 0x400);
+ spu.decode_dirty_ch &= ~(1<<1);
}
- if(unlikely(silentch & decode_dirty_ch & (1<<3)))
+ if(unlikely(silentch & spu.decode_dirty_ch & (1<<3)))
{
- memset(&spuMem[0xc00/2], 0, 0x400);
- decode_dirty_ch &= ~(1<<3);
+ memset(&spu.spuMem[0xc00/2], 0, 0x400);
+ spu.decode_dirty_ch &= ~(1<<3);
}
- //---------------------------------------------------//
- //- here we have another 1 ms of sound data
//---------------------------------------------------//
// mix XA infos (if any)
- MixXA();
+ MixXA(ns_to);
///////////////////////////////////////////////////////
// mix all channels (including reverb) into one buffer
- if(iUseReverb)
- REVERBDo();
+ if(spu_config.iUseReverb)
+ REVERBDo(ns_to);
- if((spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
+ if((spu.spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
{
- memset(pS, 0, NSSIZE * 2 * sizeof(pS[0]));
- pS += NSSIZE*2;
+ memset(spu.pS, 0, ns_to * 2 * sizeof(spu.pS[0]));
+ spu.pS += ns_to * 2;
}
else
- for (ns = 0; ns < NSSIZE*2; )
+ for (ns = 0; ns < ns_to * 2; )
{
d = SSumLR[ns]; SSumLR[ns] = 0;
d = d * volmult >> 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<spuMemC+0x1000))
- {
- int irq_pos=(pSpuIrq-spuMemC)/2 & 0x1ff;
- if((decode_pos <= irq_pos && irq_pos < decode_pos+NSSIZE)
- || (decode_pos+NSSIZE > 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
void CALLBACK SPUupdate(void)
{
- SPUasync(0);
}
// XA AUDIO
{
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
{
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<MAXCHAN;i++) // loop sound channels
{
-// we don't use mutex sync... not needed, would only
-// slow us down:
-// s_chan[i].hMutex=CreateMutex(NULL,FALSE,NULL);
s_chan[i].ADSRX.SustainLevel = 0xf; // -> 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
// 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;
}
// 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
{
SPUclose();
RemoveStreams(); // no more streaming
- bSpuInit=0;
+ spu.bSpuInit=0;
return 0;
}
// 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
for(;ch<MAXCHAN;ch++)
{
- if (!(dwChannelOn & (1<<ch)))
+ if (!(spu.dwChannelOn & (1<<ch)))
continue;
if (s_chan[ch].bFMod == 2)
fmod_chans |= 1 << ch;
if (s_chan[ch].bNoise)
noise_chans |= 1 << ch;
- if((spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= pSpuIrq && s_chan[ch].pLoop <= pSpuIrq)
+ if((spu.spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= spu.pSpuIrq && s_chan[ch].pLoop <= spu.pSpuIrq)
irq_chans |= 1 << ch;
}
- *chans_out = dwChannelOn;
- *run_chans = ~dwChannelOn & ~dwChannelDead & irq_chans;
+ *chans_out = spu.dwChannelOn;
+ *run_chans = ~spu.dwChannelOn & ~spu.dwChannelDead & irq_chans;
*fmod_chans_out = fmod_chans;
*noise_chans_out = noise_chans;
}
--- /dev/null
+// user settings
+
+typedef struct
+{
+ int iVolume;
+ int iXAPitch;
+ int iUseReverb;
+ int iUseInterpolation;
+ int iTempo;
+} SPUConfig;
+
+extern SPUConfig spu_config;
// XA GLOBALS
////////////////////////////////////////////////////////////////////////
-xa_decode_t * xapGlobal=0;
-
-uint32_t * XAFeed = NULL;
-uint32_t * XAPlay = NULL;
-uint32_t * XAStart = NULL;
-uint32_t * XAEnd = NULL;
-
-uint32_t XARepeat = 0;
-uint32_t XALastVal = 0;
-
-uint32_t * CDDAFeed = NULL;
-uint32_t * CDDAPlay = NULL;
-uint32_t * CDDAStart = NULL;
-uint32_t * CDDAEnd = NULL;
-
-int iLeftXAVol = 32767;
-int iRightXAVol = 32767;
-
static int gauss_ptr = 0;
static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
// MIX XA & CDDA
////////////////////////////////////////////////////////////////////////
-INLINE void MixXA(void)
+INLINE void MixXA(int ns_to)
{
int ns;
short l, r;
uint32_t v;
- int cursor = decode_pos;
+ int cursor = spu.decode_pos;
- if(XAPlay != XAFeed || XARepeat > 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<NSSIZE*2;)
+ v = spu.XALastVal;
+ for(ns = 0; ns < ns_to*2; )
{
- if(XAPlay != XAFeed) v=*XAPlay++;
- if(XAPlay == XAEnd) XAPlay=XAStart;
+ if(spu.XAPlay != spu.XAFeed) v=*spu.XAPlay++;
+ if(spu.XAPlay == spu.XAEnd) spu.XAPlay=spu.XAStart;
- l = ((int)(short)v * iLeftXAVol) >> 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<NSSIZE*2 && CDDAPlay!=CDDAFeed && (CDDAPlay!=CDDAEnd-1||CDDAFeed!=CDDAStart);)
+ for(ns = 0; ns < ns_to * 2 && spu.CDDAPlay!=spu.CDDAFeed && (spu.CDDAPlay!=spu.CDDAEnd-1||spu.CDDAFeed!=spu.CDDAStart);)
{
- v=*CDDAPlay++;
- if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;
+ v=*spu.CDDAPlay++;
+ if(spu.CDDAPlay==spu.CDDAEnd) spu.CDDAPlay=spu.CDDAStart;
- l = ((int)(short)v * iLeftXAVol) >> 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;
}
}
{
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
#endif
if(!iSize) return; // none? bye
- if(XAFeed<XAPlay) iPlace=XAPlay-XAFeed; // how much space in my buf?
- else iPlace=(XAEnd-XAFeed) + (XAPlay-XAStart);
+ if(spu.XAFeed<spu.XAPlay) iPlace=spu.XAPlay-spu.XAFeed; // how much space in my buf?
+ else iPlace=(spu.XAEnd-spu.XAFeed) + (spu.XAPlay-spu.XAStart);
if(iPlace==0) return; // no place at all
//----------------------------------------------------//
- if(iXAPitch) // pitch change option?
+ if(spu_config.iXAPitch) // pitch change option?
{
static DWORD dwLT=0;
static DWORD dwFPS=0;
uint32_t * pS=(uint32_t *)xap->pcm;
uint32_t l=0;
- if(iXAPitch)
+ if(spu_config.iXAPitch)
{
int32_t l1,l2;short s;
for(i=0;i<iSize;i++)
{
- if(iUseInterpolation==2)
+ if(spu_config.iUseInterpolation==2)
{
while(spos>=0x10000L)
{
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;
}
{
for(i=0;i<iSize;i++)
{
- if(iUseInterpolation==2)
+ if(spu_config.iUseInterpolation==2)
{
while(spos>=0x10000L)
{
}
}
- *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;
}
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<iSize;i++)
{
- if(iUseInterpolation==2)
+ if(spu_config.iUseInterpolation==2)
{
while(spos>=0x10000L)
{
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;
}
{
for(i=0;i<iSize;i++)
{
- if(iUseInterpolation==2)
+ if(spu_config.iUseInterpolation==2)
{
while(spos>=0x10000L)
{
}
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;
}
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(space<nBytes)
return 0x7761; // rearmed_wait
while(nBytes>0)
{
- 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;
}
#ifndef COMMON_H
#define COMMON_H
-#include <stdint.h>
-
-#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;
typedef unsigned int u32;
typedef signed long long int s64;
typedef unsigned long long int u64;
-#endif
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
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);
* See the COPYING file in the top-level directory.
*/
-#include <stdint.h>
+#include <stdio.h>
#include <sys/mman.h>
extern const unsigned char cmd_lengths[256];
// 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;
////////////////////////////////////////////////////////////////////////
-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<iSize;i++)
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
+void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize,unsigned int cycles)
{
int i;
for(i=0;i<iSize;i++)
return 0;
}
-void SPUasync(unsigned int cycle)
+void SPUasync(unsigned int cycle, unsigned int flags)
{
}
////////////////////////////////////////////////////////////////////////\r
-long CALLBACK SPUfreeze(unsigned long ulFreezeMode,SPUFreeze_t * pF)
+long CALLBACK SPUfreeze(unsigned long ulFreezeMode,SPUFreeze_t * pF,unsigned int cycles)
{
int i;
for(i=0;i<0x100;i++)
{
if(i!=H_SPUon1-0xc00 && i!=H_SPUon2-0xc00)
- SPUwriteRegister(0x1f801c00+i*2,regArea[i]);
+ SPUwriteRegister(0x1f801c00+i*2,regArea[i],cycles);
}
- SPUwriteRegister(H_SPUon1,regArea[(H_SPUon1-0xc00)/2]);
- SPUwriteRegister(H_SPUon2,regArea[(H_SPUon2-0xc00)/2]);
+ SPUwriteRegister(H_SPUon1,regArea[(H_SPUon1-0xc00)/2],cycles);
+ SPUwriteRegister(H_SPUon2,regArea[(H_SPUon2-0xc00)/2],cycles);
return 1;
}
notaz.gp2x.de / pcsx_rearmed.git / commitdiff