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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 3b19c0ae..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,16 +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;
-	word XMSAvail, XMSHandle;
-#define XMSAVI	XMSAvail
-#define XMSHAN XMSHandle
-//++++	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
@@ -376,17 +375,18 @@ 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]
-		mov	XMSAVI,ax
-		cmp	bl,0xa0				// 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
@@ -410,8 +410,8 @@ End1:
 	if(errorflag==true) goto error;
 #ifndef STARTUPXMSASM
 	XMS_CALL(XMS_QUERYFREE);			// Find out how much XMS is available
-	XMSAVI = _AX;
-	if (_BL)				// AJR: bugfix 10/8/92
+	XMSAvail = _AX;
+	if (!_AX)				// AJR: bugfix 10/8/92
 	{
 		errorflag = true;
 		err = _BL;
@@ -421,28 +421,24 @@ 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 {
-		mov	dx,XMSAVI
+		mov	dx,XMSAvail
 		mov	ah,XMS_ALLOC				// And do the allocation
 		call	[DWORD PTR XMSDriver]
-#ifndef BRACKETXMS
-		mov	XMSHAN,dx
-#else
-		mov	[XMSHAN],dx
-#endif
-		cmp	ax,0				// AJR: bugfix 10/8/92
-		je	error2
+		mov	XMSHandle,dx
+		or	ax,ax				// AJR: bugfix 10/8/92
+		jz	error2
 		mov	e,4
 		jmp	End2
 #ifdef __BORLANDC__
@@ -463,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;
@@ -477,13 +473,13 @@ End2:
 error:
 	if(errorflag==false)
 	{
-		gvar->mmi.XMSmem = (XMSAVI) * 1024ul;
-		gvar->pm.xmm.XMSAvail = (word)XMSAVI;
-		gvar->pm.xmm.XMSHandle = XMSHAN;
-//++++		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
@@ -493,10 +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("XMSerr\n");
-		printf("	%u,	%lu\n", (word)XMSAVI, (dword)XMSAVI);
 		printf("	err=%02X	e=%u\n", err, e);
-		getch();
 #endif
 	}
 	return(gvar->pm.xmm.XMSPresent);
@@ -1560,7 +1553,7 @@ PM_Shutdown(global_game_variables_t *gvar)
 	if (!gvar->pm.PMStarted)
 		return;
 
-	PML_ClosePageFile(gvar);
+	//PML_ClosePageFile(gvar);
 
 	PML_ShutdownMainMem(gvar);
 }