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

Date:

2010-01-25 00:04:50 (3 years 4 months ago)

Author:

Rekursor

Commit:

Parents:

Message:

Fixed SystemId would not look in bootConfig file. Cleaned up unused variables in dsdt_patcher

Changes:

M	/trunk/i386/libsaio/dsdt_patcher.c
M	/trunk/i386/libsaio/fake_efi.c

File differences

-207
208 208
209 209
210 
211 
212 210
213 
214 211
215 
216 212
217 
218 213
219 214
220 215
+␉void *new_dsdt;␊
␉const char *dsdt_filename;␊
␊
␉char dirspec[512];␊
␊
␉int fd;␊
␊
␉int len;␊
␉bool tmp;␊
␉bool drop_ssdt;␊
␉bool fix_restart;␊
␊
␉if (!getValueForKey(kDSDT, &dsdt_filename, &len, &bootInfo->bootConfig))␊
␉␉dsdt_filename="DSDT.aml";␊
 ␉void *new_dsdt;␊
 ␉const char *dsdt_filename;␊
 ␊
-␉char dirspec[512];␊
-␊
 ␉int fd;␊
-␊
 ␉int len;␊
-␉bool tmp;␊
 ␉bool drop_ssdt;␊
-␉bool fix_restart;␊
 ␊
 ␉if (!getValueForKey(kDSDT, &dsdt_filename, &len, &bootInfo->bootConfig))␊
 ␉␉dsdt_filename="DSDT.aml";␊

-471
472 472
473 473
474 
474
475 475
476 476
477 477
+␊
    // Rek: new SMsystemid option conforming to smbios notation standards, this option should␊
    // belong to smbios config only ...␊
    const char * sysId = getStringForKey("SystemId", &bootInfo->smbiosConfig);␊
    const char * sysId = getStringForKey("SystemId", &bootInfo->bootConfig);␊
    EFI_CHAR8* ret = getUUIDFromString(sysId);␊
␊
    if(!sysId || !ret)  { // try bios dmi info UUID extraction ␊
 ␊
     // Rek: new SMsystemid option conforming to smbios notation standards, this option should␊
     // belong to smbios config only ...␊
-    const char * sysId = getStringForKey("SystemId", &bootInfo->smbiosConfig);␊
+    const char * sysId = getStringForKey("SystemId", &bootInfo->bootConfig);␊
     EFI_CHAR8* ret = getUUIDFromString(sysId);␊
 ␊
     if(!sysId || !ret)  { // try bios dmi info UUID extraction ␊