X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcdrom.cpp;h=9e2d44a78744d187aedb5be928f4b433ab66d94e;hb=683f283e1328164c176618088c34408ea6c03cf7;hp=7f0af672c72a461d80203c764a6d061fe3763959;hpb=402ce5fd1cae18d622b04db8ba595f869b4b7464;p=virtualjaguar diff --git a/src/cdrom.cpp b/src/cdrom.cpp index 7f0af67..9e2d44a 100644 --- a/src/cdrom.cpp +++ b/src/cdrom.cpp @@ -121,7 +121,7 @@ $185 - Returns 16-bit value static void CDROMBusWrite(uint16); static uint16 CDROMBusRead(void); -#define BUTCH 0x00 // base of Butch=interrupt control register, R/W +#define BUTCH 0x00 // base of Butch == interrupt control register, R/W #define DSCNTRL BUTCH + 0x04 // DSA control register, R/W #define DS_DATA BUTCH + 0x0A // DSA TX/RX data, R/W #define I2CNTRL BUTCH + 0x10 // i2s bus control register, R/W @@ -147,7 +147,7 @@ static uint32 cdBufPtr = 2352; //Also need to set up (save/restore) the CD's NVRAM -extern bool GetRawTOC(void); +//extern bool GetRawTOC(void); void CDROMInit(void) { haveCDGoodness = CDIntfInit(); @@ -225,7 +225,10 @@ void CDROMDone(void) // void BUTCHExec(uint32 cycles) { +#if 1 +// We're chickening out for now... return; +#else extern uint8 * jerry_ram_8; // Hmm. // For now, we just do the FIFO interrupt. Timing is also likely to be WRONG as well. @@ -243,6 +246,7 @@ return; //I'm *sure* this is wrong--prolly need to generate DSP IRQs as well! if (jerry_ram_8[0x23] & 0x3F) // Only generate an IRQ if enabled! GPUSetIRQLine(GPUIRQ_DSP, ASSERT_LINE); +#endif }