X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjerry.cpp;h=742cfb255cb5466fba345846b35f194e98d7b961;hb=6c19e4098a43c47f8cd1824902f7335e124b834f;hp=d569dad7b5a95faafe2f475386c8fb37d0a42dcf;hpb=3580a9ef98432ed54f065f2d537d588fdc083592;p=virtualjaguar diff --git a/src/jerry.cpp b/src/jerry.cpp index d569dad..742cfb2 100644 --- a/src/jerry.cpp +++ b/src/jerry.cpp @@ -144,17 +144,25 @@ // F1DE00 R xxxxxxxx xxxxxxxx ROM_NOISE - white noise // ------------------------------------------------------------ +#include "jerry.h" + +#include // For memcpy //#include #include "jaguar.h" #include "wavetable.h" -#include "jerry.h" #include "clock.h" +#include "dsp.h" +#include "dac.h" +#include "joystick.h" +#include "eeprom.h" +#include "log.h" +#include "cdrom.h" //Note that 44100 Hz requires samples every 22.675737 usec. #define NEW_TIMER_SYSTEM //#define JERRY_DEBUG -/*static*/ uint8 * jerry_ram_8; +/*static*/ uint8 jerry_ram_8[0x10000]; //#define JERRY_CONFIG 0x4002 // ??? What's this ??? @@ -185,6 +193,9 @@ void JERRYI2SCallback(void); //This approach is probably wrong, since the timer is continuously counting down, though //it might only be a problem if the # of interrupts generated is greater than 1--the M68K's //timeslice should be running during that phase... (The DSP needs to be aware of this!) + +//This is only used by the old system, so once the new timer system is working this +//should be safe to nuke. void jerry_i2s_exec(uint32 cycles) { #ifndef NEW_TIMER_SYSTEM @@ -245,6 +256,7 @@ void jerry_i2s_exec(uint32 cycles) #endif } +//NOTE: This is only used by the old execution core. Safe to nuke once it's stable. void JERRYExecPIT(uint32 cycles) { //This is wrong too: Counters are *always* spinning! !!! FIX !!! [DONE] @@ -294,8 +306,12 @@ void JERRYResetPIT1(void) #else RemoveCallback(JERRYPIT1Callback); - double usecs = (float)(JERRYPIT1Prescaler + 1) * (float)(JERRYPIT1Divider + 1) * RISC_CYCLE_IN_USEC; - SetCallbackTime(JERRYPIT1Callback, usecs); + + if (JERRYPIT1Prescaler | JERRYPIT1Divider) + { + double usecs = (float)(JERRYPIT1Prescaler + 1) * (float)(JERRYPIT1Divider + 1) * RISC_CYCLE_IN_USEC; + SetCallbackTime(JERRYPIT1Callback, usecs); + } #endif } @@ -315,8 +331,12 @@ void JERRYResetPIT2(void) #else RemoveCallback(JERRYPIT2Callback); - double usecs = (float)(JERRYPIT2Prescaler + 1) * (float)(JERRYPIT2Divider + 1) * RISC_CYCLE_IN_USEC; - SetCallbackTime(JERRYPIT2Callback, usecs); + + if (JERRYPIT1Prescaler | JERRYPIT1Divider) + { + double usecs = (float)(JERRYPIT2Prescaler + 1) * (float)(JERRYPIT2Divider + 1) * RISC_CYCLE_IN_USEC; + SetCallbackTime(JERRYPIT2Callback, usecs); + } #endif } @@ -336,6 +356,7 @@ void JERRYI2SCallback(void) { // Why is it called this? Instead of SCLK? Shouldn't this be read from DAC.CPP??? //Yes, it should. !!! FIX !!! +#warning Yes, it should. !!! FIX !!! jerry_i2s_interrupt_divide &= 0xFF; // We don't have to divide the RISC clock rate by this--the reason is a bit // convoluted. Will put explanation here later... @@ -377,6 +398,15 @@ void JERRYI2SCallback(void) } jerry_i2s_interrupt_timer += 602; }*/ + + if (ButchIsReadyToSend())//Not sure this is right spot to check... + { +// return GetWordFromButchSSI(offset, who); + SetSSIWordsXmittedFromButch(); + DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); + } + + SetCallbackTime(JERRYI2SCallback, 22.675737); } } @@ -389,7 +419,7 @@ void jerry_init(void) DACInit(); //This should be handled with the cart initialization... // eeprom_init(); - memory_malloc_secure((void **)&jerry_ram_8, 0x10000, "JERRY RAM/ROM"); +// memory_malloc_secure((void **)&jerry_ram_8, 0x10000, "JERRY RAM/ROM"); memcpy(&jerry_ram_8[0xD000], wave_table, 0x1000); JERRYPIT1Prescaler = 0xFFFF; @@ -419,7 +449,7 @@ void jerry_reset(void) void jerry_done(void) { WriteLog("JERRY: M68K Interrupt control ($F10020) = %04X\n", GET16(jerry_ram_8, 0x20)); - memory_free(jerry_ram_8); +// memory_free(jerry_ram_8); // clock_done(); // anajoy_done(); joystick_done(); @@ -502,6 +532,7 @@ uint8 JERRYReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) return counter2Lo & 0xFF; } #else +WriteLog("JERRY: Unhandled timer read (BYTE) at %08X...\n", offset); #endif } // else if (offset >= 0xF10010 && offset <= 0xF10015) @@ -542,6 +573,7 @@ uint16 JERRYReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) //in the jerry_timer_n_counter variables... !!! FIX !!! [DONE] else if ((offset >= 0xF10036) && (offset <= 0xF1003D)) { +#ifndef NEW_TIMER_SYSTEM // jerry_timer_1_counter = (JERRYPIT1Prescaler + 1) * (JERRYPIT1Divider + 1); uint32 counter1Hi = (jerry_timer_1_counter / (JERRYPIT1Divider + 1)) - 1; uint32 counter1Lo = (jerry_timer_1_counter % (JERRYPIT1Divider + 1)) - 1; @@ -564,6 +596,9 @@ uint16 JERRYReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) return counter2Lo; } // Unaligned word reads??? +#else +WriteLog("JERRY: Unhandled timer read (WORD) at %08X...\n", offset); +#endif } // else if ((offset >= 0xF10010) && (offset <= 0xF10015)) // return clock_word_read(offset); @@ -614,7 +649,12 @@ void JERRYWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) jerry_i2s_interrupt_divide = (jerry_i2s_interrupt_divide & 0xFF00) | (uint32)data; jerry_i2s_interrupt_timer = -1; +#ifndef NEW_TIMER_SYSTEM jerry_i2s_exec(0); +#else + RemoveCallback(JERRYI2SCallback); + JERRYI2SCallback(); +#endif // return; } // LTXD/RTXD/SCLK/SMODE $F1A148/4C/50/54 (really 16-bit registers...) @@ -625,6 +665,7 @@ void JERRYWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) } else if (offset >= 0xF10000 && offset <= 0xF10007) { +#ifndef NEW_TIMER_SYSTEM switch (offset & 0x07) { case 0: @@ -659,6 +700,9 @@ void JERRYWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) JERRYPIT2Divider = (JERRYPIT2Divider & 0xFF00) | data; JERRYResetPIT2(); } +#else +WriteLog("JERRY: Unhandled timer write (BYTE) at %08X...\n", offset); +#endif return; } /* else if ((offset >= 0xF10010) && (offset <= 0xF10015)) @@ -721,7 +765,12 @@ void JERRYWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) //This should *only* be enabled when SMODE has its INTERNAL bit set! !!! FIX !!! jerry_i2s_interrupt_divide = (uint8)data; jerry_i2s_interrupt_timer = -1; +#ifndef NEW_TIMER_SYSTEM jerry_i2s_exec(0); +#else + RemoveCallback(JERRYI2SCallback); + JERRYI2SCallback(); +#endif DACWriteWord(offset, data, who); return; @@ -734,6 +783,8 @@ void JERRYWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) } else if (offset >= 0xF10000 && offset <= 0xF10007) { +//#ifndef NEW_TIMER_SYSTEM +#if 1 switch(offset & 0x07) { case 0: @@ -753,6 +804,9 @@ void JERRYWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) JERRYResetPIT2(); } // Need to handle (unaligned) cases??? +#else +WriteLog("JERRY: Unhandled timer write %04X (WORD) at %08X by %s...\n", data, offset, whoName[who]); +#endif return; } /* else if (offset >= 0xF10010 && offset < 0xF10016)