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

Date:

2010-03-18 20:17:22 (14 years 28 days ago)

Author:

DieBuche

Commit:

130

Parents:

129

Message:

added changes by azimutz. our versions should now be nearly equal. (excluding the ramdisk changes..)

Changes:

M	/branches/diebuche/i386/boot2/gui.c
M	/branches/diebuche/i386/boot2/boot.h
M	/branches/diebuche/i386/boot2/options.c
M	/branches/diebuche/i386/libsaio/dsdt_patcher.c
M	/branches/diebuche/i386/boot2/boot.c

File differences

-72
73 73
74 74
75 
75
76 76
77 77
78 78
... ...
81 81
82 82
83 83
84 
84
85 85
86 86
87 87
+    }␊
    return NULL;␊
}␊
/** The folowing ACPI Table search algo. should be reused anywhere needed:*/␊
/* The following ACPI Table search algo. should be reused anywhere needed:*/␊
int search_and_get_acpi_fd(const char * filename, const char ** outDirspec)␊
{␊
  int fd=0;␊

  static bool first_time =true; ␊
  int len=0;␊
␊
  /// Take in accound user overriding if it's DSDT only␊
  // Take in accound user overriding if it's DSDT only␊
  if (strstr(filename, "DSDT") && ␊
      getValueForKey(kDSDT, &overriden_pathname, &len,  ␊
␉␉␉   &bootInfo->bootConfig))␊
 ...
     }␊
     return NULL;␊
 }␊
-/** The folowing ACPI Table search algo. should be reused anywhere needed:*/␊
+/* The following ACPI Table search algo. should be reused anywhere needed:*/␊
 int search_and_get_acpi_fd(const char * filename, const char ** outDirspec)␊
 {␊
   int fd=0;␊
   static bool first_time =true; ␊
   int len=0;␊
 ␊
-  /// Take in accound user overriding if it's DSDT only␊
+  // Take in accound user overriding if it's DSDT only␊
   if (strstr(filename, "DSDT") && ␊
       getValueForKey(kDSDT, &overriden_pathname, &len,  ␊
 ␉␉␉   &bootInfo->bootConfig))␊

-167
168 168
169 169
170 
170
171 171
172 172
173 173
... ...
402 402
403 403
404 404
405 
406 
407 
408 
409 
410 
411 
405
412 406
413 407
414 408
+        sleep(kBootErrorTimeout);␊
    }␉␉␊
␉␊
␉//if the vbios patch have been applied retore it before performing fake efi stuff␊
␉//if the vbios patch have been applied restore it before performing fake efi stuff␊
␉if (autoResolution == TRUE) {␊
␉␉unlock_vbios(map);␊
␉␉restore_vbios(map);␊

 ␉␉␉verbose("Patched resolution mode to %dx%d.\n", params[0], params[1]);␊
 ␉␉}␊
 ␉}␊
␉␊
␉␊
␉␊
␉␊
␉␊
␉␊
␉␊
␉␉␊
    if (useGUI) {␊
        /* XXX AsereBLN handle error */␊
␉initGUI();␊
 ...
         sleep(kBootErrorTimeout);␊
     }␉␉␊
 ␉␊
-␉//if the vbios patch have been applied retore it before performing fake efi stuff␊
+␉//if the vbios patch have been applied restore it before performing fake efi stuff␊
 ␉if (autoResolution == TRUE) {␊
 ␉␉unlock_vbios(map);␊
 ␉␉restore_vbios(map);␊
  ␉␉␉verbose("Patched resolution mode to %dx%d.\n", params[0], params[1]);␊
  ␉␉}␊
  ␉}␊
-␉␊
-␉␊
-␉␊
-␉␊
-␉␊
-␉␊
-␉␊
+␉␉␊
     if (useGUI) {␊
         /* XXX AsereBLN handle error */␊
 ␉initGUI();␊

-56
57 57
58 58
59 
60 59
61 60
62 61
... ...
89 88
90 89
91 90
91
92 92
93 93
94 94
+#define kInsantMenuKey␉␉"Instant Menu"␊
#define kDefaultKernel␉␉"mach_kernel"␊
#define kGUIKey␉␉␉"GUI"␊
#define kAutoResolutionKey␉␉␉"AutoResolution"␊
#define kBootBannerKey␉␉"Boot Banner"␊
#define kWaitForKeypressKey␉"Wait"␊
/* AsereBLN: added the other keys */␊

#define kRenamePartition␉"Rename Partition"␉/* disk.c */␊
#define kUseMemDetect␉        "UseMemDetect"␉        /* platform.c */␊
#define kRestartFix             "RestartFix"        /* dsdt_patcher.c */␊
#define kAutoResolutionKey␉"AutoResolution" /* Azi: not present on lebibou diff */␊
␊
/*␊
 * Flags to the booter or kernel␊
 ...
 #define kInsantMenuKey␉␉"Instant Menu"␊
 #define kDefaultKernel␉␉"mach_kernel"␊
 #define kGUIKey␉␉␉"GUI"␊
-#define kAutoResolutionKey␉␉␉"AutoResolution"␊
 #define kBootBannerKey␉␉"Boot Banner"␊
 #define kWaitForKeypressKey␉"Wait"␊
 /* AsereBLN: added the other keys */␊
 #define kRenamePartition␉"Rename Partition"␉/* disk.c */␊
 #define kUseMemDetect␉        "UseMemDetect"␉        /* platform.c */␊
 #define kRestartFix             "RestartFix"        /* dsdt_patcher.c */␊
+#define kAutoResolutionKey␉"AutoResolution" /* Azi: not present on lebibou diff */␊
 ␊
 /*␊
  * Flags to the booter or kernel␊

-1179
1180 1180
1181 1181
1182 
1182
1183 1183
1184 1184
1185 1185
+␊
    // Load com.apple.Boot.plist from the selected volume␊
    // and use its contents to override default bootConfig.␊
    // This is not a mandatory opeartion anymore.␊
    // This is not a mandatory operation anymore.␊
␊
    loadOverrideConfig(&bootInfo->overrideConfig);␊
␊
 ␊
     // Load com.apple.Boot.plist from the selected volume␊
     // and use its contents to override default bootConfig.␊
-    // This is not a mandatory opeartion anymore.␊
+    // This is not a mandatory operation anymore.␊
 ␊
     loadOverrideConfig(&bootInfo->overrideConfig);␊
 ␊