--- hatari/src/includes/ioMem.h	2019/04/09 08:48:43	1.1.1.4
+++ hatari/src/includes/ioMem.h	2019/04/09 08:59:28	1.1.1.9
@@ -1,8 +1,8 @@
 /*
   Hatari - ioMem.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_IOMEM_H
@@ -22,10 +22,17 @@ extern uae_u8 *IOmemory;
 #endif  /* ENABLE_SMALL_MEM */
 
 
+extern int nIoMemAccessSize;
+extern Uint32 IoAccessFullAddress;
 extern Uint32 IoAccessBaseAddress;
 extern Uint32 IoAccessCurrentAddress;
-extern int nIoMemAccessSize;
 
+extern int	IoAccessInstrCount;
+
+enum FALCON_BUS_MODE {
+	STE_BUS_COMPATIBLE,
+	FALCON_ONLY_BUS
+};
 
 /**
  * Read 32-bit word from IO memory space without interception.
@@ -93,22 +100,28 @@ static inline void IoMem_WriteByte(Uint3
 
 extern void IoMem_Init(void);
 extern void IoMem_UnInit(void);
-
-extern uae_u32 IoMem_bget(uaecptr addr);
-extern uae_u32 IoMem_wget(uaecptr addr);
-extern uae_u32 IoMem_lget(uaecptr addr);
-
-extern void IoMem_bput(uaecptr addr, uae_u32 val);
-extern void IoMem_wput(uaecptr addr, uae_u32 val);
-extern void IoMem_lput(uaecptr addr, uae_u32 val);
+extern void IoMem_Reset(void);
+extern void IoMem_SetFalconBusMode(enum FALCON_BUS_MODE mode);
+extern bool IoMem_IsFalconBusMode(void);
+
+extern uae_u32 REGPARAM3 IoMem_bget(uaecptr addr);
+extern uae_u32 REGPARAM3 IoMem_wget(uaecptr addr);
+extern uae_u32 REGPARAM3 IoMem_lget(uaecptr addr);
+
+extern void REGPARAM3 IoMem_bput(uaecptr addr, uae_u32 val);
+extern void REGPARAM3 IoMem_wput(uaecptr addr, uae_u32 val);
+extern void REGPARAM3 IoMem_lput(uaecptr addr, uae_u32 val);
 
 extern void IoMem_BusErrorEvenReadAccess(void);
 extern void IoMem_BusErrorOddReadAccess(void);
 extern void IoMem_BusErrorEvenWriteAccess(void);
 extern void IoMem_BusErrorOddWriteAccess(void);
 extern void IoMem_VoidRead(void);
+extern void IoMem_VoidRead_00(void);
 extern void IoMem_VoidWrite(void);
 extern void IoMem_WriteWithoutInterception(void);
 extern void IoMem_ReadWithoutInterception(void);
 
+extern void IoMem_MemorySnapShot_Capture(bool bSave);
+
 #endif