Merge remote-tracking branch 'origin/master'

xrip · Dec 5, 2023 · 9a2bc40 · 9a2bc40
2 parents c293f58 + ab91ba1
commit 9a2bc40
Show file tree

Hide file tree

Showing 6 changed files with 516 additions and 639 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,7 @@ pico_set_program_version(pico-xt "test")
 
 #set(PICO_DEOPTIMIZED_DEBUG 1)
 #if (!OVERCLOCKING)
-set(OVERCLOCKING 396)
+set(OVERCLOCKING 416)
 #endif ()
 
 
@@ -186,13 +186,14 @@ else ()
 
             # select onr of the folowing:
             #SWAP_BLOCK_1k
-            #SWAP_BLOCK_2k
-            SWAP_BLOCK_4k
+            SWAP_BLOCK_2k
+            #SWAP_BLOCK_4k
 
             EMS_DRIVER=1
             #EMS_DEBUG=1
+
             XMS_DRIVER=1
-            XMS_OVER_HMA_KB=0
+            #XMS_OVER_HMA_KB=1024
             XMS_UMB=1
             XMS_HMA=1
             HANDLE_REBOOT

diff --git a/src/a20.h b/src/a20.h
@@ -8,9 +8,20 @@
 #else
 #define RESERVED_XMS_KB 0
 #endif
+
 #define HMA_START_ADDRESS 0x100000ul
+#ifdef XMS_DRIVER
+#ifdef XMS_HMA
 #define OUT_OF_HMA_ADDRESS 0x10FFF0ul
 #define BASE_XMS_HANLES_SEG 0x11000ul
+#define BASE_XMS_ADDR 0x110000ul
+#else
+#define OUT_OF_HMA_ADDRESS 0x100000ul
+#define BASE_XMS_HANLES_SEG 0x10000ul
+#define BASE_XMS_ADDR 0x100000ul
+#endif
+#endif
+
 // TODO:
 #if XMS_OVER_HMA_KB
 #define XMS_STATIC_PAGE_KBS 16ul