Index: branches/azimutz/Chazileon/TODO =================================================================== --- branches/azimutz/Chazileon/TODO (revision 400) +++ branches/azimutz/Chazileon/TODO (revision 401) @@ -8,7 +8,7 @@ - Add a more sophisticated acpi loading mechanism to enable loading custom acpi tables when dsdtdrop=y Here's a specification to think about: First we must care about if a forced DSDT full path has been specified (was the pb smith had in - his first tries) and take it for the DSDT path as is. + his first tries) and take it for the DSDT path as is. Then we have the case where no DSDT path was set where we run our usual DSDT search algorithm to find this file. In the latter case, the file has to be named DSDT.aml and be in one of the / /Extra or bt(0,0)/Extra directory. @@ -17,7 +17,7 @@ Whatever the path was hardcoded in the DSDT option or was automatically found, we extract the path part of the DSDT file that has been successfully found and we run a loop to enumerate all other acpi files in the same directory. 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. + 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 responsibility of user to provide any other acpi table. @@ -31,7 +31,7 @@ The preferred internal behavior of the log info ioreg buffer would be to store the messages in a consolidated buffer then only write once, - this buffer (i.e just before call the kernel) with flushLogToIOREG(); + this buffer (i.e just before call the kernel) with flushLogToIOREG(); The other public function for writing chameleon boot info data would be: verbose() should incorporate a call to logMessageToIOREG() Index: branches/azimutz/Chazileon/i386/libsaio/acpi_patcher.c =================================================================== --- branches/azimutz/Chazileon/i386/libsaio/acpi_patcher.c (revision 400) +++ branches/azimutz/Chazileon/i386/libsaio/acpi_patcher.c (revision 401) @@ -130,7 +130,7 @@ fd = open(dirSpecDSDT,0); if (fd >= 0) { - printf("ACPI file search cache hit: file found at %s\n", dirSpecDSDT); + verbose("ACPI file search cache hit: file found at %s\n", dirSpecDSDT); goto success_fd; } } Index: branches/azimutz/Chazileon/i386/libsaio/pci_root.c =================================================================== --- branches/azimutz/Chazileon/i386/libsaio/pci_root.c (revision 400) +++ branches/azimutz/Chazileon/i386/libsaio/pci_root.c (revision 401) @@ -110,7 +110,7 @@ rootuid = 0; // ... default uid to 0. } else - printf("Found UID value on ACPI Table provided by user...\n"); + verbose("Found UID value on ACPI Table provided by user...\n"); out: verbose("Using PCI-Root-UID value: %d\n", rootuid); out_out: Index: branches/azimutz/Chazileon/i386/libsaio/ati.c =================================================================== --- branches/azimutz/Chazileon/i386/libsaio/ati.c (revision 400) +++ branches/azimutz/Chazileon/i386/libsaio/ati.c (revision 401) @@ -432,7 +432,7 @@ if (!device || !ati_dev) { return 0; } - printf("dumping pci config space, 256 bytes\n"); //Azi:ATI + verbose("dumping pci config space, 256 bytes\n"); //Azi:ATI config_space = malloc(256); for (i=0; i<=255; i++) { config_space[i] = pci_config_read8( ati_dev->dev.addr, i); @@ -745,7 +745,7 @@ } if (bios[0] == 0x55 && bios[1] == 0xaa) { - printf("Found bios image\n"); //Azi: found image on card. + verbose("Found bios image\n"); //Azi: found image on card. bios_size = bios[2] * 512; struct pci_rom_pci_header_t *rom_pci_header; Index: branches/azimutz/Chazileon/i386/libsaio/stringTable.c =================================================================== --- branches/azimutz/Chazileon/i386/libsaio/stringTable.c (revision 400) +++ branches/azimutz/Chazileon/i386/libsaio/stringTable.c (revision 401) @@ -702,7 +702,7 @@ } else { - printf("No override config provided!\n"); + verbose("No override config provided!\n"); ret = -1; } return ret; Index: branches/azimutz/Chazileon/i386/boot2/drivers.c =================================================================== --- branches/azimutz/Chazileon/i386/boot2/drivers.c (revision 400) +++ branches/azimutz/Chazileon/i386/boot2/drivers.c (revision 401) @@ -161,7 +161,7 @@ long LoadDrivers( char * dirSpec ) { - char dirSpecExtra[128]; + char dirSpecExtra[128]; const char *override_pathfolder = NULL; // full path to a folder. int fd = 0, len = 0; Index: branches/azimutz/Chazileon/i386/boot2/options.c =================================================================== --- branches/azimutz/Chazileon/i386/boot2/options.c (revision 400) +++ branches/azimutz/Chazileon/i386/boot2/options.c (revision 401) @@ -1305,8 +1305,8 @@ else return -1; - // Needed to enable search for override Boot.plist on OS specific folders - // from loadOverrideConfig(). Find out which version mac os we're booting. + // Needed here to enable search for override Boot.plist on OS specific folders. + // Find out which Mac OS version we're booting. if (!loadConfigFile("/System/Library/CoreServices/SystemVersion.plist", &systemVersion)) { if (getValueForKey(kProductVersion, &value, &len, &systemVersion)) @@ -1316,8 +1316,8 @@ strncpy(gMacOSVersion, value, MIN(len, 4)); gMacOSVersion[MIN(len, 4)] = '\0'; } - } // doesn't print to screen here! - + } + //Azi: implemented at loadOverrideConfig. // Load config table specified by the user, or use the default. //if (!getValueForBootKey(cp, "config", &val, &cnt)) {