From: sparky4 <sparky4@cock.li>
Date: Fri, 15 May 2015 18:55:24 +0000 (-0500)
Subject: ems experimenting!
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=343a2db76f56796f02395439a5e01019c670748a;p=16.git

ems experimenting!

	modified:   src/lib/exmm/EMM.EXE
	modified:   src/lib/exmm/emm.c
	modified:   src/lib/exmm/memory.c
	modified:   src/lib/exmm/memory.h
---

diff --git a/src/lib/exmm/EMM.EXE b/src/lib/exmm/EMM.EXE
index b9f72c3a..79b6f46b 100644
Binary files a/src/lib/exmm/EMM.EXE and b/src/lib/exmm/EMM.EXE differ
diff --git a/src/lib/exmm/emm.c b/src/lib/exmm/emm.c
index 60238150..aae59fec 100644
--- a/src/lib/exmm/emm.c
+++ b/src/lib/exmm/emm.c
@@ -4,11 +4,13 @@
  *      Module:     All Modules
  *      Author(s):  Chris Somers
  *      Date:       December 1, 1992
- *      Version:    V.1.1
+ *      Version:    V.1.1w
 
         minor mods by Alex Russell to simplify
 
-        Must use memory model with FAR code
+        Must use memory model with FAR code
+
+		Open Watcom patch by sparky4~
 
  */
 
@@ -41,7 +43,8 @@ void main(void)
       exit(1);
       }
    else
-      printf("Emm %x available\n", EMVer());
+      printf("Emm %x available\n", EMVer());
+      printf("EMS pages available are %lu\n", EMMCoreLeft());
 
    pEmmData = (char *)EMMalloc(&hEData, 6);  // get 6 * 16K bytes - 96K
    if ( pEmmData == NULL )
diff --git a/src/lib/exmm/memory.c b/src/lib/exmm/memory.c
index 75b86646..c73c7657 100644
--- a/src/lib/exmm/memory.c
+++ b/src/lib/exmm/memory.c
@@ -112,7 +112,7 @@ EMMCoreLeft(void)
 		End:
 	}
 	if(!interr)
-	RtnVal = ((unsigned long)Pages << 14);  /* Pages * 16K rtns bytes*/
+	RtnVal = ((unsigned long)Pages);  /* Pages * 16K rtns bytes*/
 
 	return(RtnVal);
 }               /* End of EMMCoreLeft() */
@@ -129,7 +129,7 @@ EMMalloc(int *Handle, int Pages)
         *Handle = NOTREADY;
         return(NULL);
     }
-    if ((Pages < 1) || (Pages > 1020)) {
+    if ((Pages < 1) || (Pages > EMMCoreLeft())) {
         *Handle = VALUE_OUTF_RANGE;
         return (NULL);
     }
diff --git a/src/lib/exmm/memory.h b/src/lib/exmm/memory.h
index 9cd266b2..f6b49b1a 100644
--- a/src/lib/exmm/memory.h
+++ b/src/lib/exmm/memory.h
@@ -4,9 +4,11 @@
  *      Module:     All Modules
  *      Author(s):  Chris Somers
  *      Date:       August 5, 1993
- *      Version:    V.1.1
+ *      Version:    V.1.1w
 
-        modified by Alex Russell to simplify.
+        modified by Alex Russell to simplify.
+        
+		Open Watcom patch by sparky4~
  */