X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=0d1e2bf9a60694f9c2c145f3eb960d3a918c0194;hb=ea48ceb9434adf5d2316adf51964582579e773d5;hp=26acb3b550e9e5bff4e3212e95328c6712abdc74;hpb=e34b160456e4a78a6597debc3309befe81c02392;p=16.git

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 26acb3b5..0d1e2bf9 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -48,7 +48,8 @@ boolean dbg_debugpm=0;
 //	XMS specific variables
 	//boolean			XMSPresent;
 	//word			gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;
-	dword		XMSDriver;
+	dword			XMSDriver;	//hard to put in gvar
+	word				XMSVer;	//hard to put in gvar
 /*	int				gvar->pm.xmm.XMSProtectPage = -1;
 
 //	File specific variables
@@ -83,11 +84,11 @@ static	char		*ParmStrings[] = {"nomain","noems","noxms",nil};
 byte
 PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 {
-	byte	str[160];
+	byte	err, str[160];
 	unsigned	EMShandle;
-	byte err;
-	boolean	errorflag=false;
 	int	i;
+
+	boolean	errorflag=false;
 	EMShandle=gvar->pm.emm.EMSHandle;
 
 	__asm {
@@ -139,11 +140,10 @@ boolean
 PML_StartupEMS(global_game_variables_t *gvar)
 {
 	int		i;
-	long	size;
-	byte	str[64];
-	byte err;
+	//long	size;
+	byte	err, str[64];
 
-	boolean errorflag=0;
+	boolean errorflag=false;
 	static char	emmname[] = "EMMXXXX0";	//fix by andrius4669
 	unsigned int EMSVer = 0;
 	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;
@@ -155,13 +155,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 	__asm {
 		mov	dx,OFFSET emmname	//fix by andrius4669
 		mov	ax,0x3d00
-		int	EMS_INT		// try to open EMMXXXX0 device
+		int	EMM_INT		// try to open EMMXXXX0 device
 		jc	error1
 
 		mov	bx,ax
 		mov	ax,0x4400
 
-		int	EMS_INT		// get device info
+		int	EMM_INT		// get device info
 		jc	error1
 
 		and	dx,0x80
@@ -169,13 +169,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 
 		mov	ax,0x4407
 
-		int	EMS_INT		// get status
+		int	EMM_INT		// get status
 		jc	error1
 		or	al,al
 		jz	error1
 
 		mov	ah,0x3e
-		int	EMS_INT		// close handle
+		int	EMM_INT		// close handle
 		jc	error1
 
 		mov	ah,EMS_STATUS
@@ -299,10 +299,9 @@ void
 PML_ShutdownEMS(global_game_variables_t *gvar)
 {
 	word EMSHandle;
-	byte err;
-	byte	str[64];
-	boolean errorflag=false;
+	byte err,str[64];
 
+	boolean errorflag=false;
 	EMSHandle=gvar->pm.emm.EMSHandle;
 
 	if (gvar->pm.emm.EMSPresent)
@@ -356,91 +355,143 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean
 PML_StartupXMS(global_game_variables_t *gvar)
 {
-	boolean errorflag;
-	word XMSAvail, XMSHandle;
-	errorflag=gvar->pm.xmm.XMSPresent = false;					// Assume failure
-	gvar->pm.xmm.XMSAvail = gvar->mmi.XMSmem = 0;
+//TODO: translate the _REG into working assembly
+//#define STARTUPXMSASM
+	byte err;
+	word XMSAvail, XMSHandle;//, XMSVer;
+	boolean errorflag=false;
+	word e=0;
+	gvar->pm.xmm.XMSPresent = false;					// Assume failure
+	XMSAvail = gvar->mmi.XMSmem = 0;
 
 	__asm {
 		mov	ax,0x4300
 		int	XMS_INT         				// Check for presence of XMS driver
 		cmp	al,0x80
-		jne	errorxu
+		jne	error1
+		mov	e,1
 
 		mov	ax,0x4310
 		int	XMS_INT							// Get address of XMS driver
 		mov	[WORD PTR XMSDriver],bx
 		mov	[WORD PTR XMSDriver+2],es		// function pointer to XMS driver
 
-		//XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
-		mov	ah,XMS_QUERYFREE
+		mov	ah,XMS_VERSION
+		call	[DWORD PTR XMSDriver]						//; Get XMS Version Number
+		mov	[XMSVer],ax
+		mov	e,2
+
+#ifdef STARTUPXMSASM
+		mov	ah,XMS_QUERYFREE			// Find out how much XMS is available
 		call	[DWORD PTR XMSDriver]
-		mov	[XMSAvail],ax
+		mov	XMSAvail,ax
 		or	ax,ax				// AJR: bugfix 10/8/92
-		jz	errorxu
-		jmp	Endxu
+		jz	error1
+		mov	e,3
+#endif
+		jmp	End1
 #ifdef __BORLANDC__
 	}
 #endif
-		errorxu:
+	error1:
 #ifdef __BORLANDC__
 	__asm {
 #endif
-		//mov	err,ah
+		mov	err,bl
 		mov	errorflag,1
-		jmp	Endxu
+		jmp End1
 #ifdef __BORLANDC__
 	}
 #endif
-		Endxu:
+End1:
 #ifdef __WATCOMC__
 	}
 #endif
-	XMSAvail &= ~(PMPageSizeKB - 1);	// Round off to nearest page size
-	if (XMSAvail < (PMPageSizeKB * 2)){	// Need at least 2 pages
-		printf("PISS! %u\n", XMSAvail);
+	if(errorflag==true) goto error;
+#ifndef STARTUPXMSASM
+	XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
+	XMSAvail = _AX;
+	if (!_AX)				// AJR: bugfix 10/8/92
+	{
+		errorflag = true;
+		err = _BL;
 		goto error;
 	}
+	e++;
+#endif
 
+#ifdef __DEBUG_PM__
+	printf("XMSVer=%02X	", XMSVer);
+	printf("XMSAvail=%u\n", XMSAvail);
+	getch();
+#endif
+	XMSAvail &= ~(PMPageSizeKB - 1);	// Round off to nearest page size
+	if (XMSAvail < (PMPageSizeKB * 2))	// Need at least 2 pages
+	{
+		errorflag=true;
+		goto error;
+	}
+#ifdef STARTUPXMSASM
 	__asm {
-		mov	dx,[XMSAvail]
-		//XMS_CALL(XMS_ALLOC);				// And do the allocation
-		mov	ah,XMS_ALLOC
-		call	[WORD PTR XMSDriver]
-		mov	[XMSHandle],dx
+		mov	dx,XMSAvail
+		mov	ah,XMS_ALLOC				// And do the allocation
+		call	[DWORD PTR XMSDriver]
+		mov	XMSHandle,dx
 		or	ax,ax				// AJR: bugfix 10/8/92
-		jz	errorxuu
-		jmp	Endxuu
+		jz	error2
+		mov	e,4
+		jmp	End2
 #ifdef __BORLANDC__
-		}
+	}
 #endif
-		errorxuu:
+	error2:
 #ifdef __BORLANDC__
 	__asm {
 #endif
-		//mov	err,ah
-		mov	[XMSAvail],0
+		mov	err,bl
 		mov	errorflag,1
-		jmp	Endxuu
+		jmp End2
 #ifdef __BORLANDC__
 	}
 #endif
-		Endxuu:
+End2:
 #ifdef __WATCOMC__
 	}
 #endif
-
+#else
+	_DX = XMSAvail;
+	XMS_CALL(XMS_ALLOC);				// And do the allocation
+	XMSHandle = _DX;
+	if (!_AX)				// AJR: bugfix 10/8/92
+	{
+		errorflag=true;
+		err = _BL;
+		goto error;
+	}
+	e++;
+#endif
+error:
 	if(errorflag==false)
 	{
+		gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024;
 		gvar->pm.xmm.XMSAvail = XMSAvail;
-		gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * (dword)1024;
 		gvar->pm.xmm.XMSHandle = XMSHandle;
-
+		//gvar->pm.xmm.XMSVer = XMSVer;
 		gvar->pm.xmm.XMSPresent = true;
-		printf("	%u	%u	%u\n", gvar->mmi.XMSmem, gvar->pm.xmm.XMSAvail, XMSAvail);
-		getch();
-	}else printf("	errorflag\n");
-error:
+#ifdef __DEBUG_PM__
+		printf("	XMSmem=%lu	XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail);
+#endif
+	}
+	else
+	{
+#ifdef __DEBUG_PM__
+		//printf("XMSHandle\n");
+		//printf("	1=%u	2=%u	3=%u	4=%u\n", XMSHandle1, XMSHandle2, XMSHandle3, XMSHandle4);
+		//printf("	2=%u	", XMSHandle);
+		//printf("	%u", gvar->pm.xmm.XMSHandle);
+		printf("	err=%02X	e=%u\n", err, e);
+#endif
+	}
 	return(gvar->pm.xmm.XMSPresent);
 }
 
@@ -529,7 +580,7 @@ PML_ShutdownXMS(global_game_variables_t *gvar)
 			mov	dx,[XMSHandle]
 			//XMS_CALL(XMS_FREE);
 			mov	ah,XMS_FREE
-			call	[WORD PTR XMSDriver]
+			call	[DWORD PTR XMSDriver]
 			or	bl,bl
 			jz	errorxs
 			jmp	Endxs
@@ -1472,18 +1523,18 @@ PM_Startup(global_game_variables_t *gvar)
 
 	//0000+=+=PML_OpenPageFile(gvar);
 
-	if (!noems)
+	if (!noems && MML_CheckForEMS())
 		PML_StartupEMS(gvar);
-	if (!noxms)
+	if (!noxms && MML_CheckForXMS())
 		PML_StartupXMS(gvar);
+	if(!nomain)
+		PML_StartupMainMem(gvar);
 
-	if (!nomain && !gvar->pm.emm.EMSPresent)
+	if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent)
 	{
-		printf("PM_Startup: No main or EMS\n");
-		exit(-5);
+		Quit("PM_Startup: No main or EMS\n");
 		//return;
 	}
-	PML_StartupMainMem(gvar);
 
 	PM_Reset(gvar);
 
@@ -1496,13 +1547,13 @@ PM_Startup(global_game_variables_t *gvar)
 void
 PM_Shutdown(global_game_variables_t *gvar)
 {
-	PML_ShutdownXMS(gvar);
-	PML_ShutdownEMS(gvar);
+	if(MML_CheckForXMS()) PML_ShutdownXMS(gvar);
+	if(MML_CheckForEMS()) PML_ShutdownEMS(gvar);
 
 	if (!gvar->pm.PMStarted)
 		return;
 
-	PML_ClosePageFile(gvar);
+	//PML_ClosePageFile(gvar);
 
 	PML_ShutdownMainMem(gvar);
 }