Index: branches/azimutz/Chazileon/TODO =================================================================== --- branches/azimutz/Chazileon/TODO (revision 384) +++ branches/azimutz/Chazileon/TODO (revision 385) @@ -2,7 +2,7 @@ ==================================== - Integrate Prasys current work on options and quick shortcut modified version of 18seven -- Add autodetection of efistring algorythm to enabke graphics enabler to beanbled by default while not conflicting whith other efi string overriden content +- Add auto detection of efistring algorithm to enable graphics enabler to be enabled by default while not conflicting with other efi string overriden content (original idea of Galaxy) - Add a more sophisticated acpi loading mechanism to enable loading custom acpi tables when dsdtdrop=y @@ -19,11 +19,11 @@ Now for each acpi file found, we should compare the name with an existing acpi table found in the system that we would normally load and replace this usual injection by the content of the file. - Once DropDSDT=y is set, no other acpi table than dsdt is loaded, then it is the responsability of user + Once DropDSDT=y is set, no other acpi table than dsdt is loaded, then it is the responsibility of user to provide any other acpi table. - Add a new module capable of writing proprietary Chameleon data to ioreg: - Using the DT__xxx() API, we will creat e a set of functions to write + Using the DT__xxx() API, we will create a set of functions to write to log info, chameleon boot info to be retrieved by helper applications... the only public function for log info purpose of this module would be: logMessageToIOREG(...); // var args printf style format Index: branches/azimutz/Chazileon/i386/libsaio/vbe.h =================================================================== --- branches/azimutz/Chazileon/i386/libsaio/vbe.h (revision 384) +++ branches/azimutz/Chazileon/i386/libsaio/vbe.h (revision 385) @@ -127,7 +127,7 @@ * Per-mode info, returned in function 4f02. */ typedef struct { - unsigned short ModeAttributes; + unsigned short ModeAttributes; //Azi:debuginfo unsigned char WinAAttributes; unsigned char WinBAttributes; unsigned short WinGranularity; @@ -143,7 +143,7 @@ unsigned char NumberOfPlanes; unsigned char BitsPerPixel; unsigned char NumberOfBanks; - unsigned char MemoryModel; + unsigned char MemoryModel; //Azi:debuginfo unsigned char BankSize; unsigned char NumberOfImagePages; unsigned char Reserved; Index: branches/azimutz/Chazileon/i386/boot2/graphics.c =================================================================== --- branches/azimutz/Chazileon/i386/boot2/graphics.c (revision 384) +++ branches/azimutz/Chazileon/i386/boot2/graphics.c (revision 385) @@ -370,9 +370,9 @@ unsigned char bitsPerPixel, unsigned short refreshRate ) { - bool debugInfo = false; //Azi:displayinfo + bool debugInfo = false; //Azi:debuginfo extern bool showBootBanner; // || - VBEModeInfoBlock minfo; + VBEModeInfoBlock minfo; // || also need this on gui.c unsigned short mode; unsigned short vesaVersion; int err = errFuncNotSupported; @@ -475,7 +475,7 @@ bootArgs->Video.v_rowBytes = minfo.BytesPerScanline; bootArgs->Video.v_baseAddr = VBEMakeUInt32(minfo.PhysBasePtr); - getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig); //Azi:displayinfo - gui.c, drawDeviceList. + getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig); //Azi:debuginfo - gui.c, drawDeviceList. #if AUTORES_DEBUG gui.screen.mm = minfo.MemoryModel; @@ -530,11 +530,13 @@ return 0; } -int loadPngImage(const char *filename, uint16_t *width, uint16_t *height, uint8_t **imageData) //Azi:style +int loadPngImage(const char *filename, uint16_t *width, uint16_t *height, + uint8_t **imageData) { - int pngSize, pngFile = 0, error = 0; - uint8_t *pngData = NULL; + uint8_t *pngData = NULL; + int pngFile = 0, pngSize; PNG_info_t *info; + int error = 0; pngFile = open_bvdev("bt(0,0)", filename, 0); if (pngFile == -1) { Index: branches/azimutz/Chazileon/i386/boot2/boot.c =================================================================== --- branches/azimutz/Chazileon/i386/boot2/boot.c (revision 384) +++ branches/azimutz/Chazileon/i386/boot2/boot.c (revision 385) @@ -68,7 +68,7 @@ bool gOverrideKernel; static char gBootKernelCacheFile[512]; static char gCacheNameAdler[64 + 256]; -//char *gPlatformName = gCacheNameAdler; Azi: not in use +//char *gPlatformName = gCacheNameAdler; disabled char gRootDevice[512]; char gMKextName[512]; //char gMacOSVersion[8]; //Azi:sysversion - TODO: check why doesn't work here. @@ -415,10 +415,10 @@ if ( bootArgs->Video.v_display == GRAPHICS_MODE ) { drawBackground(); // order matters!! - gui.devicelist.draw = false; // Needed when verbose "flips" the screen. + gui.devicelist.draw = false; // Needed when the verbose "flips" the screen. gui.bootprompt.draw = false; // ? gui.menu.draw = false; // ? - gui.infobox.draw = false; // We can't boot with this drawn; most probably it's not needed!? + gui.infobox.draw = false; // Enter doesn't work with this drawn; most probably it's not needed!? gui.logo.draw = false; updateVRAM(); } Index: branches/azimutz/Chazileon/i386/boot2/graphics.h =================================================================== --- branches/azimutz/Chazileon/i386/boot2/graphics.h (revision 384) +++ branches/azimutz/Chazileon/i386/boot2/graphics.h (revision 385) @@ -14,7 +14,6 @@ #include "vbe.h" //Azi:autoresolution - #ifndef __BOOT_GRAPHICS_H #define __BOOT_GRAPHICS_H Index: branches/azimutz/Chazileon/i386/boot2/boot.h =================================================================== --- branches/azimutz/Chazileon/i386/boot2/boot.h (revision 384) +++ branches/azimutz/Chazileon/i386/boot2/boot.h (revision 385) @@ -199,7 +199,7 @@ extern char bootBanner[]; extern char bootPrompt[]; extern bool gOverrideKernel; -//extern char *gPlatformName; //Azi: not in use +//extern char *gPlatformName; disabled extern char gMKextName[]; extern char gRootDevice[]; extern bool gEnableCDROMRescan; Index: branches/azimutz/Chazileon/i386/boot2/gui.c =================================================================== --- branches/azimutz/Chazileon/i386/boot2/gui.c (revision 384) +++ branches/azimutz/Chazileon/i386/boot2/gui.c (revision 385) @@ -846,7 +846,7 @@ void drawDeviceList (int start, int end, int selection) { int i; - bool debugInfo = false; //Azi:displayinfo + bool debugInfo = false; //Azi:debuginfo extern bool showBootBanner; position_t p, p_prev, p_next; @@ -908,10 +908,11 @@ //Azi: making this info more accessible. TODO: remove the stuff on graphics.c! getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig); -#ifdef AUTORES_DEBUG //Azi:autoresolution +#ifdef AUTORES_DEBUG //Azi:autoresolution - debuginfo debugInfo = true; #endif + //Azi:debuginfo: need to #include vbe.h and also "VBEModeInfoBlock minfo;" if (debugInfo && showBootBanner) { gui.debug.cursor = pos( 10, 100); Index: branches/azimutz/Chazileon/i386/boot2/gui.h =================================================================== --- branches/azimutz/Chazileon/i386/boot2/gui.h (revision 384) +++ branches/azimutz/Chazileon/i386/boot2/gui.h (revision 385) @@ -106,12 +106,12 @@ uint16_t hsyncend; uint16_t vsyncstart; uint16_t vsyncend; - uint8_t mm; // Azi:autoresolution - displayinfo + uint8_t mm; // Azi:autoresolution - debuginfo uint16_t attr; } window_t; /* - * gui structure + * gui structure - Azi:--- take gui.screen.widht as example: gui+gui_t+window_t ?? */ typedef struct { @@ -138,7 +138,7 @@ } gui_t; -gui_t gui; // gui structure +gui_t gui; // gui structure - Azi:--- font_t font_small; font_t font_console; Index: branches/azimutz/Chazileon/i386/boot2/ramdisk.c =================================================================== --- branches/azimutz/Chazileon/i386/boot2/ramdisk.c (revision 384) +++ branches/azimutz/Chazileon/i386/boot2/ramdisk.c (revision 385) @@ -17,7 +17,6 @@ bool gRAMDiskBTAliased = false; char gRAMDiskFile[512]; - // Notify OS X that a ramdisk has been setup. XNU will attach this to /dev/md0 void md0Ramdisk() { @@ -75,8 +74,7 @@ Node* node = DT__FindNode("/chosen/memory-map", false); if(node != NULL) { - DT__AddProperty(node, "RAMDisk", sizeof(RAMDiskParam), (void*)&ramdiskPtr); - + DT__AddProperty(node, "RAMDisk", sizeof(RAMDiskParam), (void*)&ramdiskPtr); } else { Index: branches/azimutz/Chazileon/i386/boot2/options.c =================================================================== --- branches/azimutz/Chazileon/i386/boot2/options.c (revision 384) +++ branches/azimutz/Chazileon/i386/boot2/options.c (revision 385) @@ -34,11 +34,9 @@ #include "autoresolution.h" //Azi:autoresolution - "was" included on boot.h, which is everywere!! -> gui.h -> graphics.h -bool showBootBanner = true; +bool showBootBanner = true; //Azi:debuginfo static bool shouldboot = false; -char gMacOSVersion[8]; //Azi:sysversion - extern int multiboot_timeout; extern int multiboot_timeout_set; @@ -46,6 +44,7 @@ //extern int menucount; extern int gDeviceCount; +char gMacOSVersion[8]; //Azi:sysversion int selectIndex = 0; MenuItem * menuItems = NULL; @@ -115,8 +114,7 @@ } else { - position_t p = pos( gui.screen.width / 2 + 1 , ( gui.devicelist.pos.y + 3 ) + - ( ( gui.devicelist.height - gui.devicelist.iconspacing ) / 2 ) ); + position_t p = pos( gui.screen.width / 2 + 1 , ( gui.devicelist.pos.y + 3 ) + ( ( gui.devicelist.height - gui.devicelist.iconspacing ) / 2 ) ); char dummy[80]; getBootVolumeDescription( gBootVolume, dummy, 80, true );