Index: trunk/i386/libsaio/gma.c =================================================================== --- trunk/i386/libsaio/gma.c (revision 2738) +++ trunk/i386/libsaio/gma.c (revision 2739) @@ -48,10 +48,6 @@ #define DEBUG_GMA 0 #endif -#ifndef DEBUG_BDW - #define DEBUG_BDW 1 -#endif - #if DEBUG_GMA #define DBG(x...) printf(x) #else @@ -69,10 +65,8 @@ static uint8_t default_aapl_haswell[] = { 0x00,0x00,0x26,0x0c }; // haswell_ig_vals[7] #define AAPL_LEN_HSW ( sizeof(default_aapl_haswell) / sizeof(uint8_t) ) -#if DEBUG_BDW static uint8_t default_aapl_broadwell[] = { 0x00,0x00,0x1e,0x16 }; // broadwell_ig_vals[2] #define AAPL_LEN_BDW ( sizeof(default_aapl_broadwell) / sizeof(uint8_t) ) -#endif uint8_t GMAX3100_vals[23][4] = { { 0x01,0x00,0x00,0x00 }, //0 "AAPL,HasPanel" @@ -135,7 +129,6 @@ { 0x04,0x00,0x12,0x04 } // 16 "AAPL,ig-platform-id" //FB: 32MB, Pipes: 3, Ports: 3, FBMem: 3 - ULT mobile GT3 }; -#if DEBUG_BDW uint8_t broadwell_ig_vals[19][4] = { { 0x00,0x00,0x06,0x16 }, // 0 - 16060000 Broadwell GT1 (Intel HD Graphics) { 0x00,0x00,0x0e,0x16 }, // 1 - 160e0000 Broadwell GT1 (Intel HD Graphics) @@ -157,7 +150,6 @@ { 0x05,0x00,0x26,0x16 }, // 17 - 16260005 Broadwell GT3 (MacBook Air) (Intel HD Graphics 6000) { 0x06,0x00,0x26,0x16 } // 18 - 16260006 Broadwell GT3 (MacBook Air) (Intel HD Graphics 6000) }; -#endif uint8_t HD2000_vals[16][4] = { { 0x00,0x00,0x00,0x00 }, //0 "AAPL00,PixelFormat" @@ -869,7 +861,6 @@ break; -#if DEBUG_BDW /* Broadwell */ /* HD Graphics 5300 Mobile, HD Graphics 6000 Mobile, HD Graphics 6100 Mobile */ case GMA_BROADWELL_BDW_0bd0: // 0bd0 @@ -939,7 +930,7 @@ devprop_add_value(device, "class-code", ClassFix, 4); break; -#endif // DEBUG_BDW + default: break; } Index: trunk/i386/boot2/graphics.c =================================================================== --- trunk/i386/boot2/graphics.c (revision 2738) +++ trunk/i386/boot2/graphics.c (revision 2739) @@ -780,32 +780,33 @@ unsigned long lookUpCLUTIndex( unsigned char index, unsigned char depth ) { - long result; + long result; - long colorIndex = (index * 3); - long red = appleClut8[ colorIndex ]; - long green = appleClut8[ colorIndex++ ]; - long blue = appleClut8[ colorIndex++ ]; + long colorIndex = (index * 3); + long red = appleClut8[ colorIndex ]; + long green = appleClut8[ colorIndex++ ]; + long blue = appleClut8[ colorIndex++ ]; - switch (depth) { - case 16 : - result = ((red & 0xF8) << 7) | - ((green & 0xF8) << 2) | - ((blue & 0xF8) >> 3); - result |= (result << 16); - break; + switch (depth) + { + case 16 : + result = ((red & 0xF8) << 7) | + ((green & 0xF8) << 2) | + ((blue & 0xF8) >> 3); + result |= (result << 16); + break; - case 32 : - result = (red << 16) | (green << 8) | blue; - break; + case 32 : + result = (red << 16) | (green << 8) | blue; + break; - default : - result = index | (index << 8); - result |= (result << 16); - break; - } + default : + result = index | (index << 8); + result |= (result << 16); + break; + } - return result; + return result; } //========================================================================== @@ -859,7 +860,7 @@ unsigned short y, unsigned short width, unsigned short height, - unsigned char *data ) + unsigned char *data ) { unsigned short drawWidth; @@ -930,13 +931,13 @@ void drawPreview(void *src, uint8_t * saveunder) { - uint8_t *screen; + uint8_t *screen; uint32_t rowBytes, pixelShift; uint32_t x, y; int32_t blob; uint32_t alpha, in, color, result; - uint8_t *out; - void *uncomp; + uint8_t *out; + void *uncomp; int origwidth, origheight, origbpx; uint32_t saveindex[kIOHibernateProgressCount] = { 0 }; @@ -961,6 +962,7 @@ screen = (uint8_t *) VIDEO (baseAddr); rowBytes = VIDEO (rowBytes); + // Set the screen to 75% grey. drawColorRectangle(0, 0, VIDEO(width), VIDEO(height), 0x01 /* color index */); } @@ -1024,12 +1026,12 @@ void updateProgressBar(uint8_t * saveunder, int32_t firstBlob, int32_t select) { - uint8_t * screen; - uint32_t rowBytes, pixelShift; - uint32_t x, y; - int32_t blob, lastBlob; - uint32_t alpha, in, color, result; - uint8_t * out; + uint8_t *screen; + uint32_t rowBytes, pixelShift; + uint32_t x, y; + int32_t blob, lastBlob; + uint32_t alpha, in, color, result; + uint8_t *out; uint32_t saveindex[kIOHibernateProgressCount] = { 0 }; pixelShift = VIDEO(depth) >> 4; Index: trunk/i386/boot2/lzvn.c =================================================================== --- trunk/i386/boot2/lzvn.c (revision 2738) +++ trunk/i386/boot2/lzvn.c (revision 2739) @@ -62,9 +62,10 @@ const void *src, size_t src_size) { + const uint64_t rdi = (const uint64_t)dst; + size_t rax = 0; - const uint64_t rdi = (const uint64_t)dst; uint64_t rsi = dst_size; uint64_t rcx = src_size; uint64_t rdx = (uint64_t)src; Index: trunk/i386/boot2/boot.c =================================================================== --- trunk/i386/boot2/boot.c (revision 2738) +++ trunk/i386/boot2/boot.c (revision 2739) @@ -105,7 +105,7 @@ //static void selectBiosDevice(void); /** options.c **/ -extern char* msgbuf; +extern char *msgbuf; void showTextBuffer(char *buf, int size); //========================================================================== Index: trunk/i386/boot2/boot.h =================================================================== --- trunk/i386/boot2/boot.h (revision 2738) +++ trunk/i386/boot2/boot.h (revision 2739) @@ -270,7 +270,7 @@ unsigned short height, const unsigned char *imageData, unsigned char **newImageData ); -extern char * decodeRLE( const void * rleData, int rleBlocks, int outBytes ); +extern char *decodeRLE( const void *rleData, int rleBlocks, int outBytes ); extern void drawBootGraphics(void); extern void drawPreview(void *src, uint8_t *saveunder); extern int getVideoMode(void); Index: trunk/i386/boot2/gui.c =================================================================== --- trunk/i386/boot2/gui.c (revision 2738) +++ trunk/i386/boot2/gui.c (revision 2739) @@ -2330,6 +2330,7 @@ const char *dummyVal; int oldScreenWidth, oldScreenHeight; bool legacy_logo = true; // ErmaC: Legacy Logo is enabled by default + uint16_t x, y; getBoolForKey("Legacy Logo", &legacy_logo, &bootInfo->chameleonConfig); @@ -2384,8 +2385,8 @@ } else { - // Fill the background to 75% grey (same as BootX). - drawColorRectangle(0, 0, screen_params[0], screen_params[1], 0x01); + // Fill the background to 75% grey (same as BootX). + drawColorRectangle(0, 0, screen_params[0], screen_params[1], 0x01); } if ((bootImageData) && (usePngImage)) Index: trunk/i386/boot2/options.c =================================================================== --- trunk/i386/boot2/options.c (revision 2738) +++ trunk/i386/boot2/options.c (revision 2739) @@ -1382,7 +1382,7 @@ } // Ermac : Inject "kext-dev-mode=1" if OS X 10.10 is detected - if ( YOSEMITE ) // OS X is 10.10 + if ( MacOSVerCurrent == MacOSVer2Int("10.10") ) // OS X is 10.10 { addBootArg("kext-dev-mode=1"); }