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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index bbfec527..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
@@ -154,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
@@ -168,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
@@ -354,15 +355,14 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean
 PML_StartupXMS(global_game_variables_t *gvar)
 {
-	boolean errorflag;
+//TODO: translate the _REG into working assembly
+//#define STARTUPXMSASM
 	byte err;
-	word /*XMSAvail,*/ XMSHandle;
-
-	word XMSAvail1, XMSAvail2, XMSAvail3, XMSAvail4;
-
+	word XMSAvail, XMSHandle;//, XMSVer;
+	boolean errorflag=false;
 	word e=0;
-	errorflag=gvar->pm.xmm.XMSPresent = false;					// Assume failure
-	gvar->pm.xmm.XMSAvail = gvar->mmi.XMSmem = 0;
+	gvar->pm.xmm.XMSPresent = false;					// Assume failure
+	XMSAvail = gvar->mmi.XMSmem = 0;
 
 	__asm {
 		mov	ax,0x4300
@@ -375,20 +375,20 @@ PML_StartupXMS(global_game_variables_t *gvar)
 		int	XMS_INT							// Get address of XMS driver
 		mov	[WORD PTR XMSDriver],bx
 		mov	[WORD PTR XMSDriver+2],es		// function pointer to XMS driver
+
+		mov	ah,XMS_VERSION
+		call	[DWORD PTR XMSDriver]						//; Get XMS Version Number
+		mov	[XMSVer],ax
 		mov	e,2
 
-		//XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
+#ifdef STARTUPXMSASM
 		mov	ah,XMS_QUERYFREE			// Find out how much XMS is available
 		call	[DWORD PTR XMSDriver]
-		//mov	[XMSAvail],ax
-		//mov	XMSAvail1,ax
-		//mov	ax,XMSAvail2
-		//mov	[XMSAvail3],ax
-		mov	ax,[XMSAvail4]
-		mov	err,bl
-		cmp	ax,0				// AJR: bugfix 10/8/92
-		je	error1
+		mov	XMSAvail,ax
+		or	ax,ax				// AJR: bugfix 10/8/92
+		jz	error1
 		mov	e,3
+#endif
 		jmp	End1
 #ifdef __BORLANDC__
 	}
@@ -407,29 +407,38 @@ End1:
 #ifdef __WATCOMC__
 	}
 #endif
-
-//	XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
-//	XMSAvail = _AX;
-//	if (!_AX)				// AJR: bugfix 10/8/92
-//		goto error;
-
-	printf("	XMSAvail=%u	e=%u\n", XMSAvail4, e);
-	//printf("	%u	%u	%u	%u\n", XMSAvail1, XMSAvail2, XMSAvail3, XMSAvail4);
-	XMSAvail4 &= ~(PMPageSizeKB - 1);	// Round off to nearest page size
-	if (XMSAvail4 < (PMPageSizeKB * 2)){	// Need at least 2 pages
-		printf("PISS! %u\n", XMSAvail4);
+	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,[XMSAvail4]
-		//XMS_CALL(XMS_ALLOC);				// And do the allocation
-		mov	ah,XMS_ALLOC
+		mov	dx,XMSAvail
+		mov	ah,XMS_ALLOC				// And do the allocation
 		call	[DWORD PTR XMSDriver]
 		mov	XMSHandle,dx
-		mov	err,bl
-		cmp	ax,0				// AJR: bugfix 10/8/92
-		je	error2
+		or	ax,ax				// AJR: bugfix 10/8/92
+		jz	error2
 		mov	e,4
 		jmp	End2
 #ifdef __BORLANDC__
@@ -449,59 +458,41 @@ End2:
 #ifdef __WATCOMC__
 	}
 #endif
-
-	if(errorflag==false)
-	{
-		gvar->mmi.XMSmem = XMSAvail4 * (dword)1024;
-		gvar->pm.xmm.XMSAvail = XMSAvail4;
-		gvar->pm.xmm.XMSHandle = XMSHandle;
-
-		gvar->pm.xmm.XMSPresent = true;
-		printf("	%u	%u	%u\n", gvar->mmi.XMSmem, gvar->pm.xmm.XMSAvail, XMSAvail4);
-		getch();
-	}else printf("	%u	errorflag=%02X\n", XMSAvail4, err);
-error:
-	return(gvar->pm.xmm.XMSPresent);
-/*
-	gvar->pm.xmm.XMSPresent = false;					// Assume failure
-	gvar->pm.xmm.XMSAvail = 0;
-
-__asm	mov	ax,0x4300
-__asm	int	XMS_INT         				// Check for presence of XMS driver
-	if (_AL != 0x80)
-		goto error;
-
-
-__asm	mov	ax,0x4310
-__asm	int	XMS_INT							// Get address of XMS driver
-__asm	mov	[WORD PTR XMSDriver],bx
-__asm	mov	[WORD PTR XMSDriver+2],es		// function pointer to XMS driver
-
-	XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
-	gvar->pm.xmm.XMSAvail = _AX;
-	if (!_AX)				// AJR: bugfix 10/8/92
-		goto error;
-
-	gvar->pm.xmm.XMSAvail &= ~(PMPageSizeKB - 1);	// Round off to nearest page size
-	if (gvar->pm.xmm.XMSAvail < (PMPageSizeKB * 2))	// Need at least 2 pages
-		goto error;
-
-	_DX = gvar->pm.xmm.XMSAvail;
+#else
+	_DX = XMSAvail;
 	XMS_CALL(XMS_ALLOC);				// And do the allocation
-	gvar->pm.xmm.XMSHandle = _DX;
-
+	XMSHandle = _DX;
 	if (!_AX)				// AJR: bugfix 10/8/92
 	{
-		gvar->pm.xmm.XMSAvail = 0;
+		errorflag=true;
+		err = _BL;
 		goto error;
 	}
-
-	gvar->mmi.XMSmem = gvar->pm.xmm.XMSAvail * 1024;
-
-	gvar->pm.xmm.XMSPresent = true;
+	e++;
+#endif
 error:
-	printf("XMSstart	%u	%u\n", gvar->mmi.XMSmem, gvar->pm.xmm.XMSAvail);
-	return(gvar->pm.xmm.XMSPresent);*/
+	if(errorflag==false)
+	{
+		gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024;
+		gvar->pm.xmm.XMSAvail = XMSAvail;
+		gvar->pm.xmm.XMSHandle = XMSHandle;
+		//gvar->pm.xmm.XMSVer = XMSVer;
+		gvar->pm.xmm.XMSPresent = true;
+#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);
 }
 
 //
@@ -1536,14 +1527,14 @@ PM_Startup(global_game_variables_t *gvar)
 		PML_StartupEMS(gvar);
 	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);
 
@@ -1562,7 +1553,7 @@ PM_Shutdown(global_game_variables_t *gvar)
 	if (!gvar->pm.PMStarted)
 		return;
 
-	PML_ClosePageFile(gvar);
+	//PML_ClosePageFile(gvar);
 
 	PML_ShutdownMainMem(gvar);
 }