XMS needs serious work!

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 0fb4619a64a1c46ea277b4171af351487f398cc8..b6af09e5bef9328c5ddd1a2e3359501f747c5bcf 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -143,7 +143,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
        union REGS CPURegs;
 
        unsigned int EMSVer = 0;
-       byte    EMS_status;
+       byte    EMSstatus;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0;
 
@@ -152,7 +152,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
                mov     ah,EMS_STATUS
                int     EMS_INT                                         // make sure EMS hardware is present
                or      ah,ah
-               mov     [EMS_status],ah
+               //mov   [EMSstatus],ah
                jnz     error
 
                mov     ah,EMS_VERSION
@@ -219,6 +219,7 @@ End:
        mm->EMSpagesmapped=EMSpagesmapped;
        mm->EMShandle=EMShandle;
        mm->EMSVer=EMSVer;
+       //mm->EMSstatus=EMSstatus;
        return 0;
 }
 
@@ -694,6 +695,7 @@ emsskip:
        if(MML_CheckForXMS(mm))
        {
                printf("XMS!\n");
+               //====needs work!
                //MML_SetupXMS(mm, mmi);                                        // allocate as many UMBs as possible
        }
 
@@ -727,8 +729,6 @@ void MM_Shutdown(mminfo_t *mm)
        printf("far freed\n");
        free(mm->nearheap);
        printf("near freed\n");
-       //hfree(mm->hugeheap);
-       //printf("huge freed\n");
        if(MML_CheckForEMS()){ MML_ShutdownEMS(mm); printf("EMS freed\n"); }
        if(MML_CheckForXMS(mm)){ MML_ShutdownXMS(mm); printf("XMS freed\n"); }
 }
@@ -863,7 +863,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm)
 
        if(!scan)
        {
-               printf("MM_FreePtr: Block not found!");
+               printf("MM_FreePtr: Block not found!\n");
                return;
        }
 
@@ -900,7 +900,7 @@ void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm)
                        mm->mmrover = mm->mmhead;
                else if(mm->mmrover == start)
                {
-                       printf("MM_SetPurge: Block not found!");
+                       printf("MM_SetPurge: Block not found!\n");
                        return;
                }
 
@@ -1111,27 +1111,38 @@ CA_OpenDebug ();
                        return;
                }
                end = scan->start+scan->length-1;
+               chy = scan->start/320;
+               chx = scan->start%320;
                                //modexhlin(page, scan->start, (unsigned)end, chy, color);
                                //for(chx=scan->start;chx+4>=(word)end;chx+=4)
                                //{
-                                       chx=scan->start;
                                        modexClearRegion(page, chx, chy, 4, 4, color);
                                //}
 
 //++++         VW_Hlin(scan->start,(unsigned)end,0,color);
 
 //++++         VW_Plot(scan->start,0,15);
-                               //modexprint(page, scan->start, chy, 1, 47, 0, ((byte *)scan->start));
-                               modexClearRegion(page, scan->start, 0, 4, 4, 15);
+                               modexClearRegion(page, chx, chy, 4, 4, 15);
                if(scan->next->start > end+1)
 //++++                 VW_Hlin(end+1,scan->next->start,0,0);   // black = free
                        //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
                        //{
-                               chx=scan->next->start;
+                               chx+=scan->next->start;
                                modexClearRegion(page, chx, chy, 4, 4, 2);
                        //}
                                        //modexhlin(page, end+1,scan->next->start, chy, 0);
 
+/*
+               end = scan->length-1;
+               y = scan->start/320;
+               x = scan->start%320;
+               VW_Hlin(x,x+end,y,color);
+               VW_Plot(x,y,15);
+               if (scan->next && scan->next->start > end+1)
+                       VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0); // black = free
+
+*/
+
 //****#if 0
 printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
 strcpy(scratch,"Seg:");
@@ -1304,11 +1315,12 @@ dword MM_TotalFree(mminfo_t *mm)
 
 void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi)
 {
+       printf("\n");
        if(MML_CheckForEMS())
        {
-               printf("EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F);
+               printf("Expanded memory manager present. EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F);
                printf("totalEMSpages=%u\n", mm->totalEMSpages);
-               printf("freeEMSpages=%u\n", mm->freeEMSpages);
+               printf("Page frame @0x%04x\n", mm->freeEMSpages);
                printf("EMSpageframe=%x\n", mm->EMSpageframe);
        }
        if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr);