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 b9f72c3adccdf8df0512399b16c1407470d5d802..79b6f46bafa4226cb180ef68954a2e459bbc56a0 100644 (file)
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 60238150aeece26c4ca2b568da95b9eee7a69efd..aae59feca8f977015dbbca4a974375046684a9d5 100644 (file)
--- a/src/lib/exmm/emm.c
+++ b/src/lib/exmm/emm.c
@@ -4,11 +4,13 @@
  *      Module:     All Modules\r
  *      Author(s):  Chris Somers\r
  *      Date:       December 1, 1992\r
- *      Version:    V.1.1\r
+ *      Version:    V.1.1w\r
 \r
         minor mods by Alex Russell to simplify\r
 \r
-        Must use memory model with FAR code\r
+        Must use memory model with FAR code
+
+               Open Watcom patch by sparky4~\r
 \r
  */\r
 \r
@@ -41,7 +43,8 @@ void main(void)
       exit(1);\r
       }\r
    else\r
-      printf("Emm %x available\n", EMVer());\r
+      printf("Emm %x available\n", EMVer());
+      printf("EMS pages available are %lu\n", EMMCoreLeft());\r
 \r
    pEmmData = (char *)EMMalloc(&hEData, 6);  // get 6 * 16K bytes - 96K\r
    if ( pEmmData == NULL )\r

diff --git a/src/lib/exmm/memory.c b/src/lib/exmm/memory.c
index 75b8664629107d2579ea0ba872430eb746553cb5..c73c7657f4975ef8fc610539059f70f23294e075 100644 (file)
--- 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*/\r
+       RtnVal = ((unsigned long)Pages);  /* Pages * 16K rtns bytes*/
 \r
        return(RtnVal);\r
 }               /* End of EMMCoreLeft() */\r
@@ -129,7 +129,7 @@ EMMalloc(int *Handle, int Pages)
         *Handle = NOTREADY;\r
         return(NULL);\r
     }\r
-    if ((Pages < 1) || (Pages > 1020)) {\r
+    if ((Pages < 1) || (Pages > EMMCoreLeft())) {\r
         *Handle = VALUE_OUTF_RANGE;\r
         return (NULL);\r
     }\r

diff --git a/src/lib/exmm/memory.h b/src/lib/exmm/memory.h
index 9cd266b25e983d3d28f6f6ca93af121e0f1b4289..f6b49b1ad9bde2d5d8f988812b78fc2da8bbcd72 100644 (file)
--- a/src/lib/exmm/memory.h
+++ b/src/lib/exmm/memory.h
@@ -4,9 +4,11 @@
  *      Module:     All Modules\r
  *      Author(s):  Chris Somers\r
  *      Date:       August 5, 1993\r
- *      Version:    V.1.1\r
+ *      Version:    V.1.1w\r
 \r
-        modified by Alex Russell to simplify.\r
+        modified by Alex Russell to simplify.
+        
+               Open Watcom patch by sparky4~\r
  */\r
 \r
 \r