Chameleon

Chameleon Commit Details

Date:2011-07-29 08:11:24 (8 years 2 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

branches/slice/trunkM/i386/boot2/resume.c
140140
141141
142142
143
143
144
144145
145146
146147
147148
148149
149
150
150151
151152
152153
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;
branches/slice/trunkM/i386/boot2/boot.c
164164
165165
166166
167
167
168168
169169
170170
171171
172172
173
173
174174
175175
176176
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");
branches/slice/trunkM/revision
1
1
1224
1227

Archive Download the corresponding diff file

Revision: 1230