X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjerry.h;h=cff1c25f56c3bbc6189cec81ee8e06dfdfb9f15e;hb=f005034d4a3990efc8e445ce46222ce32600411b;hp=684b55f23f3ec812057b0a602185e827a2e9523b;hpb=dd520b965a1e6531bd1d285494b223ab04c5368b;p=virtualjaguar

diff --git a/src/jerry.h b/src/jerry.h
index 684b55f..cff1c25 100644
--- a/src/jerry.h
+++ b/src/jerry.h
@@ -5,23 +5,28 @@
 #ifndef __JERRY_H__
 #define __JERRY_H__
 
-#include "types.h"
+//#include "types.h"
+#include "memory.h"
 
 void JERRYInit(void);
 void JERRYReset(void);
 void JERRYDone(void);
 
-uint8 JERRYReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 JERRYReadWord(uint32 offset, uint32 who = UNKNOWN);
-void JERRYWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void JERRYWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
+uint8_t JERRYReadByte(uint32_t offset, uint32_t who = UNKNOWN);
+uint16_t JERRYReadWord(uint32_t offset, uint32_t who = UNKNOWN);
+void JERRYWriteByte(uint32_t offset, uint8_t data, uint32_t who = UNKNOWN);
+void JERRYWriteWord(uint32_t offset, uint16_t data, uint32_t who = UNKNOWN);
 
-void JERRYExecPIT(uint32 cycles);
-void JERRYI2SExec(uint32 cycles);
+void JERRYExecPIT(uint32_t cycles);
+void JERRYI2SExec(uint32_t cycles);
+
+int JERRYGetPIT1Frequency(void);
+int JERRYGetPIT2Frequency(void);
 
 // 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);
@@ -32,7 +37,7 @@ void JERRYI2SCallback(void);
 
 // External variables
 
-extern uint32 JERRYI2SInterruptDivide;
-extern int32 JERRYI2SInterruptTimer;
+//extern uint32_t JERRYI2SInterruptDivide;
+extern int32_t JERRYI2SInterruptTimer;
 
 #endif