16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / lib / 16_pm.c

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index f4e150822cfcbd2de679684a4a82fa23705a2315..858bd4b9fe121208edf5393ae64f714c4596978a 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -153,6 +153,9 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 //             If there's more than our minimum (2 pages) available, allocate it (up\r
 //                     to the maximum we need)\r
 //\r
+//     Please call MML_CheckForEMS() before calling this function.\r
+//     MML_CheckForEMS is not local despite the name wwww.\r
+//\r
 \r
 boolean\r
 PML_StartupEMS(global_game_variables_t *gvar)\r
@@ -164,7 +167,6 @@ PML_StartupEMS(global_game_variables_t *gvar)
        byte    err=0, str[64];\r
 \r
        boolean errorflag=false;\r
-       static char     emmname[] = "EMMXXXX0"; //fix by andrius4669\r
        unsigned        EMSVer;\r
        unsigned        totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;\r
        totalEMSpages = freeEMSpages = EMSPageFrame = EMSHandle = EMSAvail = EMSVer = 0;        // set all to 0~\r
@@ -172,31 +174,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
        gvar->pm.emm.EMSAvail = gvar->mmi.EMSmem = 0;\r
 \r
        __asm {\r
-               mov     dx,OFFSET emmname       //fix by andrius4669\r
-               mov     ax,0x3d00\r
-               int     EMM_INT         // try to open EMMXXXX0 device\r
-               jc      error1\r
-\r
-               mov     bx,ax\r
-               mov     ax,0x4400\r
-\r
-               int     EMM_INT         // get device info\r
-               jc      error1\r
-\r
-               and     dx,0x80\r
-               jz      error1\r
-\r
-               mov     ax,0x4407\r
-\r
-               int     EMM_INT         // get status\r
-               jc      error1\r
-               or      al,al\r
-               jz      error1\r
-\r
-               mov     ah,0x3e\r
-               int     EMM_INT         // close handle\r
-               jc      error1\r
-\r
+               //MML_CheckForEMS() takes care of what the code did here\r
                mov     ah,EMS_STATUS\r
                int     EMS_INT\r
                jc      error1                  // make sure EMS hardware is present\r
@@ -529,7 +507,6 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
        if (!addr)\r
        {\r
                Quit (gvar, "PML_XMSCopy: zero address\n");\r
-               //return;\r
        }\r
 \r
        xoffset = (dword)xmspage * PMPageSize;\r
@@ -643,8 +620,10 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
        for (i = 0;i < PMMaxMainMem;i++)\r
        {\r
 #ifdef __DEBUG_PM__\r
+#ifdef __DEBUG_PM_MAIN__\r
                printf("PM_SetMainMemPurge()    info of gvar->pm.mm.MainMemPages[i]\n");\r
                printf("&       %Fp,    %Fp\n", &gvar->pm.mm.MainMemPages[i],   &(gvar->pm.mm.MainMemPages[i]));\r
+#endif\r
 #endif\r
                if (gvar->pm.mm.MainMemPages[i])\r
                        MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);\r
@@ -825,8 +804,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 {\r
        int                             i;\r
        long                    size;\r
-                               //__SEGA buf;\r
-       memptr          buf;\r
+       void                    _seg *buf;\r
        dword           far *offsetptr;\r
        word                    far *lengthptr;\r
        PageListStruct  far *page;\r
@@ -845,14 +823,14 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 \r
        // Allocate and clear the page list\r
        gvar->pm.PMNumBlocks = gvar->pm.fi.ChunksInFile;\r
-       MM_GetPtr((memptr *)gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);\r
-       MM_SetLock((memptr *)gvar->pm.PMSegPages,true, gvar);\r
+       MM_GetPtr((memptr *)&gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);\r
+       MM_SetLock((memptr *)&gvar->pm.PMSegPages,true, gvar);\r
        gvar->pm.PMPages = (PageListStruct far *)gvar->pm.PMSegPages;\r
        _fmemset(gvar->pm.PMPages,0,sizeof(PageListStruct) * gvar->pm.PMNumBlocks);\r
 \r
        // Read in the chunk offsets\r
        size = sizeof(dword) * gvar->pm.fi.ChunksInFile;\r
-       MM_GetPtr(&buf, size, gvar);\r
+       MM_GetPtr((memptr *)&buf, size, gvar);\r
        if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
        {\r
                Quit (gvar, "PML_OpenPageFile: Offset read failed");\r
@@ -861,7 +839,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
        offsetptr = (dword far *)buf;\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
                page->offset = *offsetptr++;\r
-       MM_FreePtr(&buf, gvar);\r
+       MM_FreePtr((memptr *)&buf, gvar);\r
 \r
        // Read in the chunk lengths\r
        size = sizeof(word) * gvar->pm.fi.ChunksInFile;\r
@@ -874,7 +852,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
        lengthptr = (word far *)buf;\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
                page->length = *lengthptr++;\r
-       MM_FreePtr(&buf, gvar);\r
+       MM_FreePtr((memptr *)&buf, gvar);\r
 }\r
 \r
 //\r
@@ -887,8 +865,8 @@ PML_ClosePageFile(global_game_variables_t *gvar)
                close(gvar->pm.fi.PageFile);\r
        if (gvar->pm.PMSegPages)\r
        {\r
-               MM_SetLock((memptr)gvar->pm.PMSegPages,false, gvar);\r
-               MM_FreePtr((memptr)gvar->pm.PMSegPages, gvar);\r
+               MM_SetLock((memptr *)&gvar->pm.PMSegPages,false, gvar);\r
+               MM_FreePtr((void _seg *)&gvar->pm.PMSegPages, gvar);\r
        }\r
 }\r
 \r
@@ -1230,7 +1208,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
        if (pagenum >= gvar->pm.fi.ChunksInFile)\r
                Quit (gvar, "PM_GetPage: Invalid page request");\r
 \r
-#ifdef __DEBUG_2__     // for debugging\r
+//#ifdef __DEBUG_2__   // for debugging\r
        __asm {\r
                mov     dx,STATUS_REGISTER_1\r
                in      al,dx\r
@@ -1240,7 +1218,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
                mov     al,10   // bright green\r
                out     dx,al\r
        }\r
-#endif\r
+//#endif\r
 \r
        if (!(result = PM_GetPageAddress(pagenum, gvar)))\r
        {\r
@@ -1258,7 +1236,7 @@ if (!gvar->pm.PMPages[pagenum].offset)    // JDC: sparse page
        }\r
        gvar->pm.PMPages[pagenum].lastHit =  gvar->pm.PMFrameCount;\r
 \r
-#ifdef __DEBUG_2__     // for debugging\r
+//#ifdef __DEBUG_2__   // for debugging\r
        __asm{\r
                mov     dx,STATUS_REGISTER_1\r
                in      al,dx\r
@@ -1269,7 +1247,8 @@ if (!gvar->pm.PMPages[pagenum].offset)    // JDC: sparse page
                out     dx,al\r
                mov     al,0x20 // normal\r
                out     dx,al\r
-#endif\r
+       }\r
+//#endif\r
 \r
        return(result);\r
 }\r
@@ -1553,7 +1532,7 @@ PM_Shutdown(global_game_variables_t *gvar)
        if (!gvar->pm.PMStarted)\r
                return;\r
 \r
-       //PML_ClosePageFile(gvar);\r
+       //0000+=+=PML_ClosePageFile(gvar);\r
 \r
        PML_ShutdownMainMem(gvar);\r
 }\r