X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjerry.h;h=4879c0265778ed3f3d2eb7d73f9254c8bc6b5b45;hb=c1aa2a5180362f141ce43b76942952e1f6680347;hp=06d6f1dd1e49c02f0626748a6fa2435cb1b01043;hpb=2ae315f25e623cc8279d3c9012a3a166d86684c2;p=virtualjaguar

diff --git a/src/jerry.h b/src/jerry.h
index 06d6f1d..4879c02 100644
--- a/src/jerry.h
+++ b/src/jerry.h
@@ -5,11 +5,12 @@
 #ifndef __JERRY_H__
 #define __JERRY_H__
 
-#include "types.h"
+//#include "types.h"
+#include "memory.h"
 
-void jerry_init(void);
-void jerry_reset(void);
-void jerry_done(void);
+void JERRYInit(void);
+void JERRYReset(void);
+void JERRYDone(void);
 
 uint8 JERRYReadByte(uint32 offset, uint32 who = UNKNOWN);
 uint16 JERRYReadWord(uint32 offset, uint32 who = UNKNOWN);
@@ -17,13 +18,23 @@ void JERRYWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
 void JERRYWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
 
 void JERRYExecPIT(uint32 cycles);
-void jerry_i2s_exec(uint32 cycles);
+void JERRYI2SExec(uint32 cycles);
 
 // 68000 Interrupt bit positions (enabled at $F10020)
 
-enum { IRQ2_EXTERNAL = 0, IRQ2_DSP, IRQ2_TIMER1, IRQ2_TIMER2, IRQ2_ASI, IRQ2_SSI };
+//enum { IRQ2_EXTERNAL = 0, IRQ2_DSP, IRQ2_TIMER1, IRQ2_TIMER2, IRQ2_ASI, IRQ2_SSI };
+enum { IRQ2_EXTERNAL=0x01, IRQ2_DSP=0x02, IRQ2_TIMER1=0x04, IRQ2_TIMER2=0x08, IRQ2_ASI=0x10, IRQ2_SSI=0x20 };
 
 bool JERRYIRQEnabled(int irq);
 void JERRYSetPendingIRQ(int irq);
 
+// This should stay inside this file, but it's here for now...
+// Need to set up an interface function so that this can go back
+void JERRYI2SCallback(void);
+
+// External variables
+
+extern uint32 JERRYI2SInterruptDivide;
+extern int32 JERRYI2SInterruptTimer;
+
 #endif