X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=df1dd7f7fef2222f312f848279042e4963efa9be;hb=704ec571885c6255ead65280428ad72510cfe218;hp=c2a966b8750fbb31e28bc2cb0b23122f79372b28;hpb=2aed15ed3fd65130ae260d4ecd020a4f870f6442;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c2a966b8..df1dd7f7 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -72,9 +72,9 @@ void		(* XMSaddr) (void);		// far pointer to XMS driver
 
 =============================================================================
 */
-
+#ifndef __16_PM__
 static	char *ParmStringsexmm[] = {"noems","noxms",""};
-
+#endif
 /*
 ======================
 =
@@ -87,7 +87,7 @@ static	char *ParmStringsexmm[] = {"noems","noxms",""};
 
 boolean MML_CheckForEMS(void)
 {
-	boolean emmcfems;
+	boolean emmcfems=0;
 	static char	emmname[] = "EMMXXXX0";	//fix by andrius4669
 	__asm {
 		mov	dx,OFFSET emmname	//fix by andrius4669
@@ -437,10 +437,10 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 =======================
 */
 
-boolean MML_CheckForXMS(global_game_variables_t *gvar)
+boolean MML_CheckForXMS(void)
 {
+	//numUMBs = 0;
 	boolean	errorflag=false;
-	gvar->mm.numUMBs = 0;
 
 	__asm {
 		mov	ax,0x4300
@@ -717,7 +717,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
 void MML_ClearBlock(global_game_variables_t *gvar)
 {
 	//huge mmblocktype huge *scan,huge *last;
-	mmblocktype far *scan,far *last;
+	mmblocktype __far *scan;//,far *last;
 
 	scan = gvar->mm.mmhead->next;
 
@@ -770,9 +770,7 @@ void MM_Startup(global_game_variables_t *gvar)
 	gvar->mm.mmhead = NULL;
 	gvar->mm.mmfree = &(gvar->mm.mmblocks[0]);
 	for(i=0;i<MAXBLOCKS-1;i++)
-	{
 		gvar->mm.mmblocks[i].next = &(gvar->mm.mmblocks[i+1]);
-	}
 	gvar->mm.mmblocks[i].next = NULL;
 
 //
@@ -843,23 +841,9 @@ void MM_Startup(global_game_variables_t *gvar)
 //
 	gvar->mmi.EMSmem = 0;
 //goto emsskip;	//0000
-	for(i = 1;i <
-#ifdef __WATCOMC__
-	__argc
-#endif
-#ifdef __BORLANDC__
-	_argc
-#endif
-	;i++)
+	for(i = 1;i < _argc;i++)
 	{
-		if(US_CheckParm(
-#ifdef __WATCOMC__
-	__argv[i]
-#endif
-#ifdef __BORLANDC__
-	_argv[i]
-#endif
-			,ParmStringsexmm) == 0)
+		if(US_CheckParm(_argv[i],ParmStringsexmm) == 0)
 			goto emsskip;				// param NOEMS
 	}
 	if(MML_CheckForEMS())
@@ -879,36 +863,22 @@ void MM_Startup(global_game_variables_t *gvar)
 emsskip:
 	gvar->mmi.XMSmem = 0;
 goto xmsskip;//0000
-	for(i = 1;i <
-#ifdef __WATCOMC__
-	__argc
-#endif
-#ifdef __BORLANDC__
-	_argc
-#endif
-	;i++)
+	for(i = 1;i < _argc;i++)
 	{
-		if(US_CheckParm(
-#ifdef __WATCOMC__
-	__argv[i]
-#endif
-#ifdef __BORLANDC__
-	_argv[i]
-#endif
-			,ParmStringsexmm) == 0)
+		if(US_CheckParm( _argv[i],ParmStringsexmm) == 0)
 			goto xmsskip;				// param NOXMS
 	}
-	if(MML_CheckForXMS(gvar))
+	if(MML_CheckForXMS())
 	{
 		MML_SetupXMS(gvar);					// allocate as many UMBs as possible
 	}
 
 	}
+xmsskip:
 #endif
 //
 // allocate the misc buffer
 //
-xmsskip:
 	gvar->mm.mmrover = gvar->mm.mmhead;		// start looking for space after low block
 
 	MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar);
@@ -938,14 +908,16 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #ifdef __BORLANDC__
 	free(gvar->mm.nearheap);//	printf("		near freed\n");
 #endif
+#ifndef __16_PM__
 #ifdef __DEBUG__
 	if(!dbg_debugpm) {
 #endif
 	if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf("		EMS freed\n"); }
-	if(MML_CheckForXMS(gvar)){ MML_ShutdownXMS(gvar); }//printf("		XMS freed\n"); }
+	if(MML_CheckForXMS()){ MML_ShutdownXMS(gvar); }//printf("		XMS freed\n"); }
 #ifdef __DEBUG__
 	}
 #endif
+#endif
 }
 
 //==========================================================================
@@ -1203,8 +1175,8 @@ void MM_SortMem(global_game_variables_t *gvar)
 {
 	//huge mmblocktype huge *scan,huge *last,huge *next;
 	mmblocktype far *scan,far *last,far *next;
-	unsigned	start,length,source,dest,oldborder;
-	int			playing;
+	unsigned	start,length,source,dest;//++++,oldborder;
+	//++++int			playing;
 
 	//
 	// lock down a currently playing sound
@@ -1314,18 +1286,18 @@ void MM_ShowMemory(global_game_variables_t *gvar)
 {
 	//huge mmblocktype huge *scan;
 	mmblocktype far *scan;
-	word temp;
+	//word temp;
 	sdword	end,owner;
 	//word chx,chy;
 	word w;
 	//dword wwww;
-	byte    scratch[160],scratch0[4096],scratch1[160],str[16];
+	byte    scratch[160],scratch0[4096],str[16];//[[[[scratch1[160],
 	//byte d = '#';
-//****	VW_SetDefaultColors();
-//****	VW_SetLineWidth(40);
+//[[[[	VW_SetDefaultColors();
+//[[[[	VW_SetLineWidth(40);
 //++++mh	temp = bufferofs;
 //++++mh	bufferofs = 0;
-//****	VW_SetScreen (0,0);
+//[[[[	VW_SetScreen (0,0);
 	scan = gvar->mm.mmhead;
 	end = -1;
 
@@ -1617,23 +1589,25 @@ void MM_Report_(global_game_variables_t *gvar)
 	printf("========================================\n");
 	if(MML_CheckForEMS())
 	{
-		printf("	LIMEMS\n");
-		printf("		EMM v%x.%x available\n", gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F);
-		printf("		totalEMSpages:	%u	", gvar->pm.emm.totalEMSpages); printf("freeEMSpages:	%u\n", gvar->pm.emm.freeEMSpages);
-		printf("		EMSPageFrame:	%x\n", gvar->pm.emm.EMSPageFrame);
+		printf("	%cLIMEMS	%u\n", 0xC9, gvar->pm.emm.EMSPresent);
+		printf("	%c%cEMM v%x.%x available\n", 0xC7, 0xC4, gvar->pm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F);
+		printf("	%c%ctotalEMSpages:	%u	", 0xC7, 0xC4, gvar->pm.emm.totalEMSpages); printf("freeEMSpages:	%u\n", gvar->pm.emm.freeEMSpages);
+		printf("	%c%cEMSPageFrame:	%04x\n", 0xC7, 0xC4, gvar->pm.emm.EMSPageFrame);
+		printf("	%c%cEMSmem:	%lu\n", 0xD3, 0xC4, gvar->mmi.EMSmem);
 	}
-	if(MML_CheckForXMS(gvar))
+	if(MML_CheckForXMS())
 	{
-		printf("	XMS\n");
-		printf("		XMSaddr:	%X\n", *XMSaddr);
+		printf("	%cXMS	%u\n", 0xC9, gvar->pm.xmm.XMSPresent);
+		printf("	%c%cXMS v%x.%x available\n", 0xC7, 0xC4, XMSVer>>8,XMSVer&0x0F);
+		printf("	%c%cXMSDriver:	%Fp\n", 0xC7, 0xC4, XMSDriver);
+		printf("	%c%cXMSHandle:	%04x\n", 0xC7, 0xC4, gvar->pm.xmm.XMSHandle);
+		printf("	%c%cXMSmem:	%lu\n", 0xD3, 0xC4, gvar->mmi.XMSmem);
 	}
-	printf("nearheap:	%lu		", gvar->mmi.nearheap); printf("farheap:	%lu\n", gvar->mmi.farheap);
-	if(MML_CheckForEMS()) printf("EMSmem:		%lu	", gvar->mmi.EMSmem); if(MML_CheckForXMS(gvar)) printf("XMSmem:		%lu", gvar->mmi.XMSmem); printf("\n");
-	printf("convmem:\n"); DebugMemory_(gvar, 0);
+	printf("	%cConv.	%u\n", 0xC9, gvar->pm.mm.MainPresent); DebugMemory_(gvar, 0);
 	//printf("mainmem:	%lu\n", gvar->mmi.mainmem);
 	//printf("Total convmem:	%lu	", gvar->mmi.mainmem); printf("TotalFree:	%lu	", MM_TotalFree(gvar)+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf("TotalUsed:	%lu\n", gvar->mmi.mainmem);
 	//printf("			UnusedMemory:	%lu\n", MM_UnusedMemory(gvar));
-
+	printf("nearheap:	%lu		", gvar->mmi.nearheap); printf("farheap:	%lu\n", gvar->mmi.farheap);
 }
 
 //==========================================================================
@@ -1803,6 +1777,15 @@ void MM_FreeBlock(mmblocktype *x, global_game_variables_t *gvar)
 	gvar->mm.mmfree=x;
 }*/
 
+void xms_call(byte v, global_game_variables_t *gvar)
+{
+	dword XMSDriver = gvar->pm.xmm.XMSDriver;
+	__asm {
+		mov	ah,[v]
+		call [DWORD PTR XMSDriver]
+	}
+}
+
 /*void MM_seguin(void)
 {
 	__asm {