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

Date:

2011-07-29 08:11:24 (12 years 11 months ago)

Author:

Sergey Slice

Commit:

1230

Parents:

1229

Message:

delete error messages

Changes:

M	/branches/slice/trunkM/revision
M	/branches/slice/trunkM/i386/boot2/resume.c
M	/branches/slice/trunkM/i386/boot2/boot.c

File differences

-140
141 141
142 142
143 
143
144
144 145
145 146
146 147
147 148
148 149
149 
150
150 151
151 152
152 153
+␉␊
␉printf("mem_base %x\n", mem_base);␊
␉// Rek : hibernate fix ␊
␉if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000))␊
␉//Slice - psholty␊
/*␉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();␊
␉␉return;␊
␉}␊
␉␊
*/␉␊
␉bcopy(header, (void *) mem_base, sizeof(IOHibernateImageHeader));␊
␉header = (IOHibernateImageHeader *) mem_base;␊
␉␊
 ␉␊
 ␉printf("mem_base %x\n", mem_base);␊
 ␉// Rek : hibernate fix ␊
-␉if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000))␊
+␉//Slice - psholty␊
+/*␉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();␊
 ␉␉return;␊
 ␉}␊
-␉␊
+*/␉␊
 ␉bcopy(header, (void *) mem_base, sizeof(IOHibernateImageHeader));␊
 ␉header = (IOHibernateImageHeader *) mem_base;␊
 ␉␊

-164
165 165
166 166
167 
167
168 168
169 169
170 170
171 171
172 172
173 
173
174 174
175 175
176 176
+    execute_hook("DriversLoaded", (void*)binary, NULL, NULL, NULL);␊
␊
␉clearActivityIndicator();␊
␉␊
/*␉␊
␉if (gErrors) {␊
␉␉printf("Errors encountered while starting up the computer.\n");␊
␉␉printf("Pausing %d seconds...\n", kBootErrorTimeout);␊
␉␉sleep(kBootErrorTimeout);␊
␉}␊
␉␉␊
*/␉␉␊
␉md0Ramdisk();␊
␉␊
␉verbose("Starting Darwin %s\n",( archCpuType == CPU_TYPE_I386 ) ? "x86" : "x86_64");␊
     execute_hook("DriversLoaded", (void*)binary, NULL, NULL, NULL);␊
 ␊
 ␉clearActivityIndicator();␊
-␉␊
+/*␉␊
 ␉if (gErrors) {␊
 ␉␉printf("Errors encountered while starting up the computer.\n");␊
 ␉␉printf("Pausing %d seconds...\n", kBootErrorTimeout);␊
 ␉␉sleep(kBootErrorTimeout);␊
 ␉}␊
-␉␉␊
+*/␉␉␊
 ␉md0Ramdisk();␊
 ␉␊
 ␉verbose("Starting Darwin %s\n",( archCpuType == CPU_TYPE_I386 ) ? "x86" : "x86_64");␊