// ------------------------------------------------------------
//#include <math.h>
+#include "jaguar.h"
#include "wavetable.h"
#include "jerry.h"
+#include "clock.h"
+//Note that 44100 Hz requires samples every 22.675737 usec.
+#define NEW_TIMER_SYSTEM
//#define JERRY_DEBUG
/*static*/ uint8 * jerry_ram_8;
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;
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!)
void jerry_i2s_exec(uint32 cycles)
{
+#ifndef NEW_TIMER_SYSTEM
extern uint16 serialMode; // From DAC.CPP
if (serialMode & 0x01) // INTERNAL flag (JERRY is master)
{
jerry_i2s_interrupt_timer += 602;
}
}
+#else
+ RemoveCallback(JERRYI2SCallback);
+ JERRYI2SCallback();
+#endif
+}
+
+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 !!!
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//*/
//Small problem with this approach: Overflow if both are = $FFFF. !!! FIX !!!
- jerry_timer_1_counter = (jerry_timer_1_prescaler + 1) * (jerry_timer_1_divider + 1);
+ 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);
+ 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 = (jerry_timer_2_prescaler + 1) * (jerry_timer_2_divider + 1);
+ 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);
+
+#else
+ RemoveCallback(JERRYPIT2Callback);
+ double usecs = (float)(JERRYPIT2Prescaler + 1) * (float)(JERRYPIT2Divider + 1) * RISC_CYCLE_IN_USEC;
+ SetCallbackTime(JERRYPIT2Callback, usecs);
+#endif
}
-void JERRYExecPIT(uint32 cycles)
+void JERRYPIT1Callback(void)
{
-//This is wrong too: Counters are *always* spinning! !!! FIX !!! [DONE]
-// if (jerry_timer_1_counter)
- jerry_timer_1_counter -= cycles;
+ DSPSetIRQLine(DSPIRQ_TIMER0, ASSERT_LINE); // This does the 'IRQ enabled' checking...
+ JERRYResetPIT1();
+}
- 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...
-// jerry_reset_timer_1();
- jerry_timer_1_counter += (jerry_timer_1_prescaler + 1) * (jerry_timer_1_divider + 1);
- }
+void JERRYPIT2Callback(void)
+{
+ DSPSetIRQLine(DSPIRQ_TIMER1, ASSERT_LINE); // This does the 'IRQ enabled' checking...
+ JERRYResetPIT2();
+}
-//This is wrong too: Counters are *always* spinning! !!! FIX !!! [DONE]
-// if (jerry_timer_2_counter)
- jerry_timer_2_counter -= cycles;
+void JERRYI2SCallback(void)
+{
+ // 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;
+ // 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));
- if (jerry_timer_2_counter <= 0)
+//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)
{
-//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...
-// jerry_reset_timer_2();
- jerry_timer_2_counter += (jerry_timer_2_prescaler + 1) * (jerry_timer_2_divider + 1);
+ 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
+ {
+//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;
+ }*/
}
}
+
void jerry_init(void)
{
// clock_init();
- anajoy_init();
+// anajoy_init();
joystick_init();
DACInit();
//This should be handled with the cart initialization...
// eeprom_init();
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();
+// anajoy_reset();
joystick_reset();
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;
}
WriteLog("JERRY: M68K Interrupt control ($F10020) = %04X\n", GET16(jerry_ram_8, 0x20));
memory_free(jerry_ram_8);
// clock_done();
- anajoy_done();
+// anajoy_done();
joystick_done();
DACDone();
eeprom_done();
// 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))
{
-// jerry_timer_1_counter = (jerry_timer_1_prescaler + 1) * (jerry_timer_1_divider + 1);
- uint32 counter1Hi = (jerry_timer_1_counter / (jerry_timer_1_divider + 1)) - 1;
- uint32 counter1Lo = (jerry_timer_1_counter % (jerry_timer_1_divider + 1)) - 1;
- uint32 counter2Hi = (jerry_timer_2_counter / (jerry_timer_2_divider + 1)) - 1;
- uint32 counter2Lo = (jerry_timer_2_counter % (jerry_timer_2_divider + 1)) - 1;
+#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 6:
-// return jerry_timer_1_prescaler >> 8;
+// return JERRYPIT1Prescaler >> 8;
return counter1Hi >> 8;
case 7:
-// return jerry_timer_1_prescaler & 0xFF;
+// return JERRYPIT1Prescaler & 0xFF;
return counter1Hi & 0xFF;
case 8:
-// return jerry_timer_1_divider >> 8;
+// return JERRYPIT1Divider >> 8;
return counter1Lo >> 8;
case 9:
-// return jerry_timer_1_divider & 0xFF;
+// return JERRYPIT1Divider & 0xFF;
return counter1Lo & 0xFF;
case 10:
-// return jerry_timer_2_prescaler >> 8;
+// return JERRYPIT2Prescaler >> 8;
return counter2Hi >> 8;
case 11:
-// return jerry_timer_2_prescaler & 0xFF;
+// return JERRYPIT2Prescaler & 0xFF;
return counter2Hi & 0xFF;
case 12:
-// return jerry_timer_2_divider >> 8;
+// return JERRYPIT2Divider >> 8;
return counter2Lo >> 8;
case 13:
-// return jerry_timer_2_divider & 0xFF;
+// return JERRYPIT2Divider & 0xFF;
return counter2Lo & 0xFF;
}
+#else
+#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 >= 0xF17C00 && offset <= 0xF17C01)
+// return anajoy_byte_read(offset);
else if (offset >= 0xF14000 && offset <= 0xF14003)
return joystick_byte_read(offset) | eeprom_byte_read(offset);
else if (offset >= 0xF14000 && offset <= 0xF1A0FF)
//in the jerry_timer_n_counter variables... !!! FIX !!! [DONE]
else if ((offset >= 0xF10036) && (offset <= 0xF1003D))
{
-// jerry_timer_1_counter = (jerry_timer_1_prescaler + 1) * (jerry_timer_1_divider + 1);
- uint32 counter1Hi = (jerry_timer_1_counter / (jerry_timer_1_divider + 1)) - 1;
- uint32 counter1Lo = (jerry_timer_1_counter % (jerry_timer_1_divider + 1)) - 1;
- uint32 counter2Hi = (jerry_timer_2_counter / (jerry_timer_2_divider + 1)) - 1;
- uint32 counter2Lo = (jerry_timer_2_counter % (jerry_timer_2_divider + 1)) - 1;
+// 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 6:
-// return jerry_timer_1_prescaler;
+// return JERRYPIT1Prescaler;
return counter1Hi;
case 8:
-// return jerry_timer_1_divider;
+// return JERRYPIT1Divider;
return counter1Lo;
case 10:
-// return jerry_timer_2_prescaler;
+// return JERRYPIT2Prescaler;
return counter2Hi;
case 12:
-// return jerry_timer_2_divider;
+// return JERRYPIT2Divider;
return counter2Lo;
}
// Unaligned word reads???
// 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)
return (joystick_word_read(offset) & 0xFFFE) | eeprom_word_read(offset);
else if ((offset >= 0xF14002) && (offset < 0xF14003))
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);
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:
- jerry_timer_1_divider = (jerry_timer_1_divider & 0x00FF) | (data << 8);
- jerry_reset_timer_1();
+ JERRYPIT1Divider = (JERRYPIT1Divider & 0x00FF) | (data << 8);
+ JERRYResetPIT1();
break;
case 3:
- jerry_timer_1_divider = (jerry_timer_1_divider & 0xFF00) | data;
- jerry_reset_timer_1();
+ JERRYPIT1Divider = (JERRYPIT1Divider & 0xFF00) | data;
+ JERRYResetPIT1();
break;
case 4:
- jerry_timer_2_prescaler = (jerry_timer_2_prescaler & 0x00FF) | (data << 8);
- jerry_reset_timer_2();
+ JERRYPIT2Prescaler = (JERRYPIT2Prescaler & 0x00FF) | (data << 8);
+ JERRYResetPIT2();
break;
case 5:
- jerry_timer_2_prescaler = (jerry_timer_2_prescaler & 0xFF00) | data;
- jerry_reset_timer_2();
+ JERRYPIT2Prescaler = (JERRYPIT2Prescaler & 0xFF00) | data;
+ JERRYResetPIT2();
break;
case 6:
- jerry_timer_2_divider = (jerry_timer_2_divider & 0x00FF) | (data << 8);
- jerry_reset_timer_2();
+ JERRYPIT2Divider = (JERRYPIT2Divider & 0x00FF) | (data << 8);
+ JERRYResetPIT2();
break;
case 7:
- jerry_timer_2_divider = (jerry_timer_2_divider & 0xFF00) | data;
- jerry_reset_timer_2();
+ JERRYPIT2Divider = (JERRYPIT2Divider & 0xFF00) | data;
+ JERRYResetPIT2();
}
return;
}
{
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);
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]);
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???
return;
{
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)
{
joystick_word_write(offset, data);
projects / virtualjaguar / blobdiff