From: sparky4 <sparky4@cock.li>
Date: Sat, 27 Jun 2015 19:01:31 +0000 (-0500)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=1eae9c0a3e46876ab4ba04accb46870fcf532416;p=16.git

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 7c2c48b7..43d3b6dd 100644
Binary files a/16.exe and b/16.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index ca52f7f5..f6c00a31 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index 9fd9ea35..168bbaa8 100644
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/inputest.exe b/inputest.exe
index 97ba47cd..c7826587 100644
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/maptest.exe b/maptest.exe
index 2a6a6dd5..a846d026 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/maptest0.exe b/maptest0.exe
index 12dda10a..815756c6 100644
Binary files a/maptest0.exe and b/maptest0.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 57294369..80badb00 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 4180b96f..89e5c6b9 100644
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 1ea85fef..dcb1428c 100644
--- 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 27fa00b0..fecff72c 100644
--- 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 262cd022..c5c68fdb 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index c9f12fc1..0b074538 100644
Binary files a/test2.exe and b/test2.exe differ