Changes for the upcoming 1.0.5 release

[virtualjaguar] / src / include / jerry.h

diff --git a/src/include/jerry.h b/src/include/jerry.h
index 38a0e06da544efba449791b4e5832a65abf8eaed..b83ff641c6b5e81e4f9ba06e1060be90d16b487a 100644 (file)
--- a/src/include/jerry.h
+++ b/src/include/jerry.h
@@ -1,13 +1,6 @@
-//////////////////////////////////////////////////////////////////////////////
 //
-//////////////////////////////////////////////////////////////////////////////
+// JERRY.H: Header file
 //
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
 
 #ifndef __JERRY_H__
 #define __JERRY_H__
@@ -17,11 +10,20 @@
 void jerry_init(void);
 void jerry_reset(void);
 void jerry_done(void);
-unsigned jerry_byte_read(unsigned int offset);
-unsigned jerry_word_read(unsigned int offset);
-void jerry_byte_write(unsigned  offset, unsigned  data);
-void jerry_word_write(unsigned  offset, unsigned  data);
+
+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);
+
 void jerry_pit_exec(uint32 cycles);
 void jerry_i2s_exec(uint32 cycles);
 
+// 68000 Interrupt bit positions (enabled at $F10020)
+
+enum { IRQ2_EXTERNAL = 0, IRQ2_DSP, IRQ2_TIMER1, IRQ2_TIMER2, IRQ2_ASI, IRQ2_SSI };
+
+bool JERRYIRQEnabled(int irq);
+void JERRYSetPendingIRQ(int irq);
+
 #endif