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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 191061f0..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,22 +355,14 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean
 PML_StartupXMS(global_game_variables_t *gvar)
 {
+//TODO: translate the _REG into working assembly
 //#define STARTUPXMSASM
 	byte err;
-#ifndef STARTUPXMSASM
-#define XMSAVI	gvar->pm.xmm.XMSAvail
-#define XMSHAN gvar->pm.xmm.XMSHandle
-#else
-	#define BRACKETXMS
-	word XMSAvail, XMSHandle;
-#define XMSAVI	XMSAvail
-#define XMSHAN XMSHandle
-#endif
-//++++	word XMSVer;
+	word XMSAvail, XMSHandle;//, XMSVer;
 	boolean errorflag=false;
 	word e=0;
 	gvar->pm.xmm.XMSPresent = false;					// Assume failure
-	XMSAVI = gvar->mmi.XMSmem = 0;
+	XMSAvail = gvar->mmi.XMSmem = 0;
 
 	__asm {
 		mov	ax,0x4300
@@ -382,19 +375,16 @@ 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,0
-//++++		call	[DWORD PTR XMSDriver]						//; Get XMS Version Number
-//++++		mov	[XMSVer],ax
+
+		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]//DWORD PTR
-#ifndef BRACKETXMS
-		mov	XMSAVI,ax
-#else
-		mov	[XMSAVI],ax
-#endif
+		call	[DWORD PTR XMSDriver]
+		mov	XMSAvail,ax
 		or	ax,ax				// AJR: bugfix 10/8/92
 		jz	error1
 		mov	e,3
@@ -420,7 +410,7 @@ End1:
 	if(errorflag==true) goto error;
 #ifndef STARTUPXMSASM
 	XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
-	XMSAVI = _AX;
+	XMSAvail = _AX;
 	if (!_AX)				// AJR: bugfix 10/8/92
 	{
 		errorflag = true;
@@ -431,29 +421,22 @@ End1:
 #endif
 
 #ifdef __DEBUG_PM__
-//++++	printf("XMSVer=%02X	", XMSVer);
-	printf("XMSAvail=%u\n", XMSAVI);
+	printf("XMSVer=%02X	", XMSVer);
+	printf("XMSAvail=%u\n", XMSAvail);
+	getch();
 #endif
-	XMSAVI &= ~(PMPageSizeKB - 1);	// Round off to nearest page size
-	if (XMSAVI < (PMPageSizeKB * 2))	// Need at least 2 pages
+	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 {
-#ifndef BRACKETXMS
-		mov	dx,XMSAVI
-#else
-		mov	dx,[XMSAVI]
-#endif
+		mov	dx,XMSAvail
 		mov	ah,XMS_ALLOC				// And do the allocation
-		call	[DWORD PTR XMSDriver]//DWORD PTR
-#ifndef BRACKETXMS
-		mov	XMSHAN,dx
-#else
-		mov	[XMSHAN],dx
-#endif
+		call	[DWORD PTR XMSDriver]
+		mov	XMSHandle,dx
 		or	ax,ax				// AJR: bugfix 10/8/92
 		jz	error2
 		mov	e,4
@@ -476,9 +459,9 @@ End2:
 	}
 #endif
 #else
-	_DX = XMSAVI;
+	_DX = XMSAvail;
 	XMS_CALL(XMS_ALLOC);				// And do the allocation
-	XMSHAN = _DX;
+	XMSHandle = _DX;
 	if (!_AX)				// AJR: bugfix 10/8/92
 	{
 		errorflag=true;
@@ -490,15 +473,13 @@ End2:
 error:
 	if(errorflag==false)
 	{
-		gvar->mmi.XMSmem = (dword)(XMSAVI) * 1024;
-#ifdef STARTUPXMSASM
-		gvar->pm.xmm.XMSAvail = XMSAVI;
-		gvar->pm.xmm.XMSHandle = XMSHAN;
-#endif
-//++++		gvar->pm.xmm.XMSVer = XMSVer;
+		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, XMSAVI);
+		printf("	XMSmem=%lu	XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail);
 #endif
 	}
 	else
@@ -508,7 +489,7 @@ error:
 		//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);
+		printf("	err=%02X	e=%u\n", err, e);
 #endif
 	}
 	return(gvar->pm.xmm.XMSPresent);
@@ -1546,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);
 
@@ -1572,7 +1553,7 @@ PM_Shutdown(global_game_variables_t *gvar)
 	if (!gvar->pm.PMStarted)
 		return;
 
-	PML_ClosePageFile(gvar);
+	//PML_ClosePageFile(gvar);
 
 	PML_ShutdownMainMem(gvar);
 }