Chameleon

Chameleon Commit Details

Date:2010-01-23 22:03:19 (9 years 5 months ago)
Author:Rekursor
Commit:30
Parents: 29
Message:fixed code dupped from loadAcpiTable
Changes:
M/trunk/i386/libsaio/dsdt_patcher.c

File differences

trunk/i386/libsaio/dsdt_patcher.c
216216
217217
218218
219
220
221
222
223
219
224220
225221
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249222
250223
251224
bool drop_ssdt;
bool fix_restart;
if (!getValueForKey(kDSDT, &dsdt_filename, &len, &bootInfo->bootConfig)) {
dsdt_filename = "/Extra/DSDT.aml";
}
if (!getValueForKey("DSDT", &dsdt_filename, &len, &bootInfo->bootConfig))
if (!getValueForKey(kDSDT, &dsdt_filename, &len, &bootInfo->bootConfig))
dsdt_filename="DSDT.aml";
// Rek: Was originally removed by JrCs patch, would like to keep compat for RC5 and take the time
// to discuss and agree on this extra dsdt file location checking removal for RC6
// For now, I believe the results could be catastrophic for users relying on that feature:
// Check booting partition
sprintf(dirspec,"%s",dsdt_filename);
fd=open (dirspec,0);
if (fd<0)
{// Check Extra on booting partition
sprintf(dirspec,"/Extra/%s",dsdt_filename);
fd=open (dirspec,0);
if (fd<0)
{// Fall back to booter partition
sprintf(dirspec,"bt(0,0)/Extra/%s",dsdt_filename);
fd=open (dirspec,0);
if (fd<0)
{
verbose("No DSDT replacement found. Leaving ACPI data as is\n");
return setupAcpiNoMod();
}
}
}
// Load replacement DSDT
new_dsdt=loadACPITable(dsdt_filename);
if (!new_dsdt)

Archive Download the corresponding diff file

Revision: 30