wwww

	modified:   16.exe
	modified:   exmmtest.exe
	modified:   fonttest.exe
	modified:   inputest.exe
	modified:   maptest.exe
	modified:   maptest0.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/16_mm.c
	modified:   src/lib/16_mm.h
	modified:   test.exe
	modified:   test2.exe

diff --git a/16.exe b/16.exe
index 7c2c48b7a654ee486b506760b8c7cd2a130c8416..43d3b6dd4bc13e3d58370bf747be460b8e17fef8 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index ca52f7f537d6dd8b1fd127214eae72fe6e992269..f6c00a319cce96f0103c173be4932dcccf191eef 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 9fd9ea35b94dc4d9a31c02e6221c5f8e3ad02b35..168bbaa87e14e1493a794b4e449cee3a6b3b7577 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index 97ba47cdcff5aa05fbb004dc476011f5d49832a9..c7826587bc31c554e0b79664f54f0f5b3717e5b3 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/maptest.exe b/maptest.exe
index 2a6a6dd586b122fa01a6e73e6dc7518a1ae84076..a846d026d0ebabe50ae22b7f328f0203b2abe9ae 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/maptest0.exe b/maptest0.exe
index 12dda10af0a71a06f5231f54b149f09a71ea8e76..815756c681a1fa6b78dfce761fef435d8bb79a36 100644 (file)
Binary files a/maptest0.exe and b/maptest0.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 57294369fb8d0b5ca2bdecabd2374b6b01e80ab8..80badb00b632c1dd65e07c6b549e1af10c23c225 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 4180b96fc72ba35d9bba12521956c9e26b649922..89e5c6b93f86917088d2eae3e50ad4aa037ab4be 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 1ea85feffb8ace9a09defe7613f84d2bcfe09bcd..dcb1428c4b848a4ef67c80b3726d9dec29b370b7 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -399,7 +399,7 @@ void MML_UseSpace (unsigned segstart, unsigned seglength)
                printf("MML_UseSpace: Segment spans two blocks!");
                return;
        }
-               
+
 
        if (segstart == scan->start)
        {
@@ -542,10 +542,13 @@ void MM_Startup (void)
 
        if (MML_CheckForEMS())
        {
-               printf("EMS!\n");
+               //printf("EMS1\n");
                MML_SetupEMS();                                 // allocate space
+               //printf("EMS2\n");
                MML_UseSpace (EMSpageframe,EMSpagesmapped*0x400);
+               //printf("EMS3\n");
                MM_MapEMS();                                    // map in used pages
+               //printf("EMS4\n");
                mminfo.EMSmem = EMSpagesmapped*0x4000l;
        }
 
@@ -562,7 +565,7 @@ emsskip:
 
        if (MML_CheckForXMS())
        {
-               printf("XMS!\n");
+//             printf("XMS!\n");
                MML_SetupXMS();                                 // allocate as many UMBs as possible
        }
 

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 27fa00b0b0efaaf74c544e02f9c02863c869f101..fecff72ca973b516be9aacc496f59ede6113b348 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -134,14 +134,12 @@ typedef struct mmblockstruct
 =============================================================================
 */
 
-mminfotype     mminfo;
-memptr         bufferseg;
-boolean                mmerror;
+static mminfotype      mminfo;
+static memptr          bufferseg;
+static boolean         mmerror;
 
-void           (* beforesort) (void);
-void           (* aftersort) (void);
-
-static char *ParmStringsexmm[] = {"noems","noxms",""};
+static void            (* beforesort) (void);
+static void            (* aftersort) (void);
 
 /*
 =============================================================================
@@ -151,22 +149,24 @@ static    char *ParmStringsexmm[] = {"noems","noxms",""};
 =============================================================================
 */
 
-boolean                mmstarted;
+static boolean         mmstarted;
 
-void huge      *hugeheap;
-void far       *farheap;
-void           *nearheap;
+static void huge       *hugeheap;
+static void far        *farheap;
+static void            *nearheap;
 
-mmblocktype    far mmblocks[MAXBLOCKS]
+static mmblocktype     far mmblocks[MAXBLOCKS]
                        ,far *mmhead,far *mmfree,far *mmrover,far *mmnew;
 
-boolean                bombonerror;
+static boolean         bombonerror;
 
-unsigned       totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
+static unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
 
-void           (* XMSaddr) (void);             // far pointer to XMS driver
+static void            (* XMSaddr) (void);             // far pointer to XMS driver
 
-unsigned       numUMBs,UMBbase[MAXUMBS];
+static unsigned        numUMBs,UMBbase[MAXUMBS];
+
+static char *ParmStringsexmm[] = {"noems","noxms",""};
 
 //==========================================================================
 

diff --git a/test.exe b/test.exe
index 262cd0229d6bdd75e63b36b5913fea8142c79a6b..c5c68fdb5e3edbfb2763e0acad280055ede3e296 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index c9f12fc11ae1ea3a9364ce46b0cffccc666afd37..0b07453824bc80c9c9ff05a103753fc4015d38ec 100644 (file)
Binary files a/test2.exe and b/test2.exe differ