diff options
| author | SND\notaz_cp <SND\notaz_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-01-08 00:47:11 +0000 |
|---|---|---|
| committer | SND\notaz_cp <SND\notaz_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-01-08 00:47:11 +0000 |
| commit | 1309996b0e0f270dcb0dda6078da53a6adc50d3a (patch) | |
| tree | 52094e02b09cecb4c6f28e244b608b600ad90df7 /libpcsxcore/cdrom.c | |
| parent | 263a5d3120d6bb77b6eee6c10697a40a81631f84 (diff) | |
| download | pcsxr-1309996b0e0f270dcb0dda6078da53a6adc50d3a.tar.gz | |
cdriso: remove threaded cdda code
cdrom code now reads with ISOreadCDDA() and sends to SPU, thread code is
not used. This will also make a merge from PCSX ReARMed easier.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82099 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/cdrom.c')
| -rwxr-xr-x | libpcsxcore/cdrom.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index c07b1450..a794f415 100755 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -129,8 +129,6 @@ extern unsigned int msf2sec(char *msf); extern void sec2msf(unsigned int s, char *msf); -extern u16 *iso_play_cdbuf; -extern u16 iso_play_bufptr; extern long CALLBACK ISOinit(void); extern void CALLBACK SPUirq(void); extern SPUregisterCallback SPU_registerCallback; @@ -240,6 +238,7 @@ void adjustTransferIndex() } } +// FIXME: do this in SPU instead void cdrDecodedBufferInterrupt() { u16 buf_ptr[0x400], lcv; @@ -274,30 +273,6 @@ void cdrDecodedBufferInterrupt() Assume IRQ every wrap */ - if( iso_play_cdbuf ) - { - for( lcv = 0; lcv < 0x200; lcv++ ) - { - // left - buf_ptr[ lcv ] = iso_play_cdbuf[ iso_play_bufptr ]; - - // right - buf_ptr[ lcv+0x200 ] = iso_play_cdbuf[ iso_play_bufptr+1 ]; - - iso_play_bufptr += 2; - } - } - else - { - memset( buf_ptr, 0, sizeof(buf_ptr) ); - } - - - // feed CDDA decoded buffer manually - SPU_writeRegister( H_SPUaddr,0 ); - SPU_writeDMAMem( buf_ptr, 0x800 / 2 ); - - // signal CDDA data ready psxHu32ref(0x1070) |= SWAP32((u32)0x200); |