X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjerry.cpp;h=eef8d0152af60c3f9bfd6469c41007917f5771f3;hb=f3e5bb2807319c210d124d6150e019130c54867b;hp=27c3cab25d8c381b43216ec87932a2e6a533bc7c;hpb=3c074c829498cb9e77bcb99b4a4aea2434d1daf1;p=virtualjaguar diff --git a/src/jerry.cpp b/src/jerry.cpp index 27c3cab..eef8d01 100644 --- a/src/jerry.cpp +++ b/src/jerry.cpp @@ -1,18 +1,18 @@ // // JERRY Core // -// by cal2 -// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS) -// Cleanups by James L. Hammons +// Originally by David Raingeard +// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Carwin Jones (BeOS) +// Cleanups/rewrites/fixes by James L. Hammons // // ------------------------------------------------------------ // JERRY REGISTERS (Mapped by Aaron Giles) // ------------------------------------------------------------ // F10000-F13FFF R/W xxxxxxxx xxxxxxxx Jerry // F10000 W xxxxxxxx xxxxxxxx JPIT1 - timer 1 pre-scaler -// F10004 W xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider -// F10008 W xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler -// F1000C W xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider +// F10002 W xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider +// F10004 W xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler +// F10008 W xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider // F10010 W ------xx xxxxxxxx CLK1 - processor clock divider // F10012 W ------xx xxxxxxxx CLK2 - video clock divider // F10014 W -------- --xxxxxx CLK3 - chroma clock divider @@ -52,6 +52,10 @@ // R -------- ------x- (PAREN - parity enable) // R -------- -------x (ODD - odd parity) // F10034 R/W xxxxxxxx xxxxxxxx ASICLK - asynchronous serial interface clock +// F10036 R xxxxxxxx xxxxxxxx JPIT1 - timer 1 pre-scaler +// F10038 R xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider +// F1003A R xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler +// F1003C R xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider // ------------------------------------------------------------ // F14000-F17FFF R/W xxxxxxxx xxxxxxxx Joysticks and GPIO0-5 // F14000 R xxxxxxxx xxxxxxxx JOYSTICK - read joystick state @@ -59,7 +63,7 @@ // W x------- -------- (enable joystick outputs) // W -------- xxxxxxxx (joystick output data) // F14002 R xxxxxxxx xxxxxxxx JOYBUTS - button register -// F14800-F14FFF R/W xxxxxxxx xxxxxxxx GPI00 - reserved +// F14800-F14FFF R/W xxxxxxxx xxxxxxxx GPI00 - reserved (CD-ROM?) // F15000-F15FFF R/W xxxxxxxx xxxxxxxx GPI01 - reserved // F16000-F16FFF R/W xxxxxxxx xxxxxxxx GPI02 - reserved // F17000-F177FF R/W xxxxxxxx xxxxxxxx GPI03 - reserved @@ -141,21 +145,33 @@ // ------------------------------------------------------------ #include "jerry.h" -#include "wavetable.h" -#include +#include // For memcpy +//#include +#include "jaguar.h" +#include "wavetable.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 +//#define JERRY_CONFIG 0x4002 // ??? What's this ??? uint8 analog_x, analog_y; -static uint32 jerry_timer_1_prescaler; -static uint32 jerry_timer_2_prescaler; -static uint32 jerry_timer_1_divider; -static uint32 jerry_timer_2_divider; +static uint32 JERRYPIT1Prescaler; +static uint32 JERRYPIT1Divider; +static uint32 JERRYPIT2Prescaler; +static uint32 JERRYPIT2Divider; static int32 jerry_timer_1_counter; static int32 jerry_timer_2_counter; @@ -164,43 +180,111 @@ static int32 jerry_i2s_interrupt_timer = -1; uint32 jerryI2SCycles; uint32 jerryIntPending; +// Private function prototypes + +void JERRYResetPIT1(void); +void JERRYResetPIT2(void); +void JERRYResetI2S(void); + +void JERRYPIT1Callback(void); +void JERRYPIT2Callback(void); +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 extern uint16 serialMode; // From DAC.CPP - if (!(serialMode & 0x01)) // INTERNAL flag - return; + if (serialMode & 0x01) // INTERNAL flag (JERRY is master) + { // Why is it called this? Instead of SCLK? Shouldn't this be read from DAC.CPP??? //Yes, it should. !!! FIX !!! - jerry_i2s_interrupt_divide &= 0xFF; + jerry_i2s_interrupt_divide &= 0xFF; - if (jerry_i2s_interrupt_timer == -1) - { + if (jerry_i2s_interrupt_timer == -1) + { // We don't have to divide the RISC clock rate by this--the reason is a bit // convoluted. Will put explanation here later... // What's needed here is to find the ratio of the frequency to the number of clock cycles // in one second. For example, if the sample rate is 44100, we divide the clock rate by // this: 26590906 / 44100 = 602 cycles. // Which means, every 602 cycles that go by we have to generate an interrupt. - jerryI2SCycles = 32 * (2 * (jerry_i2s_interrupt_divide + 1)); - } + jerryI2SCycles = 32 * (2 * (jerry_i2s_interrupt_divide + 1)); + } - jerry_i2s_interrupt_timer -= cycles; - if (jerry_i2s_interrupt_timer <= 0) - { - DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); - jerry_i2s_interrupt_timer += jerryI2SCycles; + jerry_i2s_interrupt_timer -= cycles; + if (jerry_i2s_interrupt_timer <= 0) + { +//This is probably wrong as well (i.e., need to check enable lines)... !!! FIX !!! + DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); + jerry_i2s_interrupt_timer += jerryI2SCycles; #ifdef JERRY_DEBUG - if (jerry_i2s_interrupt_timer < 0) - WriteLog("JERRY: Missed generating an interrupt (missed %u)!\n", (-jerry_i2s_interrupt_timer / jerryI2SCycles) + 1); + if (jerry_i2s_interrupt_timer < 0) + WriteLog("JERRY: Missed generating an interrupt (missed %u)!\n", (-jerry_i2s_interrupt_timer / jerryI2SCycles) + 1); #endif + } + } + else // JERRY is slave to external word clock + { + // This is just a temporary kludge to see if the CD bus mastering works + // I.e., this is totally faked...! +// The whole interrupt system is pretty much borked and is need of an overhaul. +// What we need is a way of handling these interrupts when they happen instead of +// scanline boundaries the way it is now. + jerry_i2s_interrupt_timer -= cycles; + if (jerry_i2s_interrupt_timer <= 0) + { +//This is probably wrong as well (i.e., need to check enable lines)... !!! FIX !!! [DONE] + if (ButchIsReadyToSend())//Not sure this is right spot to check... + { +// return GetWordFromButchSSI(offset, who); + SetSSIWordsXmittedFromButch(); + DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); + } + jerry_i2s_interrupt_timer += 602; + } + } +#else + RemoveCallback(JERRYI2SCallback); + JERRYI2SCallback(); +#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] +// if (jerry_timer_1_counter) + jerry_timer_1_counter -= cycles; + + if (jerry_timer_1_counter <= 0) + { +//Also, it can generate a CPU interrupt as well... !!! FIX !!! or does it? Maybe it goes Timer->GPU->CPU? + DSPSetIRQLine(DSPIRQ_TIMER0, ASSERT_LINE); // This does the 'IRQ enabled' checking... +// JERRYResetPIT1(); + jerry_timer_1_counter += (JERRYPIT1Prescaler + 1) * (JERRYPIT1Divider + 1); + } + +//This is wrong too: Counters are *always* spinning! !!! FIX !!! [DONE] +// if (jerry_timer_2_counter) + jerry_timer_2_counter -= cycles; + + if (jerry_timer_2_counter <= 0) + { +//Also, it can generate a CPU interrupt as well... !!! FIX !!! or does it? Maybe it goes Timer->GPU->CPU? + DSPSetIRQLine(DSPIRQ_TIMER1, ASSERT_LINE); // This does the 'IRQ enabled' checking... +// JERRYResetPIT2(); + jerry_timer_2_counter += (JERRYPIT2Prescaler + 1) * (JERRYPIT2Divider + 1); } } -void jerry_reset_i2s_timer(void) +void JERRYResetI2S(void) { //WriteLog("i2s: reseting\n"); //This is really SCLK... !!! FIX !!! @@ -208,78 +292,156 @@ void jerry_reset_i2s_timer(void) jerry_i2s_interrupt_timer = -1; } -void jerry_reset_timer_1(void) +void JERRYResetPIT1(void) { - if (!jerry_timer_1_prescaler || !jerry_timer_1_divider) +#ifndef NEW_TIMER_SYSTEM +/* if (!JERRYPIT1Prescaler || !JERRYPIT1Divider) jerry_timer_1_counter = 0; - else - jerry_timer_1_counter = (1 + jerry_timer_1_prescaler) * (1 + jerry_timer_1_divider); + else//*/ +//Small problem with this approach: Overflow if both are = $FFFF. !!! FIX !!! + jerry_timer_1_counter = (JERRYPIT1Prescaler + 1) * (JERRYPIT1Divider + 1); // if (jerry_timer_1_counter) // WriteLog("jerry: reseting timer 1 to 0x%.8x (%i)\n",jerry_timer_1_counter,jerry_timer_1_counter); + +#else + RemoveCallback(JERRYPIT1Callback); + + if (JERRYPIT1Prescaler | JERRYPIT1Divider) + { + double usecs = (float)(JERRYPIT1Prescaler + 1) * (float)(JERRYPIT1Divider + 1) * RISC_CYCLE_IN_USEC; + SetCallbackTime(JERRYPIT1Callback, usecs); + } +#endif } -void jerry_reset_timer_2(void) +void JERRYResetPIT2(void) { - if (!jerry_timer_2_prescaler || !jerry_timer_2_divider) +#ifndef NEW_TIMER_SYSTEM +/* if (!JERRYPIT2Prescaler || !JERRYPIT2Divider) { jerry_timer_2_counter = 0; return; } - else - jerry_timer_2_counter = ((1 + jerry_timer_2_prescaler) * (1 + jerry_timer_2_divider)); + else//*/ + jerry_timer_2_counter = (JERRYPIT2Prescaler + 1) * (JERRYPIT2Divider + 1); // if (jerry_timer_2_counter) // WriteLog("jerry: reseting timer 2 to 0x%.8x (%i)\n",jerry_timer_2_counter,jerry_timer_2_counter); -} -void JERRYExecPIT(uint32 cycles) -{ - if (jerry_timer_1_counter) - jerry_timer_1_counter -= cycles; +#else + RemoveCallback(JERRYPIT2Callback); - if (jerry_timer_1_counter <= 0) + if (JERRYPIT1Prescaler | JERRYPIT1Divider) { - DSPSetIRQLine(DSPIRQ_TIMER0, ASSERT_LINE); - jerry_reset_timer_1(); + double usecs = (float)(JERRYPIT2Prescaler + 1) * (float)(JERRYPIT2Divider + 1) * RISC_CYCLE_IN_USEC; + SetCallbackTime(JERRYPIT2Callback, usecs); } +#endif +} - if (jerry_timer_2_counter) - jerry_timer_2_counter -= cycles; +void JERRYPIT1Callback(void) +{ + DSPSetIRQLine(DSPIRQ_TIMER0, ASSERT_LINE); // This does the 'IRQ enabled' checking... + JERRYResetPIT1(); +} - if (jerry_timer_2_counter <= 0) +void JERRYPIT2Callback(void) +{ + DSPSetIRQLine(DSPIRQ_TIMER1, ASSERT_LINE); // This does the 'IRQ enabled' checking... + JERRYResetPIT2(); +} + +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... +// What's needed here is to find the ratio of the frequency to the number of clock cycles +// in one second. For example, if the sample rate is 44100, we divide the clock rate by +// this: 26590906 / 44100 = 602 cycles. +// Which means, every 602 cycles that go by we have to generate an interrupt. + jerryI2SCycles = 32 * (2 * (jerry_i2s_interrupt_divide + 1)); + +//This should be in this file with an extern reference in the header file so that +//DAC.CPP can see it... !!! FIX !!! + extern uint16 serialMode; // From DAC.CPP + + if (serialMode & 0x01) // INTERNAL flag (JERRY is master) + { + DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); // This does the 'IRQ enabled' checking... + double usecs = (float)jerryI2SCycles * RISC_CYCLE_IN_USEC; + SetCallbackTime(JERRYI2SCallback, usecs); + } + else // JERRY is slave to external word clock { - DSPSetIRQLine(DSPIRQ_TIMER1, ASSERT_LINE); - jerry_reset_timer_2(); +//Note that 44100 Hz requires samples every 22.675737 usec. +//When JERRY is slave to the word clock, we need to do interrupts either at 44.1K +//sample rate or at a 88.2K sample rate (11.332... usec). +/* // This is just a temporary kludge to see if the CD bus mastering works + // I.e., this is totally faked...! +// The whole interrupt system is pretty much borked and is need of an overhaul. +// What we need is a way of handling these interrupts when they happen instead of +// scanline boundaries the way it is now. + jerry_i2s_interrupt_timer -= cycles; + if (jerry_i2s_interrupt_timer <= 0) + { +//This is probably wrong as well (i.e., need to check enable lines)... !!! FIX !!! [DONE] + if (ButchIsReadyToSend())//Not sure this is right spot to check... + { +// return GetWordFromButchSSI(offset, who); + SetSSIWordsXmittedFromButch(); + DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); + } + 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); } } + void jerry_init(void) { - clock_init(); - anajoy_init(); - joystick_init(); +// clock_init(); +// anajoy_init(); + JoystickInit(); 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; + JERRYPIT2Prescaler = 0xFFFF; + JERRYPIT1Divider = 0xFFFF; + JERRYPIT2Divider = 0xFFFF; } void jerry_reset(void) { - clock_reset(); - anajoy_reset(); - joystick_reset(); +// clock_reset(); +// anajoy_reset(); + JoystickReset(); eeprom_reset(); - jerry_reset_i2s_timer(); + JERRYResetI2S(); DACReset(); memset(jerry_ram_8, 0x00, 0xD000); // Don't clear out the Wavetable ROM...! - jerry_timer_1_prescaler = 0xFFFF; - jerry_timer_2_prescaler = 0xFFFF; - jerry_timer_1_divider = 0xFFFF; - jerry_timer_2_divider = 0xFFFF; + JERRYPIT1Prescaler = 0xFFFF; + JERRYPIT2Prescaler = 0xFFFF; + JERRYPIT1Divider = 0xFFFF; + JERRYPIT2Divider = 0xFFFF; jerry_timer_1_counter = 0; jerry_timer_2_counter = 0; } @@ -287,17 +449,17 @@ 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); - clock_done(); - anajoy_done(); - joystick_done(); +// memory_free(jerry_ram_8); +// clock_done(); +// anajoy_done(); + JoystickDone(); DACDone(); eeprom_done(); } bool JERRYIRQEnabled(int irq) { - // Read the word @ $F10020 + // Read the word @ $F10020 return jerry_ram_8[0x21] & (1 << irq); } @@ -319,39 +481,69 @@ uint8 JERRYReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) return DSPReadByte(offset, who); else if ((offset >= DSP_WORK_RAM_BASE) && (offset < DSP_WORK_RAM_BASE+0x2000)) return DSPReadByte(offset, who); - else if (offset >= 0xF10000 && offset <= 0xF10007) + // LRXD/RRXD/SSTAT $F1A148/4C/50 (really 16-bit registers...) + else if (offset >= 0xF1A148 && offset <= 0xF1A153) + return DACReadByte(offset, who); +// F10036 R xxxxxxxx xxxxxxxx JPIT1 - timer 1 pre-scaler +// F10038 R xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider +// F1003A R xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler +// F1003C R xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider +//This is WRONG! +// else if (offset >= 0xF10000 && offset <= 0xF10007) +//This is still wrong. What needs to be returned here are the values being counted down +//in the jerry_timer_n_counter variables... !!! FIX !!! [DONE] + +//This is probably the problem with the new timer code... This is invalid +//under the new system... !!! FIX !!! + else if ((offset >= 0xF10036) && (offset <= 0xF1003D)) { - switch(offset & 0x07) +#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; + uint32 counter2Hi = (jerry_timer_2_counter / (JERRYPIT2Divider + 1)) - 1; + uint32 counter2Lo = (jerry_timer_2_counter % (JERRYPIT2Divider + 1)) - 1; + + switch(offset & 0x0F) { - case 0: - return jerry_timer_1_prescaler >> 8; - case 1: - return jerry_timer_1_prescaler & 0xFF; - case 2: - return jerry_timer_1_divider >> 8; - case 3: - return jerry_timer_1_divider & 0xFF; - case 4: - return jerry_timer_2_prescaler >> 8; - case 5: - return jerry_timer_2_prescaler & 0xFF; case 6: - return jerry_timer_2_divider >> 8; +// return JERRYPIT1Prescaler >> 8; + return counter1Hi >> 8; case 7: - return jerry_timer_2_divider & 0xFF; +// return JERRYPIT1Prescaler & 0xFF; + return counter1Hi & 0xFF; + case 8: +// return JERRYPIT1Divider >> 8; + return counter1Lo >> 8; + case 9: +// return JERRYPIT1Divider & 0xFF; + return counter1Lo & 0xFF; + case 10: +// return JERRYPIT2Prescaler >> 8; + return counter2Hi >> 8; + case 11: +// return JERRYPIT2Prescaler & 0xFF; + return counter2Hi & 0xFF; + case 12: +// return JERRYPIT2Divider >> 8; + return counter2Lo >> 8; + case 13: +// return JERRYPIT2Divider & 0xFF; + return counter2Lo & 0xFF; } +#else +WriteLog("JERRY: Unhandled timer read (BYTE) at %08X...\n", offset); +#endif } - else if (offset >= 0xF10010 && offset <= 0xF10015) - return clock_byte_read(offset); - else if (offset >= 0xF17C00 && offset <= 0xF17C01) - return anajoy_byte_read(offset); +// else if (offset >= 0xF10010 && offset <= 0xF10015) +// return clock_byte_read(offset); +// else if (offset >= 0xF17C00 && offset <= 0xF17C01) +// return anajoy_byte_read(offset); else if (offset >= 0xF14000 && offset <= 0xF14003) - { - return joystick_byte_read(offset) | eeprom_byte_read(offset); - } + return JoystickReadByte(offset) | eeprom_byte_read(offset); else if (offset >= 0xF14000 && offset <= 0xF1A0FF) return eeprom_byte_read(offset); - + return jerry_ram_8[offset & 0xFFFF]; } @@ -368,34 +560,56 @@ uint16 JERRYReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) return DSPReadWord(offset, who); else if (offset >= DSP_WORK_RAM_BASE && offset <= DSP_WORK_RAM_BASE + 0x1FFF) return DSPReadWord(offset, who); - else if ((offset >= 0xF10000) && (offset <= 0xF10007)) + // LRXD/RRXD/SSTAT $F1A148/4C/50 (really 16-bit registers...) + else if (offset >= 0xF1A148 && offset <= 0xF1A153) + return DACReadWord(offset, who); +// F10036 R xxxxxxxx xxxxxxxx JPIT1 - timer 1 pre-scaler +// F10038 R xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider +// F1003A R xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler +// F1003C R xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider +//This is WRONG! +// else if ((offset >= 0xF10000) && (offset <= 0xF10007)) +//This is still wrong. What needs to be returned here are the values being counted down +//in the jerry_timer_n_counter variables... !!! FIX !!! [DONE] + else if ((offset >= 0xF10036) && (offset <= 0xF1003D)) { - switch(offset & 0x07) +#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; + uint32 counter2Hi = (jerry_timer_2_counter / (JERRYPIT2Divider + 1)) - 1; + uint32 counter2Lo = (jerry_timer_2_counter % (JERRYPIT2Divider + 1)) - 1; + + switch(offset & 0x0F) { - case 0: - return jerry_timer_1_prescaler; - case 2: - return jerry_timer_1_divider; - case 4: - return jerry_timer_2_prescaler; case 6: - return jerry_timer_2_divider; +// return JERRYPIT1Prescaler; + return counter1Hi; + case 8: +// return JERRYPIT1Divider; + return counter1Lo; + case 10: +// return JERRYPIT2Prescaler; + return counter2Hi; + case 12: +// return JERRYPIT2Divider; + 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); +// else if ((offset >= 0xF10010) && (offset <= 0xF10015)) +// return clock_word_read(offset); else if (offset == 0xF10020) return jerryIntPending; - else if ((offset >= 0xF17C00) && (offset <= 0xF17C01)) - return anajoy_word_read(offset); +// else if ((offset >= 0xF17C00) && (offset <= 0xF17C01)) +// return anajoy_word_read(offset); else if (offset == 0xF14000) - { - //WriteLog("reading 0x%.4x from 0xf14000\n"); - return (joystick_word_read(offset) & 0xFFFE) | eeprom_word_read(offset); - } + return (JoystickReadWord(offset) & 0xFFFE) | eeprom_word_read(offset); else if ((offset >= 0xF14002) && (offset < 0xF14003)) - return joystick_word_read(offset); + return JoystickReadWord(offset); else if ((offset >= 0xF14000) && (offset <= 0xF1A0FF)) return eeprom_word_read(offset); @@ -425,6 +639,7 @@ void JERRYWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) return; } // SCLK ($F1A150--8 bits wide) +//NOTE: This should be taken care of in DAC... else if ((offset >= 0xF1A152) && (offset <= 0xF1A153)) { // WriteLog("JERRY: Writing %02X to SCLK...\n", data); @@ -434,49 +649,80 @@ 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...) else if (offset >= 0xF1A148 && offset <= 0xF1A157) - { - DACWriteByte(offset, data); - return; + { + DACWriteByte(offset, data, who); + return; } else if (offset >= 0xF10000 && offset <= 0xF10007) { +#ifndef NEW_TIMER_SYSTEM switch (offset & 0x07) { case 0: - jerry_timer_1_prescaler = (jerry_timer_1_prescaler & 0x00FF) | (data << 8); - jerry_reset_timer_1(); + JERRYPIT1Prescaler = (JERRYPIT1Prescaler & 0x00FF) | (data << 8); + JERRYResetPIT1(); break; case 1: - jerry_timer_1_prescaler = (jerry_timer_1_prescaler & 0xFF00) | (data); - jerry_reset_timer_1(); + JERRYPIT1Prescaler = (JERRYPIT1Prescaler & 0xFF00) | data; + JERRYResetPIT1(); + break; + case 2: + JERRYPIT1Divider = (JERRYPIT1Divider & 0x00FF) | (data << 8); + JERRYResetPIT1(); + break; + case 3: + JERRYPIT1Divider = (JERRYPIT1Divider & 0xFF00) | data; + JERRYResetPIT1(); + break; + case 4: + JERRYPIT2Prescaler = (JERRYPIT2Prescaler & 0x00FF) | (data << 8); + JERRYResetPIT2(); + break; + case 5: + JERRYPIT2Prescaler = (JERRYPIT2Prescaler & 0xFF00) | data; + JERRYResetPIT2(); + break; + case 6: + JERRYPIT2Divider = (JERRYPIT2Divider & 0x00FF) | (data << 8); + JERRYResetPIT2(); break; - case 2: { jerry_timer_1_divider=(jerry_timer_1_divider&0x00ff)|(data<<8); jerry_reset_timer_1(); return; } - case 3: { jerry_timer_1_divider=(jerry_timer_1_divider&0xff00)|(data); jerry_reset_timer_1(); return; } - case 4: { jerry_timer_2_prescaler=(jerry_timer_2_prescaler&0x00ff)|(data<<8); jerry_reset_timer_2(); return; } - case 5: { jerry_timer_2_prescaler=(jerry_timer_2_prescaler&0xff00)|(data); jerry_reset_timer_2(); return; } - case 6: { jerry_timer_2_divider=(jerry_timer_2_divider&0x00ff)|(data<<8); jerry_reset_timer_2(); return; } - case 7: { jerry_timer_2_divider=(jerry_timer_2_divider&0xff00)|(data); jerry_reset_timer_2(); return; } + case 7: + JERRYPIT2Divider = (JERRYPIT2Divider & 0xFF00) | data; + JERRYResetPIT2(); } +#else +WriteLog("JERRY: Unhandled timer write (BYTE) at %08X...\n", offset); +#endif return; } - else if ((offset >= 0xF10010) && (offset <= 0xF10015)) +/* else if ((offset >= 0xF10010) && (offset <= 0xF10015)) { clock_byte_write(offset, data); return; + }//*/ + // JERRY -> 68K interrupt enables/latches (need to be handled!) + else if (offset >= 0xF10020 && offset <= 0xF10023) + { +WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%02X to $%08X!\n", data, offset); } - else if ((offset >= 0xF17C00) && (offset <= 0xF17C01)) +/* else if ((offset >= 0xF17C00) && (offset <= 0xF17C01)) { anajoy_byte_write(offset, data); return; - } + }*/ else if ((offset >= 0xF14000) && (offset <= 0xF14003)) { - joystick_byte_write(offset, data); + JoystickWriteByte(offset, data); eeprom_byte_write(offset, data); return; } @@ -512,67 +758,80 @@ void JERRYWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) DSPWriteWord(offset, data, who); return; } +//NOTE: This should be taken care of in DAC... else if (offset == 0xF1A152) // Bottom half of SCLK ($F1A150) { WriteLog("JERRY: Writing %04X to SCLK (by %s)...\n", data, whoName[who]); +//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); - return; + DACWriteWord(offset, data, who); + return; } // LTXD/RTXD/SCLK/SMODE $F1A148/4C/50/54 (really 16-bit registers...) else if (offset >= 0xF1A148 && offset <= 0xF1A156) - { - DACWriteWord(offset, data); - return; + { + DACWriteWord(offset, data, who); + return; } - else if ((offset >= 0xF10000) && (offset <= 0xF10007)) + else if (offset >= 0xF10000 && offset <= 0xF10007) { +//#ifndef NEW_TIMER_SYSTEM +#if 1 switch(offset & 0x07) { case 0: - jerry_timer_1_prescaler = data; - jerry_reset_timer_1(); + JERRYPIT1Prescaler = data; + JERRYResetPIT1(); break; case 2: - jerry_timer_1_divider = data; - jerry_reset_timer_1(); + JERRYPIT1Divider = data; + JERRYResetPIT1(); break; case 4: - jerry_timer_2_prescaler = data; - jerry_reset_timer_2(); + JERRYPIT2Prescaler = data; + JERRYResetPIT2(); break; case 6: - jerry_timer_2_divider = data; - jerry_reset_timer_2(); + JERRYPIT2Divider = data; + 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)) +/* else if (offset >= 0xF10010 && offset < 0xF10016) { clock_word_write(offset, data); return; - } + }//*/ // JERRY -> 68K interrupt enables/latches (need to be handled!) else if (offset >= 0xF10020 && offset <= 0xF10022) { +WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%04X to $%08X!\n", data, offset); } - else if ((offset >= 0xF17C00) && (offset < 0xF17C02)) +/* else if (offset >= 0xF17C00 && offset < 0xF17C02) { //I think this was removed from the Jaguar. If so, then we don't need this...! anajoy_word_write(offset, data); return; - } - else if ((offset >= 0xF14000) && (offset < 0xF14003)) + }*/ + else if (offset >= 0xF14000 && offset < 0xF14003) { - joystick_word_write(offset, data); + JoystickWriteWord(offset, data); eeprom_word_write(offset, data); return; } - else if ((offset >= 0xF14000) && (offset <= 0xF1A0FF)) + else if (offset >= 0xF14000 && offset <= 0xF1A0FF) { eeprom_word_write(offset, data); return;