Chameleon Commit Details - 1544 - Chameleon open source boot loader project.

Date:

2011-09-20 12:43:17 (12 years 7 months ago)

Author:

JrCs

Commit:

1544

Parents:

1543

Message:

Changes:

M	/trunk/i386/boot2/resume.c

File differences

-139
140 140
141 141
142 
143 
142
144 143
145 144
146 145
+␉mem_base = getmemorylimit() - allocSize;//TODO: lower this␊
␉␊
␉printf("mem_base %x\n", mem_base);␊
␉// Rek : hibernate fix ␊
␉if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000))␊
    if (((long long)mem_base + allocSize) < (1024 * bootInfo->extmem + 0x100000))␊
␉{␊
␉␉printf ("Not enough space to restore image. Press any key to proceed with normal boot.\n");␊
␉␉getchar();␊
 ␉mem_base = getmemorylimit() - allocSize;//TODO: lower this␊
 ␉␊
 ␉printf("mem_base %x\n", mem_base);␊
-␉// Rek : hibernate fix ␊
-␉if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000))␊
+    if (((long long)mem_base + allocSize) < (1024 * bootInfo->extmem + 0x100000))␊
 ␉{␊
 ␉␉printf ("Not enough space to restore image. Press any key to proceed with normal boot.\n");␊
 ␉␉getchar();␊