wwww problems with length of memory block...

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 530bc45b2ad9d7f2c982e94b675a993030b4a6b4..355a4c79c6e812a5736b53667662582a4582e849 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -451,7 +451,7 @@ void MML_UseSpace(unsigned segstart, dword seglength, mminfo_t *mm)
                extra-=fat;
 //printf("extra=%lu    ", extra);
 //printf("segm=%lu\n", segm);
-               printf("MML_UseSpace: Segment spans two blocks!\n");\r
+               printf("MML_UseSpace: Segment spans two blocks!\n");
        }
 
 //segu:
@@ -610,13 +610,11 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                MML_SetupEMS(mm);                                       // allocate space
                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!
                //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
-               if(mm->EMSVer>=0x40) MML_UseSpace(mm->EMSpageframe,((dword)mm->EMSpagesmapped)*0x4000lu, mm);
-               else MML_UseSpace(mm->EMSpageframe,mm->EMSpagesmapped*0x4000lu, mm);
+               MML_UseSpace(mm->EMSpageframe,((dword)mm->EMSpagesmapped)*0x4000lu, mm);
 //printf("EMS3\n");
                MM_MapEMS(mm);                                  // map in used pages
 //printf("EMS4\n");
-               if(mm->EMSVer>=0x40) mmi->EMSmem = ((dword)mm->EMSpagesmapped)*0x4000lu;
-               else mmi->EMSmem = mm->EMSpagesmapped*0x4000lu;
+               mmi->EMSmem = ((dword)mm->EMSpagesmapped)*0x4000lu;
        }
 
 //
@@ -1090,7 +1088,7 @@ fprintf(stdout, "%s", scratch);
 
 dword MM_UnusedMemory(mminfo_t *mm)
 {
-       unsigned free;
+       dword free;
        mmblocktype huge *scan;
 
        free = 0;
@@ -1098,7 +1096,7 @@ dword MM_UnusedMemory(mminfo_t *mm)
 
        while(scan->next)
        {
-               free += scan->next->start - (scan->start + scan->length);
+               free += (dword)scan->next->start - (scan->start + scan->length);
                scan = scan->next;
        }
 
@@ -1121,7 +1119,7 @@ dword MM_UnusedMemory(mminfo_t *mm)
 
 dword MM_TotalFree(mminfo_t *mm)
 {
-       unsigned free;
+       dword free;
        mmblocktype huge *scan;
 
        free = 0;
@@ -1130,8 +1128,8 @@ dword MM_TotalFree(mminfo_t *mm)
        while(scan->next)
        {
                if((scan->attributes&PURGEBITS) && !(scan->attributes&LOCKBIT))
-                       free += scan->length;
-               free += scan->next->start - (scan->start + scan->length);
+                       free += (dword)scan->length;
+               free += (dword)scan->next->start - (scan->start + scan->length);
                scan = scan->next;
        }