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

Date:

2017-03-24 20:29:32 (7 years 1 month ago)

Author:

ErmaC

Commit:

2860

Parents:

2859

Message:

Merge greyLogo mode

Changes:

M	/trunk/i386/boot2/graphics.c
M	/trunk/i386/boot2/boot.c
M	/trunk/i386/boot2/gui.c
M	/trunk/i386/boot2/graphics.h
M	/trunk/i386/boot2/appleClut8.h
M	/trunk/i386/libsaio/fake_efi.c
M	/trunk/i386/libsaio/disk.c
M	/trunk/i386/boot2/boot.h
M	/trunk/CHANGES
M	/trunk/i386/boot2/gui.h
M	/trunk/i386/boot2/appleboot.h
M	/trunk/i386/boot2/options.c

File differences

-2227
2228 2228
2229 2229
2230 
2231 
2232 
2233 
2230
2231
2234 2232
2235 2233
2236 2234
2237 2235
2238 
2239 
2240 
2236
2241 2237
2242 2238
2243 2239
2244 2240
2245 2241
2246 
2247 
2248 
2242
2249 2243
2250 2244
2251 2245
... ...
2255 2249
2256 2250
2257 2251
2258 
2259 
2260 
2252
2261 2253
2262 2254
2263 2255
... ...
2269 2261
2270 2262
2271 2263
2272 
2273 
2274 
2275 
2276 
2264
2265
2277 2266
2278 2267
2279 2268
... ...
2289 2278
2290 2279
2291 2280
2292 
2293 
2294 
2281
2295 2282
2296 2283
2297 2284
2298 2285
2299 2286
2300 
2301 
2302 
2287
2303 2288
2304 2289
2305 2290
+␉␉val = XMLDecode(raw);  ␊
␉}␊
␊
␉/*␊
␉ * Traverse gDISKBVmap to get references for␊
␉ * individual bvr chains of each drive.␊
␉ */␊
␉// Traverse gDISKBVmap to get references for␊
␉// individual bvr chains of each drive.␊
␉for (map = gDiskBVMap; map; map = map->next)␊
␉{␊
␉␉for (bvr = map->bvr; bvr; bvr = bvr->next)␊
␉␉{␊
␉␉␉/*␊
␉␉␉ * Save the last bvr.␊
␉␉␉ */␊
␉␉␉// Save the last bvr.␊
␉␉␉if (newBVR)␊
␉␉␉{␊
␉␉␉␉prevBVR = newBVR;␊
␉␉␉}␊
␊
␉␉␉/*␊
␉␉␉ * Allocate and copy the matched bvr entry into a new one.␊
␉␉␉ */␊
␉␉␉// Allocate and copy the matched bvr entry into a new one.␊
␉␉␉newBVR = (BVRef) malloc(sizeof(*newBVR));␊
␉␉␉if (!newBVR)␊
␉␉␉{␊

␊
␉␉␉bcopy(bvr, newBVR, sizeof(*newBVR));␊
␊
␉␉␉/*␊
␉␉␉ * Adjust the new bvr's fields.␊
␉␉␉ */␊
␉␉␉// Adjust the new bvr's fields.␊
␉␉␉newBVR->next = NULL;␊
␉␉␉newBVR->filtered = true;␊
␊

␉␉␉␉newBVR->visible = true;␊
␉␉␉}␊
␊
␉␉␉/*␊
␉␉␉ * Looking for "Hide Partition" entries in 'hd(x,y)|uuid|"label" hd(m,n)|uuid|"label"' format,␊
␉␉␉ * to be able to hide foreign partitions from the boot menu.␊
␉␉␉ *␊
␉␉␉ */␊
␉␉␉// Looking for "Hide Partition" entries in 'hd(x,y)|uuid|"label" hd(m,n)|uuid|"label"' format,␊
␉␉␉// to be able to hide foreign partitions from the boot menu.␊
␉␉␉if ( (newBVR->flags & kBVFlagForeignBoot) )␊
␉␉␉{␊
␉␉␉␉char *start, *next = val;␊

␉␉␉␉while ( next && *next );␊
␉␉␉}␊
␊
␉␉␉/*␊
␉␉␉ * Use the first bvr entry as the starting chain pointer.␊
␉␉␉ */␊
␉␉␉// Use the first bvr entry as the starting chain pointer.␊
␉␉␉if (!chain)␊
␉␉␉{␊
␉␉␉␉chain = newBVR;␊
␉␉␉}␊
␊
␉␉␉/*␊
␉␉␉ * Update the previous bvr's link pointer to use the new memory area.␊
␉␉␉ */␊
␉␉␉// Update the previous bvr's link pointer to use the new memory area.␊
␉␉␉if (prevBVR)␊
␉␉␉{␊
␉␉␉␉prevBVR->next = newBVR;␊
 ...
 ...
 ...
 ␉␉val = XMLDecode(raw);  ␊
 ␉}␊
 ␊
-␉/*␊
-␉ * Traverse gDISKBVmap to get references for␊
-␉ * individual bvr chains of each drive.␊
-␉ */␊
+␉// Traverse gDISKBVmap to get references for␊
+␉// individual bvr chains of each drive.␊
 ␉for (map = gDiskBVMap; map; map = map->next)␊
 ␉{␊
 ␉␉for (bvr = map->bvr; bvr; bvr = bvr->next)␊
 ␉␉{␊
-␉␉␉/*␊
-␉␉␉ * Save the last bvr.␊
-␉␉␉ */␊
+␉␉␉// Save the last bvr.␊
 ␉␉␉if (newBVR)␊
 ␉␉␉{␊
 ␉␉␉␉prevBVR = newBVR;␊
 ␉␉␉}␊
 ␊
-␉␉␉/*␊
-␉␉␉ * Allocate and copy the matched bvr entry into a new one.␊
-␉␉␉ */␊
+␉␉␉// Allocate and copy the matched bvr entry into a new one.␊
 ␉␉␉newBVR = (BVRef) malloc(sizeof(*newBVR));␊
 ␉␉␉if (!newBVR)␊
 ␉␉␉{␊
 ␊
 ␉␉␉bcopy(bvr, newBVR, sizeof(*newBVR));␊
 ␊
-␉␉␉/*␊
-␉␉␉ * Adjust the new bvr's fields.␊
-␉␉␉ */␊
+␉␉␉// Adjust the new bvr's fields.␊
 ␉␉␉newBVR->next = NULL;␊
 ␉␉␉newBVR->filtered = true;␊
 ␊
 ␉␉␉␉newBVR->visible = true;␊
 ␉␉␉}␊
 ␊
-␉␉␉/*␊
-␉␉␉ * Looking for "Hide Partition" entries in 'hd(x,y)|uuid|"label" hd(m,n)|uuid|"label"' format,␊
-␉␉␉ * to be able to hide foreign partitions from the boot menu.␊
-␉␉␉ *␊
-␉␉␉ */␊
+␉␉␉// Looking for "Hide Partition" entries in 'hd(x,y)|uuid|"label" hd(m,n)|uuid|"label"' format,␊
+␉␉␉// to be able to hide foreign partitions from the boot menu.␊
 ␉␉␉if ( (newBVR->flags & kBVFlagForeignBoot) )␊
 ␉␉␉{␊
 ␉␉␉␉char *start, *next = val;␊
 ␉␉␉␉while ( next && *next );␊
 ␉␉␉}␊
 ␊
-␉␉␉/*␊
-␉␉␉ * Use the first bvr entry as the starting chain pointer.␊
-␉␉␉ */␊
+␉␉␉// Use the first bvr entry as the starting chain pointer.␊
 ␉␉␉if (!chain)␊
 ␉␉␉{␊
 ␉␉␉␉chain = newBVR;␊
 ␉␉␉}␊
 ␊
-␉␉␉/*␊
-␉␉␉ * Update the previous bvr's link pointer to use the new memory area.␊
-␉␉␉ */␊
+␉␉␉// Update the previous bvr's link pointer to use the new memory area.␊
 ␉␉␉if (prevBVR)␊
 ␉␉␉{␊
 ␉␉␉␉prevBVR->next = newBVR;␊

-611
612 612
613 613
614 
615 
616 
617 
618 
619 
620 
621 
622 614
623 615
624 616
+␊
␉DT__AddProperty(efiPlatformNode,DEV_PATH_SUP, sizeof(DEVICE_PATHS_SUPPORTED), (EFI_UINT8 *) &DEVICE_PATHS_SUPPORTED);␊
␊
␉// Bungo␊
␉/* Export system-id. Can be disabled with SystemId=No in com.apple.Boot.plist␊
␉if ((ret=getSystemID()))␊
␉{␊
␉␉DT__AddProperty(efiPlatformNode, SYSTEM_ID_PROP, UUID_LEN, (EFI_UINT32 *) ret);␊
␉}␊
␉*/␊
␊
␉DT__AddProperty(efiPlatformNode, SYSTEM_ID_PROP, UUID_LEN, (EFI_UINT32 *)Platform.UUID);␊
␊
␉// Export SystemSerialNumber if present␊
 ␊
 ␉DT__AddProperty(efiPlatformNode,DEV_PATH_SUP, sizeof(DEVICE_PATHS_SUPPORTED), (EFI_UINT8 *) &DEVICE_PATHS_SUPPORTED);␊
 ␊
-␉// Bungo␊
-␉/* Export system-id. Can be disabled with SystemId=No in com.apple.Boot.plist␊
-␉if ((ret=getSystemID()))␊
-␉{␊
-␉␉DT__AddProperty(efiPlatformNode, SYSTEM_ID_PROP, UUID_LEN, (EFI_UINT32 *) ret);␊
-␉}␊
-␉*/␊
-␊
 ␉DT__AddProperty(efiPlatformNode, SYSTEM_ID_PROP, UUID_LEN, (EFI_UINT32 *)Platform.UUID);␊
 ␊
 ␉// Export SystemSerialNumber if present␊

-20
21 21
22 22
23 
23
24 24
25 
25
26 26
27 27
28 28
+␊
int loadPngImage(const char *filename, uint16_t *width, uint16_t *height, uint8_t **imageData);␊
␊
unsigned long lookUpCLUTIndex( unsigned char index, unsigned char depth );␊
unsigned long lookUpCLUTIndex( unsigned char index );␊
␊
void drawColorRectangle( unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char  colorIndex );␊
void setBackgroundColor( uint32_t color );␊
void drawDataRectangle( unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char * data );␊
int convertImage( unsigned short width, unsigned short height, const unsigned char *imageData, unsigned char **newImageData );␊
␊
 ␊
 int loadPngImage(const char *filename, uint16_t *width, uint16_t *height, uint8_t **imageData);␊
 ␊
-unsigned long lookUpCLUTIndex( unsigned char index, unsigned char depth );␊
+unsigned long lookUpCLUTIndex( unsigned char index );␊
 ␊
-void drawColorRectangle( unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char  colorIndex );␊
+void setBackgroundColor( uint32_t color );␊
 void drawDataRectangle( unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char * data );␊
 int convertImage( unsigned short width, unsigned short height, const unsigned char *imageData, unsigned char **newImageData );␊
 ␊

-233
234 234
235 235
236 
236
237 237
238 238
239 239
... ...
1057 1057
1058 1058
1059 1059
1060 
1060
1061 1061
1062 1062
1063 1063
+␉// verbose mode.␊
␉if (gVerboseMode)␊
␉{␊
␉␉setVideoMode(GRAPHICS_MODE, 0);␊
␉␉setVideoMode( GRAPHICS_MODE );␊
␉}␊
␉else␊
␉{␊

␉␉// if we are already in graphics-mode,␊
␉␉if (getVideoMode() == GRAPHICS_MODE)␊
␉␉{␊
␉␉␉setVideoMode(VGA_TEXT_MODE, 0); // switch back to text mode.␊
␉␉␉setVideoMode( VGA_TEXT_MODE ); // switch back to text mode.␊
␉␉}␊
␉}␊
␊
 ...
 ␉// verbose mode.␊
 ␉if (gVerboseMode)␊
 ␉{␊
-␉␉setVideoMode(GRAPHICS_MODE, 0);␊
+␉␉setVideoMode( GRAPHICS_MODE );␊
 ␉}␊
 ␉else␊
 ␉{␊
 ␉␉// if we are already in graphics-mode,␊
 ␉␉if (getVideoMode() == GRAPHICS_MODE)␊
 ␉␉{␊
-␉␉␉setVideoMode(VGA_TEXT_MODE, 0); // switch back to text mode.␊
+␉␉␉setVideoMode( VGA_TEXT_MODE ); // switch back to text mode.␊
 ␉␉}␊
 ␉}␊
 ␊

-206
207 207
208 208
209 
210 209
211 210
212 211
... ...
263 262
264 263
265 264
266 
265
267 266
268 267
269 268
270 
271 
272 
273 
274 
275 
276 
269
277 270
278 271
279 272
+/* Bungo: added this key */␊
#define kPrivateData␉␉␉"PrivateData"␉␉␉/* smbios_decode.c */␊
␊
␊
/*␊
 * Flags to the booter or kernel␊
 */␊

 * graphics.c␊
 */␊
extern void printVBEModeInfo();␊
extern void setVideoMode(int mode, int drawgraphics);␊
extern void setVideoMode(int mode);␊
extern int  getVideoMode();␊
extern void spinActivityIndicator();␊
extern void clearActivityIndicator();␊
extern void drawColorRectangle(␊
                               unsigned short x,␊
                               unsigned short y,␊
                               unsigned short width,␊
                               unsigned short height,␊
                               unsigned char  colorIndex␊
                               );␊
extern void setBackgroundColor( uint32_t color );␊
extern void drawDataRectangle(␊
                              unsigned short  x,␊
                              unsigned short  y,␊
 ...
 /* Bungo: added this key */␊
 #define kPrivateData␉␉␉"PrivateData"␉␉␉/* smbios_decode.c */␊
 ␊
-␊
 /*␊
  * Flags to the booter or kernel␊
  */␊
  * graphics.c␊
  */␊
 extern void printVBEModeInfo();␊
-extern void setVideoMode(int mode, int drawgraphics);␊
+extern void setVideoMode(int mode);␊
 extern int  getVideoMode();␊
 extern void spinActivityIndicator();␊
 extern void clearActivityIndicator();␊
-extern void drawColorRectangle(␊
-                               unsigned short x,␊
-                               unsigned short y,␊
-                               unsigned short width,␊
-                               unsigned short height,␊
-                               unsigned char  colorIndex␊
-                               );␊
+extern void setBackgroundColor( uint32_t color );␊
 extern void drawDataRectangle(␊
                               unsigned short  x,␊
                               unsigned short  y,␊

-1037
1038 1038
1039 1039
1040 
1040
1041 1041
1042 1042
1043 1043
... ...
2417 2417
2418 2418
2419 2419
2420 
2420
2421 2421
2422 2422
2423 2423
... ...
2426 2426
2427 2427
2428 2428
2429 
2430 
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2431 2439
2432 2440
2433 2441
... ...
2440 2448
2441 2449
2442 2450
2443 
2444 
2445 
2446 
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2447 2465
2448 
2449 
2450 
2466
2467
2468
2469
2470
2471
2472
2473
2451 2474
2452 
2453 
2454 
2455 
2456 
2457 
2458 
2459 
2460 
2475
2476
2477
2461 2478
2479
2462 2480
2463 2481
2464
+␉␉␉␉␉␉␉␉// lets copy the screen into the back buffer␊
␉␉␉␉␉␉␉␉memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );␊
␊
␉␉␉␉␉␉␉␉setVideoMode( GRAPHICS_MODE, 0 );␊
␉␉␉␉␉␉␉␉setVideoMode( GRAPHICS_MODE );␊
␊
␉␉␉␉␉␉␉␉gui.initialised = true;␊
␉␉␉␉␉␉␉␉return 0;␊

␉// Set graphics mode if the booter was in text mode or the screen resolution has changed.␊
␉if (bootArgs->Video.v_display == VGA_TEXT_MODE || (screen_params[0] != oldScreenWidth && screen_params[1] != oldScreenHeight) )␊
␉{␊
␉␉setVideoMode(GRAPHICS_MODE, 0);␊
␉␉setVideoMode(GRAPHICS_MODE );␊
␉}␊
␊
␉if (getValueForKey("-checkers", &dummyVal, &length, &bootInfo->chameleonConfig))␊

␉}␊
␉else␊
␉{␊
␉␉// Fill the background to 75% grey (same as BootX).␊
␉␉drawColorRectangle(0, 0, screen_params[0], screen_params[1], 0x01);␊
␉␉if ( ( MacOSVerCurrent >= MacOSVer2Int("10.10") ) && ( FlagBlackOption ) ) // Yosemite and Up!␊
␉␉{␊
␉␉␉// BlackMode␊
␉␉␉setBackgroundColor(0xff030000);␊
␉␉}␊
␉␉else␊
␉␉{␊
␉␉␉// Fill the background to 75% grey (same as BootX).␊
␉␉␉setBackgroundColor(0xffbfbfbf);␊
␉␉}␊
␉}␊
␊
␉if ((bootImageData) && (usePngImage))␊

␉}␊
␉else␊
␉{␊
␉␉uint8_t *appleBootPict;␊
␉␉bootImageData = NULL;␊
␉␉bootImageWidth = kAppleBootWidth;␊
␉␉bootImageHeight = kAppleBootHeight;␊
␉␉// Standard size (Width 84 Height 103)␊
␉␉// TODO HiDPI size (Width 168 Height 206)␊
␉␉// So still need to probe and assign HiDPIOption properly␊
␉␉chooseLogoMode();␊
␉}␊
}␊
// ====================================================================␊
void chooseLogoMode()␊
{␊
␉int logoWith␉= HiDPIOption ? (APPLE_LOGO_WIDTH * 2) : APPLE_LOGO_WIDTH;␊
␉int logoHeight␉= HiDPIOption ? (APPLE_LOGO_HEIGHT * 2) : APPLE_LOGO_HEIGHT;␊
␉int logoX␉= HiDPIOption ? APPLE_LOGO_2X_X : APPLE_LOGO_X;␊
␉int logoY␉= HiDPIOption ? APPLE_LOGO_2X_Y : APPLE_LOGO_Y;␊
␉int logoSize␉= ( logoWith * logoHeight );␊
␊
␉␉// Prepare the data for the default Apple boot image.␊
␉␉appleBootPict = (uint8_t *) decodeRLE(gAppleBootPictRLE, kAppleBootRLEBlocks, bootImageWidth * bootImageHeight);␊
␉␉if (appleBootPict)␊
␉void *dst = malloc(logoSize);␊
␊
␉void *logoData = ( FlagBlackOption ? (void *)AppleLogoBlackPacked : (void *)AppleLogoPacked );␊
␉uint32_t src_size = ( FlagBlackOption ? sizeof(AppleLogoBlackPacked) : sizeof(AppleLogoPacked) );␊
␊
␉if (dst)␊
␉{␊
␉␉if (lzvn_decode(dst, logoSize, logoData, src_size) == logoSize)␊
␉␉{␊
␉␉␉convertImage(bootImageWidth, bootImageHeight, appleBootPict, &bootImageData);␊
␉␉␉if (bootImageData)␊
␉␉␉{␊
␉␉␉␉x = (screen_params[0] - MIN(kAppleBootWidth, screen_params[0])) / 2;␊
␉␉␉␉y = (screen_params[1] - MIN(kAppleBootHeight, screen_params[1])) / 2;␊
␉␉␉␉drawDataRectangle(x, y, kAppleBootWidth, kAppleBootHeight, bootImageData);␊
␉␉␉␉free(bootImageData);␊
␉␉␉}␊
␉␉␉free(appleBootPict);␊
␉␉␉uint8_t *bootImageData = NULL;␊
␉␉␉convertImage(logoWith, logoHeight, dst, &bootImageData);␊
␉␉␉drawDataRectangle(logoX, logoY, logoWith, logoHeight, bootImageData);␊
␉␉}␊
␉␉free(dst);␊
␉}␊
}␊
// ====================================================================␊
 ...
 ...
 ...
 ␉␉␉␉␉␉␉␉// lets copy the screen into the back buffer␊
 ␉␉␉␉␉␉␉␉memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );␊
 ␊
-␉␉␉␉␉␉␉␉setVideoMode( GRAPHICS_MODE, 0 );␊
+␉␉␉␉␉␉␉␉setVideoMode( GRAPHICS_MODE );␊
 ␊
 ␉␉␉␉␉␉␉␉gui.initialised = true;␊
 ␉␉␉␉␉␉␉␉return 0;␊
 ␉// Set graphics mode if the booter was in text mode or the screen resolution has changed.␊
 ␉if (bootArgs->Video.v_display == VGA_TEXT_MODE || (screen_params[0] != oldScreenWidth && screen_params[1] != oldScreenHeight) )␊
 ␉{␊
-␉␉setVideoMode(GRAPHICS_MODE, 0);␊
+␉␉setVideoMode(GRAPHICS_MODE );␊
 ␉}␊
 ␊
 ␉if (getValueForKey("-checkers", &dummyVal, &length, &bootInfo->chameleonConfig))␊
 ␉}␊
 ␉else␊
 ␉{␊
-␉␉// Fill the background to 75% grey (same as BootX).␊
-␉␉drawColorRectangle(0, 0, screen_params[0], screen_params[1], 0x01);␊
+␉␉if ( ( MacOSVerCurrent >= MacOSVer2Int("10.10") ) && ( FlagBlackOption ) ) // Yosemite and Up!␊
+␉␉{␊
+␉␉␉// BlackMode␊
+␉␉␉setBackgroundColor(0xff030000);␊
+␉␉}␊
+␉␉else␊
+␉␉{␊
+␉␉␉// Fill the background to 75% grey (same as BootX).␊
+␉␉␉setBackgroundColor(0xffbfbfbf);␊
+␉␉}␊
 ␉}␊
 ␊
 ␉if ((bootImageData) && (usePngImage))␊
 ␉}␊
 ␉else␊
 ␉{␊
-␉␉uint8_t *appleBootPict;␊
-␉␉bootImageData = NULL;␊
-␉␉bootImageWidth = kAppleBootWidth;␊
-␉␉bootImageHeight = kAppleBootHeight;␊
+␉␉// Standard size (Width 84 Height 103)␊
+␉␉// TODO HiDPI size (Width 168 Height 206)␊
+␉␉// So still need to probe and assign HiDPIOption properly␊
+␉␉chooseLogoMode();␊
+␉}␊
+}␊
+// ====================================================================␊
+void chooseLogoMode()␊
+{␊
+␉int logoWith␉= HiDPIOption ? (APPLE_LOGO_WIDTH * 2) : APPLE_LOGO_WIDTH;␊
+␉int logoHeight␉= HiDPIOption ? (APPLE_LOGO_HEIGHT * 2) : APPLE_LOGO_HEIGHT;␊
+␉int logoX␉= HiDPIOption ? APPLE_LOGO_2X_X : APPLE_LOGO_X;␊
+␉int logoY␉= HiDPIOption ? APPLE_LOGO_2X_Y : APPLE_LOGO_Y;␊
+␉int logoSize␉= ( logoWith * logoHeight );␊
 ␊
-␉␉// Prepare the data for the default Apple boot image.␊
-␉␉appleBootPict = (uint8_t *) decodeRLE(gAppleBootPictRLE, kAppleBootRLEBlocks, bootImageWidth * bootImageHeight);␊
-␉␉if (appleBootPict)␊
+␉void *dst = malloc(logoSize);␊
+␊
+␉void *logoData = ( FlagBlackOption ? (void *)AppleLogoBlackPacked : (void *)AppleLogoPacked );␊
+␉uint32_t src_size = ( FlagBlackOption ? sizeof(AppleLogoBlackPacked) : sizeof(AppleLogoPacked) );␊
+␊
+␉if (dst)␊
+␉{␊
+␉␉if (lzvn_decode(dst, logoSize, logoData, src_size) == logoSize)␊
 ␉␉{␊
-␉␉␉convertImage(bootImageWidth, bootImageHeight, appleBootPict, &bootImageData);␊
-␉␉␉if (bootImageData)␊
-␉␉␉{␊
-␉␉␉␉x = (screen_params[0] - MIN(kAppleBootWidth, screen_params[0])) / 2;␊
-␉␉␉␉y = (screen_params[1] - MIN(kAppleBootHeight, screen_params[1])) / 2;␊
-␉␉␉␉drawDataRectangle(x, y, kAppleBootWidth, kAppleBootHeight, bootImageData);␊
-␉␉␉␉free(bootImageData);␊
-␉␉␉}␊
-␉␉␉free(appleBootPict);␊
+␉␉␉uint8_t *bootImageData = NULL;␊
+␉␉␉convertImage(logoWith, logoHeight, dst, &bootImageData);␊
+␉␉␉drawDataRectangle(logoX, logoY, logoWith, logoHeight, bootImageData);␊
 ␉␉}␊
+␉␉free(dst);␊
 ␉}␊
 }␊
-// ====================================================================␊

-33
34 34
35 35
36
37
38
39
40
41
42
43
44
36 45
37 46
38 47
... ...
161 170
162 171
163 172
173
174
164 175
+#define MENU_SHOW_VIDEO_INFO␉␉5␊
#define MENU_SHOW_HELP␉␉␉6␊
␊
#define APPLE_LOGO_WIDTH  84␊
#define APPLE_LOGO_HEIGHT 103␊
␊
#define APPLE_LOGO_X    ((VIDEO(width) - APPLE_LOGO_WIDTH) / 2)␊
#define APPLE_LOGO_Y    ((VIDEO(height) - APPLE_LOGO_HEIGHT) / 2)␊
␊
#define APPLE_LOGO_2X_X    ((VIDEO(width) - (APPLE_LOGO_WIDTH * 2)) / 2)␊
#define APPLE_LOGO_2X_Y    ((VIDEO(height) - (APPLE_LOGO_HEIGHT * 2)) / 2)␊
␊
// ====================================================================␊
␊
enum {␊

void drawStr(char *ch, font_t *font, pixmap_t *blendInto, position_t p);␊
void drawStrCenteredAt(char *ch, font_t *font, pixmap_t *blendInto, position_t p);␊
␊
void chooseLogoMode();␊
␊
#endif /* !__BOOT2_GUI_H */␊
 ...
 #define MENU_SHOW_VIDEO_INFO␉␉5␊
 #define MENU_SHOW_HELP␉␉␉6␊
 ␊
+#define APPLE_LOGO_WIDTH  84␊
+#define APPLE_LOGO_HEIGHT 103␊
+␊
+#define APPLE_LOGO_X    ((VIDEO(width) - APPLE_LOGO_WIDTH) / 2)␊
+#define APPLE_LOGO_Y    ((VIDEO(height) - APPLE_LOGO_HEIGHT) / 2)␊
+␊
+#define APPLE_LOGO_2X_X    ((VIDEO(width) - (APPLE_LOGO_WIDTH * 2)) / 2)␊
+#define APPLE_LOGO_2X_Y    ((VIDEO(height) - (APPLE_LOGO_HEIGHT * 2)) / 2)␊
+␊
 // ====================================================================␊
 ␊
 enum {␊
 void drawStr(char *ch, font_t *font, pixmap_t *blendInto, position_t p);␊
 void drawStrCenteredAt(char *ch, font_t *font, pixmap_t *blendInto, position_t p);␊
 ␊
+void chooseLogoMode();␊
+␊
 #endif /* !__BOOT2_GUI_H */␊

-813
814 814
815 815
816 
816
817 817
818 818
819 819
... ...
1131 1131
1132 1132
1133 1133
1134 
1134
1135 1135
1136 1136
1137 1137
... ...
1160 1160
1161 1161
1162 1162
1163 
1163
1164 1164
1165 1165
1166 1166
+␉// ensure we're in graphics mode if gui is setup␊
␉if (firstRun && gui.initialised && bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉{␊
␉␉setVideoMode(GRAPHICS_MODE, 0);␊
␉␉setVideoMode( GRAPHICS_MODE );␊
␉}␊
␊
␉// Clear command line boot arguments␊

␉␉␉{␊
␉␉␉␉if (bootArgs->Video.v_display != VGA_TEXT_MODE)␊
␉␉␉␉{␊
␉␉␉␉␉setVideoMode(VGA_TEXT_MODE, 0);␊
␉␉␉␉␉setVideoMode( VGA_TEXT_MODE );␊
␊
␉␉␉␉␉setCursorPosition(0, 0, 0);␊
␉␉␉␉␉clearScreenRows(0, kScreenLastRow);␊

␉␉␉␉else␊
␉␉␉␉{␊
␉␉␉␉␉gui.redraw = true;␊
␉␉␉␉␉setVideoMode(GRAPHICS_MODE, 0);␊
␉␉␉␉␉setVideoMode( GRAPHICS_MODE );␊
␉␉␉␉␉updateVRAM();␊
                    ␉␉␉updateGraphicBootPrompt();␊
␉␉␉␉}␊
 ...
 ...
 ␉// ensure we're in graphics mode if gui is setup␊
 ␉if (firstRun && gui.initialised && bootArgs->Video.v_display == VGA_TEXT_MODE)␊
 ␉{␊
-␉␉setVideoMode(GRAPHICS_MODE, 0);␊
+␉␉setVideoMode( GRAPHICS_MODE );␊
 ␉}␊
 ␊
 ␉// Clear command line boot arguments␊
 ␉␉␉{␊
 ␉␉␉␉if (bootArgs->Video.v_display != VGA_TEXT_MODE)␊
 ␉␉␉␉{␊
-␉␉␉␉␉setVideoMode(VGA_TEXT_MODE, 0);␊
+␉␉␉␉␉setVideoMode( VGA_TEXT_MODE );␊
 ␊
 ␉␉␉␉␉setCursorPosition(0, 0, 0);␊
 ␉␉␉␉␉clearScreenRows(0, kScreenLastRow);␊
 ␉␉␉␉else␊
 ␉␉␉␉{␊
 ␉␉␉␉␉gui.redraw = true;␊
-␉␉␉␉␉setVideoMode(GRAPHICS_MODE, 0);␊
+␉␉␉␉␉setVideoMode( GRAPHICS_MODE );␊
 ␉␉␉␉␉updateVRAM();␊
                     ␉␉␉updateGraphicBootPrompt();␊
 ␉␉␉␉}␊

-1
2 2
3
3 4
4 5
5 6
+- Micky1979 : Added support for Sierra␊
- Zenith432 : HDA bus scans and codecs enumeration.␊
- Pike R. Alpha : Add support for (LZVN) grey logo.␊
- Slice : Added NvidiaSingle␊
- cparm : Rock - Paper - Scissors algo␊
- Bronya : Improve support for AMD CPU.␊
 - Micky1979 : Added support for Sierra␊
 - Zenith432 : HDA bus scans and codecs enumeration.␊
+- Pike R. Alpha : Add support for (LZVN) grey logo.␊
 - Slice : Added NvidiaSingle␊
 - cparm : Rock - Paper - Scissors algo␊
 - Bronya : Improve support for AMD CPU.␊

Download the corresponding diff file