From 343a2db76f56796f02395439a5e01019c670748a Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 15 May 2015 13:55:24 -0500 Subject: [PATCH] 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 --- src/lib/exmm/EMM.EXE | Bin 17394 -> 17454 bytes src/lib/exmm/emm.c | 9 ++++++--- src/lib/exmm/memory.c | 4 ++-- src/lib/exmm/memory.h | 6 ++++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/lib/exmm/EMM.EXE b/src/lib/exmm/EMM.EXE index b9f72c3adccdf8df0512399b16c1407470d5d802..79b6f46bafa4226cb180ef68954a2e459bbc56a0 100644 GIT binary patch delta 4180 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 delta 4133 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 LXyK?&;RF1?v-_#Y 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~ */ -- 2.39.5