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

Date:

2010-09-21 03:29:04 (13 years 7 months ago)

Author:

Evan Lojewski

Commit:

533

Parents:

532

Message:

GUI module should now work in the four main cases (combo of embededtheme and /Extra/Themes). Only tested on my machines.

Changes:

M	/branches/meklort/i386/modules/GUI/GUI_module.c
M	/branches/meklort/i386/boot2/boot.c
M	/branches/meklort/i386/modules/GUI/gui.c

File differences

-294
295 295
296 296
297
298
299
300
301
302
303
304
305
306
307
308
309
297 310
298 311
312
299 313
314
300 315
301 316
302 317
... ...
322 337
323 338
324 339
325 
326 
327 
328 
340
329 341
330 
331 
332 
333 
334 
335 
336 342
337 
338 
339 343
340 344
341 345
+        firstRun = false;␊
    }␊
␉␊
␊
␉// Enable touching a single BIOS device only if "Scan Single Drive"=y is set in system config.␊
    if (getBoolForKey(kScanSingleDriveKey, &gScanSingleDrive, &bootInfo->bootConfig) && gScanSingleDrive) {␊
        gScanSingleDrive = true;␊
    }␊
␉␊
␉// Create a list of partitions on device(s).␊
    if (gScanSingleDrive) {␊
␉␉scanBootVolumes(gBIOSDev, &bvCount);␊
    } else {␊
␉␉scanDisks(gBIOSDev, &bvCount);␊
    }␊
␉␊
␉// Create a separated bvr chain using the specified filters.␊
    bvChain = newFilteredBVChain(0x80, 0xFF, allowBVFlags, denyBVFlags, &gDeviceCount);␊
␉gBootVolume = selectBootVolume(bvChain);␊
␉␊
␉␊
␉// Intialize module system␊
␉if(init_module_system())␊
␉{␊

        gEnableCDROMRescan = promptForRescanOption();␊
    }␊
␉␊
    // Enable touching a single BIOS device only if "Scan Single Drive"=y is set in system config.␊
    if (getBoolForKey(kScanSingleDriveKey, &gScanSingleDrive, &bootInfo->bootConfig) && gScanSingleDrive) {␊
        gScanSingleDrive = true;␊
    }␊
␊
␉␊
    // Create a list of partitions on device(s).␊
    if (gScanSingleDrive) {␊
␉␉scanBootVolumes(gBIOSDev, &bvCount);␊
    } else {␊
␉␉scanDisks(gBIOSDev, &bvCount);␊
    }␊
␉␊
    gBootVolume = selectBootVolume(bvChain);␊
␉␊
#if DEBUG␊
    printf(" Default: %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBootVolume, gBootVolume->biosdev, gBootVolume->part_no, gBootVolume->flags);␊
    printf(" bt(0,0): %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBIOSBootVolume, gBIOSBootVolume->biosdev, gBIOSBootVolume->part_no, gBIOSBootVolume->flags);␊
 ...
         firstRun = false;␊
     }␊
 ␉␊
+␊
+␉// Enable touching a single BIOS device only if "Scan Single Drive"=y is set in system config.␊
+    if (getBoolForKey(kScanSingleDriveKey, &gScanSingleDrive, &bootInfo->bootConfig) && gScanSingleDrive) {␊
+        gScanSingleDrive = true;␊
+    }␊
+␉␊
+␉// Create a list of partitions on device(s).␊
+    if (gScanSingleDrive) {␊
+␉␉scanBootVolumes(gBIOSDev, &bvCount);␊
+    } else {␊
+␉␉scanDisks(gBIOSDev, &bvCount);␊
+    }␊
+␉␊
 ␉// Create a separated bvr chain using the specified filters.␊
     bvChain = newFilteredBVChain(0x80, 0xFF, allowBVFlags, denyBVFlags, &gDeviceCount);␊
+␉gBootVolume = selectBootVolume(bvChain);␊
 ␉␊
+␉␊
 ␉// Intialize module system␊
 ␉if(init_module_system())␊
 ␉{␊
         gEnableCDROMRescan = promptForRescanOption();␊
     }␊
 ␉␊
-    // Enable touching a single BIOS device only if "Scan Single Drive"=y is set in system config.␊
-    if (getBoolForKey(kScanSingleDriveKey, &gScanSingleDrive, &bootInfo->bootConfig) && gScanSingleDrive) {␊
-        gScanSingleDrive = true;␊
-    }␊
+␊
 ␉␊
-    // Create a list of partitions on device(s).␊
-    if (gScanSingleDrive) {␊
-␉␉scanBootVolumes(gBIOSDev, &bvCount);␊
-    } else {␊
-␉␉scanDisks(gBIOSDev, &bvCount);␊
-    }␊
 ␉␊
-    gBootVolume = selectBootVolume(bvChain);␊
-␉␊
 #if DEBUG␊
     printf(" Default: %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBootVolume, gBootVolume->biosdev, gBootVolume->part_no, gBootVolume->flags);␊
     printf(" bt(0,0): %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBIOSBootVolume, gBIOSBootVolume->biosdev, gBIOSBootVolume->part_no, gBIOSBootVolume->flags);␊

-299
300 300
301 301
302
302 303
303 304
304 305
305 306
306 307
307 308
309
308 310
309 311
310 312
... ...
693 695
694 696
695 697
698
696 699
697 700
698 701
+            return 1;␊
        }␊
    }␊
␊
␉return 1;␊
}␊
␊
static int loadGraphics(void)␊
{␊
␉LOADPNG(background,                     IMG_REQUIRED);␊
␊
␉LOADPNG(logo,                           IMG_REQUIRED);␊
␉␊
␉LOADPNG(device_generic,                 IMG_REQUIRED);␊

␉if ((strlen(theme_name) + 27) > sizeof(dirspec)) {␊
␉␉return 1;␊
␉}␊
␉␊
␉sprintf(dirspec, "/Extra/Themes/%s/theme.plist", theme_name);␊
␉if (loadConfigFile(dirspec, &bootInfo->themeConfig) != 0) {␊
#ifdef EMBED_THEME␊
 ...
             return 1;␊
         }␊
     }␊
+␊
 ␉return 1;␊
 }␊
 ␊
 static int loadGraphics(void)␊
 {␊
 ␉LOADPNG(background,                     IMG_REQUIRED);␊
+␊
 ␉LOADPNG(logo,                           IMG_REQUIRED);␊
 ␉␊
 ␉LOADPNG(device_generic,                 IMG_REQUIRED);␊
 ␉if ((strlen(theme_name) + 27) > sizeof(dirspec)) {␊
 ␉␉return 1;␊
 ␉}␊
+␉␊
 ␉sprintf(dirspec, "/Extra/Themes/%s/theme.plist", theme_name);␊
 ␉if (loadConfigFile(dirspec, &bootInfo->themeConfig) != 0) {␊
 #ifdef EMBED_THEME␊

Download the corresponding diff file