From 30668a00a4e8d16e66e2c908215abf669faaa03d Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Tue, 23 Jun 2015 11:45:26 -0500
Subject: [PATCH] wwww 	modified:   16/cawat/16_mm.c 	modified:  
 16/cawat/cawat.bfproject 	modified:   Project 16.bfproject

---
 16/cawat/16_mm.c         | 137 +++++++++++++++++++--------------------
 16/cawat/cawat.bfproject |  48 ++++++++------
 Project 16.bfproject     |  52 +++++++--------
 3 files changed, 121 insertions(+), 116 deletions(-)

diff --git a/16/cawat/16_mm.c b/16/cawat/16_mm.c
index 95e394b0..cf36d26c 100644
--- a/16/cawat/16_mm.c
+++ b/16/cawat/16_mm.c
@@ -130,7 +130,7 @@ boolean MML_CheckForEMS (void)
 	char	emmname[] = "EMMXXXX0";
 
 	__asm {
-		mov	dx,OFF emmname
+		mov	dx,OFF=emmname
 		mov	ax,0x3d00
 		int	0x21		// try to open EMMXXXX0 device
 		jc	error
@@ -215,29 +215,26 @@ void MML_SetupEMS (void)
 
 		cmp	bx,4
 		jle	getpages					// there is only 1,2,3,or 4 pages
-		mov	bx,4						// we can't use more than 4 pages
-	}
-
-getpages:
-asm {
-	mov	[EMSpagesmapped],bx
-	mov	ah,EMS_ALLOCPAGES			// allocate up to 64k of EMS
-	int	EMS_INT
-	or	ah,ah
-	jnz	error
-	mov	[EMShandle],dx
-	}
-	return;
-
+		mov	bx,4						// we can't use more than 4 pages
+
+getpages:
+		mov	[EMSpagesmapped],bx
+		mov	ah,EMS_ALLOCPAGES			// allocate up to 64k of EMS
+		int	EMS_INT
+		or	ah,ah
+		jnz	error
+		mov	[EMShandle],dx
+		jmp End
 error:
-	error = _AH;
-	strcpy (str,"MML_SetupEMS: EMS error 0x");
-	itoa(error,str2,16);
-	strcpy (str,str2);
-	Quit (str);
-
-noEMS:
-;
+		error = _AH;
+		strcpy (str,"MML_SetupEMS: EMS error 0x");
+		itoa(error,str2,16);
+		strcpy (str,str2);
+		printf("%s\n",str);
+		jmp End
+noEMS:
+End:
+	}
 }
 
 
@@ -254,18 +251,16 @@ void MML_ShutdownEMS (void)
 	if (!EMShandle)
 		return;
 
-		{
-	mov	ah,EMS_FREEPAGES
-	mov	dx,[EMShandle]
-	int	EMS_INT
-	or	ah,ah
-	jz	ok
+	__asm
+	{
+		mov	ah,EMS_FREEPAGES
+		mov	dx,[EMShandle]
+		int	EMS_INT
+		or	ah,ah
+		jz	ok
+		printf("MML_ShutdownEMS: Error freeing EMS!");
+		ok:
 	}
-
-	Quit ("MML_ShutdownEMS: Error freeing EMS!");
-
-ok:
-;
 }
 
 /*
@@ -288,25 +283,26 @@ void MM_MapEMS (void)
 
 	for (i=0;i<EMSpagesmapped;i++)
 	{
-			{
-		mov	ah,EMS_MAPPAGE
-		mov	bx,[i]			// logical page
-		mov	al,bl			// physical page
-		mov	dx,[EMShandle]	// handle
-		int	EMS_INT
-		or	ah,ah
-		jnz	error
+		__asm
+		{
+			mov	ah,EMS_MAPPAGE
+			mov	bx,[i]			// logical page
+			mov	al,bl			// physical page
+			mov	dx,[EMShandle]	// handle
+			int	EMS_INT
+			or	ah,ah
+			jnz	error
+			jmp End
+			error:
+			error = _AH;
+			strcpy (str,"MM_MapEMS: EMS error 0x");
+			itoa(error,str2,16);
+			strcpy (str,str2);
+			printf("%s\n",str);
+			End:
 		}
 	}
-
 	return;
-
-error:
-	error = _AH;
-	strcpy (str,"MM_MapEMS: EMS error 0x");
-	itoa(error,str2,16);
-	strcpy (str,str2);
-	Quit (str);
 }
 
 //==========================================================================
@@ -325,15 +321,17 @@ boolean MML_CheckForXMS (void)
 {
 	numUMBs = 0;
 
-asm {
-	mov	ax,0x4300
-	int	0x2f				// query status of installed diver
-	cmp	al,0x80
-	je	good
+	__asm
+	{
+		mov	ax,0x4300
+		int	0x2f				// query status of installed diver
+		cmp	al,0x80
+		je	good
+		good:
 	}
-	return false;
+/*	return false;
 good:
-	return true;
+	return true;*/
 }
 
 
@@ -351,15 +349,14 @@ void MML_SetupXMS (void)
 {
 	unsigned	base,size;
 
-		{
-	mov	ax,0x4310
-	int	0x2f
-	mov	[WORD PTR XMSaddr],bx
-	mov	[WORD PTR XMSaddr+2],es		// function pointer to XMS driver
-	}
+	__asm
+	{
+		mov	ax,0x4310
+		int	0x2f
+		mov	[WORD PTR XMSaddr],bx
+		mov	[WORD PTR XMSaddr+2],es		// function pointer to XMS driver
 
 getmemory:
-		{
 	mov	ah,XMS_ALLOCUMB
 	mov	dx,0xffff					// try for largest block possible
 	call	[DWORD PTR XMSaddr]
@@ -373,10 +370,8 @@ getmemory:
 	call	[DWORD PTR XMSaddr]		// DX holds largest available UMB
 	or	ax,ax
 	jz	done						// another error...
-	}
 
 gotone:
-		{
 	mov	[base],bx
 	mov	[size],dx
 	}
@@ -407,10 +402,12 @@ void MML_ShutdownXMS (void)
 	for (i=0;i<numUMBs;i++)
 	{
 		base = UMBbase[i];
-
-		mov	ah,XMS_FREEUMB
-		mov	dx,[base]
-		call	[DWORD PTR XMSaddr]
+		__asm
+		{
+			mov	ah,XMS_FREEUMB
+			mov	dx,[base]
+			call	[DWORD PTR XMSaddr]
+		}
 	}
 }
 
diff --git a/16/cawat/cawat.bfproject b/16/cawat/cawat.bfproject
index 253f8c78..3b0d54b7 100644
--- a/16/cawat/cawat.bfproject
+++ b/16/cawat/cawat.bfproject
@@ -1,17 +1,10 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
-openfiles: /dos/z/cawat/ID_HEADS.H:1260:233:0:
-openfiles: /dos/z/cawat/16_mm.c:3604:3205:0:
-openfiles: /dos/z/cawat/16_mm.h:1364:1519:0:
-openfiles: /dos/z/cawat/ID_CA.C:1203:822:0:
-openfiles: /dos/z/cawat/ID_CA.H:857:343:0:
-openfiles: /dos/z/cawat/16_in.c:1341:982:0:
-openfiles: /dos/z/cawat/16_in.h:4659:4181:1:
-openfiles: /dos/z/cawat/lib_head.h:1091:173:0:
-openfiles: /dos/z/cawat/types.h:240:0:0:
 openfiles: /dos/z/16/src/lib/ems.c:3881:957:0:
-openfiles: /dos/z/16/src/lib/ems.h:944:379:0:
+openfiles: /dos/z/16/src/lib/ems.h:944:0:0:
 openfiles: /dos/z/keen-src/id_mm.c:3423:3343:0:
+openfiles: /dos/z/16/16/cawat/16_mm.c:4757:4322:1:
+openfiles: /dos/z/16/16/cawat/16_mm.h:0:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -23,7 +16,7 @@ view_left_panel: 0
 default_mime_type: text/plain
 e2c.convert_xml: 1
 c2e.convert_iso: 0
-opendir: file:///dos/z
+opendir: file:///dos/z/16/16/cawat
 wrap_text_default: 0
 bookmarks_filename_mode: 1
 ssearch_text: _seg
@@ -31,7 +24,7 @@ snr_casesens: 0
 view_blocks: 1
 name: cawatcom
 replacelist: /*_1seg*/
-replacelist:  /*_1seg*/
+replacelist: /*_1seg*/
 replacelist: \t\t
 fb_show_hidden_f: 0
 editor_tab_width: 4
@@ -46,22 +39,22 @@ ssearch_regex: 0
 e2c.convert_iso: 0
 ssearch_casesens: 0
 charmap_block: 1
+recent_files: file:///dos/z/bakapee.asm
 recent_files: file:///dos/z/16/src/lib/ems.c
 recent_files: file:///dos/z/16/src/lib/ems.h
 recent_files: file:///dos/z/keen-src/id_mm.c
-recent_files: file:///dos/z/bakapee.asm
-recent_files: file:///dos/z/cawat/types.h
-recent_files: file:///dos/z/cawat/ID_CA.C
-recent_files: file:///dos/z/cawat/lib_head.h
+recent_files: file:///dos/z/16/16/cawat/16_mm.err
+recent_files: file:///dos/z/16/16/cawat/16_mm.h
+recent_files: file:///dos/z/16/16/cawat/16_mm.c
 snr_replacetype: 0
-savedir: file:///dos/z/cawat
+savedir: file:///dos/z/16/16/cawat
 spell_check_default: 1
 spell_insert_entities: 0
 last_filefilter: 
 htmlbar_notebooktab: 0
 view_blockstack: 1
 snr_escape_chars: 1
-htmlbar_view: 1
+htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
 searchlist: _seg
@@ -72,7 +65,7 @@ searchlist: pseg
 searchlist: peg
 searchlist: pg
 searchlist: _1
-searchlist:  _seg
+searchlist: _seg
 searchlist: asm\t
 searchlist: lo
 searchlist: offset
@@ -82,12 +75,27 @@ searchlist: _seg
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
-snippets_show_as_menu: 1
+snippets_show_as_menu: 0
 adv_open_recursive: 0
 encoding: SHIFT_JIS
 e2c.convert_special: 0
 autoindent: 1
 fb_viewmode: 0
+filegloblist: *.txt
+filegloblist: *.shtml
+filegloblist: *.py
+filegloblist: *.pl
+filegloblist: *.php
+filegloblist: *.js
+filegloblist: *.java
+filegloblist: *.htm
+filegloblist: *.html
+filegloblist: *.h
+filegloblist: *.css
+filegloblist: *.cpp
+filegloblist: *.cgi
+filegloblist: *.c
+filegloblist: *
 recent_dirs: file:///dos/z/cawat
 fb_focus_follow: 1
 ssearch_unescape: 0
diff --git a/Project 16.bfproject b/Project 16.bfproject
index c846e384..f899dd48 100644
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -2,7 +2,7 @@ c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:80:0:0:
 openfiles: /dos/z/16/src/palettec.c:882:0:0:
-openfiles: /dos/z/16/src/pcxtest.c:906:0:1:
+openfiles: /dos/z/16/src/pcxtest.c:931:0:0:
 openfiles: /dos/z/16/src/scroll.c:2847:2098:0:
 openfiles: /dos/z/16/src/fmemtest.c:891:0:0:
 openfiles: /dos/z/16/src/emmtest.c:405:0:0:
@@ -11,7 +11,7 @@ openfiles: /dos/z/16/src/maptest.c:886:0:0:
 openfiles: /dos/z/16/src/maptest0.c:886:0:0:
 openfiles: /dos/z/16/src/test.c:890:0:0:
 openfiles: /dos/z/16/src/test2.c:886:0:0:
-openfiles: /dos/z/16/src/lib/modex16.c:9618:9159:0:
+openfiles: /dos/z/16/src/lib/modex16.c:1963:3289:1:
 openfiles: /dos/z/16/src/lib/modex16.h:1052:576:0:
 openfiles: /dos/z/16/src/lib/planar.h:1008:127:0:
 openfiles: /dos/z/16/src/lib/planar.c:894:0:0:
@@ -34,7 +34,7 @@ openfiles: /dos/z/16/src/lib/jsmn/farjsmn.h:861:381:0:
 openfiles: /dos/z/16/src/lib/lib_head.c:883:0:0:
 openfiles: /dos/z/16/src/lib/lib_head.h:948:377:0:
 openfiles: /dos/z/16/makefile:1004:354:0:
-openfiles: /dos/z/16/src/lib/types.h:1009:28:0:
+openfiles: /dos/z/16/src/lib/types.h:1009:0:0:
 openfiles: /dos/z/16/src/16.h:943:0:0:
 openfiles: /dos/z/16/src/16.c:928:0:0:
 openfiles: /dos/z/16/src/lib/scroll16.h:961:0:0:
@@ -86,45 +86,45 @@ recent_files: file:///dos/z/16/16.c
 recent_files: file:///dos/z/16/src/lib/wcpu/wtest.c
 recent_files: file:///dos/z/16/src/lib/wcpu/wtest.h
 recent_files: file:///dos/z/16/src/lib/wcpu/makefile
+recent_files: file:///dos/z/16/src/pcxtest.c
+recent_files: file:///dos/z/16/doc/project.txt
 recent_files: file:///dos/z/16/src/palettec.c
 recent_files: file:///dos/z/16/src/fmemtest.c
+recent_files: file:///dos/z/16/src/emmtest.c
+recent_files: file:///dos/z/16/src/maptest.c
 recent_files: file:///dos/z/16/src/emsdump.c
+recent_files: file:///dos/z/16/src/scroll.c
+recent_files: file:///dos/z/16/src/maptest0.c
 recent_files: file:///dos/z/16/src/test.c
+recent_files: file:///dos/z/16/src/test2.c
+recent_files: file:///dos/z/16/src/lib/modex16.h
 recent_files: file:///dos/z/16/src/lib/planar.h
-recent_files: file:///dos/z/16/src/lib/bitmap.c
+recent_files: file:///dos/z/16/src/lib/planar.c
 recent_files: file:///dos/z/16/src/lib/modex16.c
+recent_files: file:///dos/z/16/src/lib/bitmap.c
+recent_files: file:///dos/z/16/src/lib/bitmap.h
+recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.h
+recent_files: file:///dos/z/16/src/lib/dos_kb.h
+recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.c
 recent_files: file:///dos/z/16/src/lib/dos_kb.c
 recent_files: file:///dos/z/16/src/lib/mapread.c
-recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.c
+recent_files: file:///dos/z/16/src/lib/mapread.h
 recent_files: file:///dos/z/16/src/lib/fmapread.c
+recent_files: file:///dos/z/16/src/lib/fmapread.h
 recent_files: file:///dos/z/16/src/lib/exmm/memory.h
-recent_files: file:///dos/z/16/src/lib/jsmn/farjsmn.c
-recent_files: file:///dos/z/16/src/lib/exmm/memory.c
 recent_files: file:///dos/z/16/src/lib/exmm/emmret.h
+recent_files: file:///dos/z/16/src/lib/exmm/emmsize.h
+recent_files: file:///dos/z/16/src/lib/exmm/memory.c
+recent_files: file:///dos/z/16/src/lib/jsmn/farjsmn.c
 recent_files: file:///dos/z/16/src/lib/jsmn/farjsmn.h
+recent_files: file:///dos/z/16/src/lib/lib_head.c
+recent_files: file:///dos/z/16/src/lib/lib_head.h
+recent_files: file:///dos/z/16/makefile
+recent_files: file:///dos/z/16/src/lib/types.h
 recent_files: file:///dos/z/16/src/16.h
 recent_files: file:///dos/z/16/src/16.c
 recent_files: file:///dos/z/16/src/lib/scroll16.h
 recent_files: file:///dos/z/16/src/lib/scroll16.c
-recent_files: file:///dos/z/16/doc/project.txt
-recent_files: file:///dos/z/16/src/test2.c
-recent_files: file:///dos/z/16/src/maptest0.c
-recent_files: file:///dos/z/16/src/lib/modex16.h
-recent_files: file:///dos/z/16/src/lib/planar.c
-recent_files: file:///dos/z/16/src/maptest.c
-recent_files: file:///dos/z/16/src/emmtest.c
-recent_files: file:///dos/z/16/src/scroll.c
-recent_files: file:///dos/z/16/src/lib/bitmap.h
-recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.h
-recent_files: file:///dos/z/16/src/lib/dos_kb.h
-recent_files: file:///dos/z/16/src/lib/fmapread.h
-recent_files: file:///dos/z/16/src/lib/mapread.h
-recent_files: file:///dos/z/16/src/lib/lib_head.c
-recent_files: file:///dos/z/16/src/lib/exmm/emmsize.h
-recent_files: file:///dos/z/16/src/lib/lib_head.h
-recent_files: file:///dos/z/16/src/lib/types.h
-recent_files: file:///dos/z/16/src/pcxtest.c
-recent_files: file:///dos/z/16/makefile
 snr_replacetype: 0
 savedir: file:///dos/z/16
 spell_check_default: 1
-- 
2.39.5