--- previous/src/dimension/dimension.c	2018/04/24 19:30:01	1.1
+++ previous/src/dimension/dimension.c	2018/04/24 19:31:30	1.1.1.2
@@ -8,7 +8,9 @@
 #include "nd_nbic.h"
 #include "nd_sdl.h"
 
-#if ENABLE_DIMENSION
+Uint8  ND_ram[64*1024*1024];
+Uint8  ND_rom[128*1024];
+Uint8  ND_vram[4*1024*1024];
 
 /* NeXTdimension board and slot memory */
 #define ND_BOARD_SIZE	0x10000000
@@ -21,69 +23,7 @@
 
 #define ND_NBIC_SPACE   0xFFFFFFE8
 
-
-/* NeXTdimension slot memory access */
-Uint32 nd_slot_lget(Uint32 addr) {
-    addr |= ND_SLOT_BITS;
-    
-    if (addr<ND_NBIC_SPACE) {
-        return nd_longget(addr);
-    } else {
-        return nd_nbic_lget(addr);
-    }
-}
-
-Uint16 nd_slot_wget(Uint32 addr) {
-    addr |= ND_SLOT_BITS;
-    
-    if (addr<ND_NBIC_SPACE) {
-        return nd_wordget(addr);
-    } else {
-        return nd_nbic_wget(addr);
-    }
-}
-
-Uint8 nd_slot_bget(Uint32 addr) {
-    addr |= ND_SLOT_BITS;
-
-    if (addr<ND_NBIC_SPACE) {
-        return nd_byteget(addr);
-    } else {
-        return nd_nbic_bget(addr);
-    }
-}
-
-void nd_slot_lput(Uint32 addr, Uint32 l) {
-    addr |= ND_SLOT_BITS;
-
-    if (addr<ND_NBIC_SPACE) {
-        nd_longput(addr, l);
-    } else {
-        nd_nbic_lput(addr, l);
-    }
-}
-
-void nd_slot_wput(Uint32 addr, Uint16 w) {
-    addr |= ND_SLOT_BITS;
-
-    if (addr<ND_NBIC_SPACE) {
-        nd_wordput(addr, w);
-    } else {
-        nd_nbic_wput(addr, w);
-    }
-}
-
-void nd_slot_bput(Uint32 addr, Uint8 b) {
-    addr |= ND_SLOT_BITS;
-
-    if (addr<ND_NBIC_SPACE) {
-        nd_byteput(addr, b);
-    } else {
-        nd_nbic_bput(addr, b);
-    }
-}
-
-/* NeXTdimension board memory access */
+/* NeXTdimension board memory access (i860) */
 
 void   nd_board_rd8_be(Uint32 addr, Uint32* val) {
     addr  |= ND_BOARD_BITS;
@@ -116,12 +56,12 @@ void   nd_board_rd128_be(Uint32 addr, Ui
 
 void   nd_board_wr8_be(Uint32 addr, const Uint32* val) {
     addr |= ND_BOARD_BITS;
-    nd_byteput(addr, *((Uint8*)val));
+    nd_byteput(addr, *((const Uint8*)val));
 }
 
 void   nd_board_wr16_be(Uint32 addr, const Uint32* val) {
     addr |= ND_BOARD_BITS;
-    nd_wordput(addr, *((Uint16*)val));
+    nd_wordput(addr, *((const Uint16*)val));
 }
 
 void   nd_board_wr32_be(Uint32 addr, const Uint32* val) {
@@ -174,12 +114,12 @@ void   nd_board_rd128_le(Uint32 addr, Ui
 
 void   nd_board_wr8_le(Uint32 addr, const Uint32* val) {
     addr |= ND_BOARD_BITS;
-    nd_byteput(addr^7, *((Uint8*)val));
+    nd_byteput(addr^7, *((const Uint8*)val));
 }
 
 void   nd_board_wr16_le(Uint32 addr, const Uint32* val) {
     addr |= ND_BOARD_BITS;
-    nd_wordput(addr^6, *((Uint16*)val));
+    nd_wordput(addr^6, *((const Uint16*)val));
 }
 
 void   nd_board_wr32_le(Uint32 addr, const Uint32* val) {
@@ -201,11 +141,15 @@ void   nd_board_wr128_le(Uint32 addr, co
     nd_longput(addr+12, val[3]);
 }
 
-//------
+/* NeXTdimension board memory access (m68k) */
 
 inline Uint32 nd_board_lget(Uint32 addr) {
     addr |= ND_BOARD_BITS;
-    return nd_longget(addr);
+    Uint32 result = nd_longget(addr);
+    // (SC) delay m68k read on csr0 while in ROM (CS8=1)to give ND some time to start up.
+    if(addr == 0xFF800000 && (result & 0x02))
+        M68000_AddCycles(ConfigureParams.System.nCpuFreq * 100);
+    return result;
 }
 
 inline Uint16 nd_board_wget(Uint32 addr) {
@@ -223,20 +167,6 @@ inline void nd_board_lput(Uint32 addr, U
     nd_longput(addr, l);
 }
 
-inline void nd_board_put64(Uint32 addr, Uint32 l0, Uint32 l1) {
-    addr |= ND_BOARD_BITS;
-    nd_longput(addr+4, l0);
-    nd_longput(addr+0, l1);
-}
-
-inline void nd_board_put128(Uint32 addr, Uint32 l0, Uint32 l1, Uint32 l2, Uint32 l3) {
-    addr |= ND_BOARD_BITS;
-    nd_longput(addr+4,  l0);
-    nd_longput(addr+0,  l1);
-    nd_longput(addr+12, l2);
-    nd_longput(addr+8,  l3);
-}
-
 inline void nd_board_wput(Uint32 addr, Uint16 w) {
     addr |= ND_BOARD_BITS;
     nd_wordput(addr, w);
@@ -252,6 +182,74 @@ inline Uint8 nd_board_cs8get(Uint32 addr
     return nd_cs8get(addr);
 }
 
+/* NeXTdimension slot memory access */
+Uint32 nd_slot_lget(Uint32 addr) {
+    addr |= ND_SLOT_BITS;
+    
+    if (addr<ND_NBIC_SPACE) {
+        return nd_longget(addr);
+    } else {
+        return nd_nbic_lget(addr);
+    }
+}
+
+Uint16 nd_slot_wget(Uint32 addr) {
+    addr |= ND_SLOT_BITS;
+    
+    if (addr<ND_NBIC_SPACE) {
+        return nd_wordget(addr);
+    } else {
+        return nd_nbic_wget(addr);
+    }
+}
+
+Uint8 nd_slot_bget(Uint32 addr) {
+    addr |= ND_SLOT_BITS;
+    
+    if (addr<ND_NBIC_SPACE) {
+        return nd_byteget(addr);
+    } else {
+        return nd_nbic_bget(addr);
+    }
+}
+
+void nd_slot_lput(Uint32 addr, Uint32 l) {
+    addr |= ND_SLOT_BITS;
+    
+    if (addr<ND_NBIC_SPACE) {
+        nd_longput(addr, l);
+    } else {
+        nd_nbic_lput(addr, l);
+    }
+}
+
+void nd_slot_wput(Uint32 addr, Uint16 w) {
+    addr |= ND_SLOT_BITS;
+    
+    if (addr<ND_NBIC_SPACE) {
+        nd_wordput(addr, w);
+    } else {
+        nd_nbic_wput(addr, w);
+    }
+}
+
+void nd_slot_bput(Uint32 addr, Uint8 b) {
+    addr |= ND_SLOT_BITS;
+    
+    if (addr<ND_NBIC_SPACE) {
+        nd_byteput(addr, b);
+    } else {
+        nd_nbic_bput(addr, b);
+    }
+}
+
+/* Pause and resume function */
+
+void dimension_pause(bool pause) {
+    nd_i860_pause(pause);
+    nd_sdl_pause(pause);
+}
+
 /* Reset function */
 
 void dimension_init(void) {
@@ -267,5 +265,3 @@ void dimension_uninit(void) {
 	nd_i860_uninit();
     nd_sdl_uninit();
 }
-
-#endif