Index: branches/slice/i386/libsaio/xml.c =================================================================== --- branches/slice/i386/libsaio/xml.c (revision 688) +++ branches/slice/i386/libsaio/xml.c (revision 689) @@ -357,7 +357,7 @@ } else { - printf("ParseStringID error (0x%x)\n", *val); + verbose("ParseStringID error (0x%x)\n", *val); getc(); return -1; @@ -430,7 +430,7 @@ } else { - printf("ParseIntegerID error (0x%x)\n", *val); + verbose("ParseIntegerID error (0x%x)\n", *val); getc(); return -1; @@ -457,7 +457,7 @@ } else { - printf("ParseStringIDREF error (0x%x)\n", *val); + verbose("ParseStringIDREF error (0x%x)\n", *val); getc(); return -1; @@ -690,7 +690,7 @@ if(buffer[0] == '<') { - printf("Warning integer is non existant\n"); + verbose("Warning integer is non existant\n"); //getc(); tmpTag->type = kTagTypeInteger; tmpTag->string = 0; @@ -723,7 +723,7 @@ } else { - printf("ParseTagInteger hex error (0x%x) in buffer %s\n", *val, buffer); + verbose("ParseTagInteger hex error (0x%x) in buffer %s\n", *val, buffer); getc(); return -1; @@ -746,7 +746,7 @@ { if (*val < '0' || *val > '9') { - printf("ParseTagInteger decimal error (0x%x) in buffer %s\n", *val, buffer); + verbose("ParseTagInteger decimal error (0x%x) in buffer %s\n", *val, buffer); getc(); return -1; } @@ -818,7 +818,7 @@ tmpTag = NewTag(); if (tmpTag == 0) return -1; - printf("ParseTagDate unimplimented\n"); + verbose("ParseTagDate unimplimented\n"); getc(); tmpTag->type = kTagTypeDate; @@ -1142,7 +1142,7 @@ { if(!dict) { - printf("XMLCastInteger: null dict\n"); + verbose("XMLCastInteger: null dict\n"); return 0; } if(dict->type == kTagTypeInteger) return (int)(dict->string); Index: branches/slice/i386/libsaio/device_tree.c =================================================================== --- branches/slice/i386/libsaio/device_tree.c (revision 688) +++ branches/slice/i386/libsaio/device_tree.c (revision 689) @@ -365,7 +365,7 @@ while (level--) *cp++ = ' '; *cp = '\0'; - printf("%s===Node===\n", spaces); + verbose("%s===Node===\n", spaces); for (prop = node->properties; prop; prop = prop->next) { char c = *((char *)prop->value); if (prop->length < 64 && ( @@ -373,12 +373,12 @@ (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_')) { - printf("%s Property '%s' [%d] = '%s'\n", spaces, prop->name, prop->length, prop->value); + verbose("%s Property '%s' [%d] = '%s'\n", spaces, prop->name, prop->length, prop->value); } else { - printf("%s Property '%s' [%d] = (data)\n", spaces, prop->name, prop->length); + verbose("%s Property '%s' [%d] = (data)\n", spaces, prop->name, prop->length); } } - printf("%s==========\n", spaces); + verbose("%s==========\n", spaces); } static void @@ -410,19 +410,19 @@ while (level--) *cp++ = ' '; *cp = '\0'; - printf("%s===Entry %p===\n", spaces, entry); + verbose("%s===Entry %p===\n", spaces, entry); if (kSuccess != DTCreatePropertyIterator(entry, &propIter)) { - printf("Couldn't create property iterator\n"); + verbose("Couldn't create property iterator\n"); return; } while( kSuccess == DTIterateProperties( propIter, &name)) { if( kSuccess != DTGetProperty( entry, name, &prop, &propSize )) continue; - printf("%s Property %s = %s\n", spaces, name, prop); + verbose("%s Property %s = %s\n", spaces, name, prop); } DTDisposePropertyIterator(propIter); - printf("%s==========\n", spaces); + verbose("%s==========\n", spaces); } static void @@ -482,17 +482,17 @@ node = FindNode("/this/is/a/test", 1); AddProperty(node, "dddd", 12, "abcdefghijk"); - printf("In-memory tree:\n\n"); + verbose("In-memory tree:\n\n"); PrintTree(rootNode); FlattenDeviceTree(&flatTree, &flatSize); - printf("Flat tree = %p, size %d\n", flatTree, flatSize); + verbose("Flat tree = %p, size %d\n", flatTree, flatSize); dtEntry = (DTEntry)flatTree; - printf("\n\nPrinting flat tree\n\n"); + verbose("\n\nPrinting flat tree\n\n"); DTInit(dtEntry); Index: branches/slice/i386/libsaio/smbios_patcher.c =================================================================== --- branches/slice/i386/libsaio/smbios_patcher.c (revision 688) +++ branches/slice/i386/libsaio/smbios_patcher.c (revision 689) @@ -19,7 +19,7 @@ #endif #if DEBUG_SMBIOS -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif @@ -1034,8 +1034,8 @@ if (ftTablePairInit && smbios!=NULL) { ftTablePairInit = false; #if DEBUG_SMBIOS - printf(">>> SMBIOSAddr=0x%08x\n", smbios); - printf(">>> DMI: addr=0x%08x, len=%d, count=%d\n", smbios->dmi.tableAddress, + verbose(">>> SMBIOSAddr=0x%08x\n", smbios); + verbose(">>> DMI: addr=0x%08x, len=%d, count=%d\n", smbios->dmi.tableAddress, smbios->dmi.tableLength, smbios->dmi.structureCount); #endif p = (SMBByte *) smbios->dmi.tableAddress; @@ -1055,10 +1055,10 @@ DmiTablePairCount++; } else { - printf("DMI table entries list is full! Next entries won't be stored.\n"); + verbose("DMI table entries list is full! Next entries won't be stored.\n"); } #if DEBUG_SMBIOS - printf("DMI header found for table type %d, length = %d\n", dmihdr->type, dmihdr->length); + verbose("DMI header found for table type %d, length = %d\n", dmihdr->type, dmihdr->length); #endif p = p + dmihdr->length; while ((p - (SMBByte *)smbios->dmi.tableAddress + 1 < smbios->dmi.tableLength) && (p[0] != 0x00 || p[1] != 0x00)) { @@ -1123,12 +1123,12 @@ return orig; case SMBIOS_PATCHED: if (orig==NULL && (orig = getAddressOfSmbiosTable())==NULL ) { - printf("Could not find original SMBIOS !!\n"); + verbose("Could not find original SMBIOS !!\n"); pause(); } else { patched = smbios_dry_run(orig); if(patched==NULL) { - printf("Could not create new SMBIOS !!\n"); + verbose("Could not create new SMBIOS !!\n"); pause(); } else { @@ -1138,7 +1138,7 @@ getSmbiosMacModel(); //Dunno if it is a right place to do that return patched; default: - printf("ERROR: invalid option for getSmbios() !!\n"); + verbose("ERROR: invalid option for getSmbios() !!\n"); break; } Index: branches/slice/i386/libsaio/pci_root.c =================================================================== --- branches/slice/i386/libsaio/pci_root.c (revision 688) +++ branches/slice/i386/libsaio/pci_root.c (revision 689) @@ -12,13 +12,13 @@ #endif #if DEBUG_PCIROOT -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) msglog(x) #endif static int rootuid = 10; //value means function wasnt ran yet - +#if NOTYET //it present in ACPIPatcher static unsigned int findrootuid(unsigned char * dsdt, int len) { int i; @@ -43,7 +43,7 @@ } return 10; } - +#endif int getPciRootUID(void) { // void *new_dsdt; Index: branches/slice/i386/libsaio/pci_root.h =================================================================== --- branches/slice/i386/libsaio/pci_root.h (revision 688) +++ branches/slice/i386/libsaio/pci_root.h (revision 689) @@ -9,6 +9,6 @@ extern int getPciRootUID(void); -unsigned int findpciroot(unsigned char * dsdt,int len); +//unsigned int findpciroot(unsigned char * dsdt,int len); #endif /* !__LIBSAIO_DSDT_PATCHER_H */ Index: branches/slice/i386/libsaio/device_inject.c =================================================================== --- branches/slice/i386/libsaio/device_inject.c (revision 688) +++ branches/slice/i386/libsaio/device_inject.c (revision 689) @@ -18,7 +18,7 @@ #endif #if DEBUG_INJECT -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif @@ -96,7 +96,7 @@ device = malloc(sizeof(struct DevPropDevice)); if (strncmp(path, pciroot_string, strlen(pciroot_string))) { - printf("ERROR parsing device path\n"); + verbose("ERROR parsing device path\n"); return NULL; } @@ -124,7 +124,7 @@ } else { - printf("ERROR parsing device path\n"); + verbose("ERROR parsing device path\n"); numpaths = 0; break; } @@ -143,7 +143,7 @@ } else { - printf("ERROR parsing device path\n"); + verbose("ERROR parsing device path\n"); numpaths = 0; break; } Index: branches/slice/i386/libsaio/sys.c =================================================================== --- branches/slice/i386/libsaio/sys.c (revision 688) +++ branches/slice/i386/libsaio/sys.c (revision 689) @@ -370,7 +370,7 @@ // Resolve the boot volume from the file spec. if ((bvr = getBootVolumeRef(fileSpec, &filePath)) == NULL) { - printf("Boot volume for '%s' is bogus\n", fileSpec); + verbose("Boot volume for '%s' is bogus\n", fileSpec); return -1; } Index: branches/slice/i386/libsaio/platform.c =================================================================== --- branches/slice/i386/libsaio/platform.c (revision 688) +++ branches/slice/i386/libsaio/platform.c (revision 689) @@ -17,7 +17,7 @@ #endif #if DEBUG_PLATFORM -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif Index: branches/slice/i386/libsaio/cpu.c =================================================================== --- branches/slice/i386/libsaio/cpu.c (revision 688) +++ branches/slice/i386/libsaio/cpu.c (revision 689) @@ -10,11 +10,11 @@ #include "cpu.h" #ifndef DEBUG_CPU -#define DEBUG_CPU 1 +#define DEBUG_CPU 0 #endif #if DEBUG_CPU -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) msglog(x) #endif @@ -400,16 +400,16 @@ } msr = rdmsr64(MSR_NANO_FCR2); - printf("MSR_IA32_EBL_CR_POWERON Returns 0x%X 0x%X\n", msr >> 32, msr & 0xffffffff); + verbose("MSR_IA32_EBL_CR_POWERON Returns 0x%X 0x%X\n", msr >> 32, msr & 0xffffffff); //msr = msr >> 32; msr |= VIA_ALTERNATIVE_VENDOR_BIT; //msr = msr << 32; - printf("MSR_IA32_EBL_CR_POWERON Returns 0x%X 0x%X\n", msr >> 32, msr & 0xffffffff); + verbose("MSR_IA32_EBL_CR_POWERON Returns 0x%X 0x%X\n", msr >> 32, msr & 0xffffffff); wrmsr64(MSR_NANO_FCR2, msr); msr = rdmsr64(MSR_NANO_FCR2); - printf("MSR_IA32_EBL_CR_POWERON Returns 0x%X 0x%X\n", msr >> 32, msr & 0xffffffff); + verbose("MSR_IA32_EBL_CR_POWERON Returns 0x%X 0x%X\n", msr >> 32, msr & 0xffffffff); /* get cpuid values */ Index: branches/slice/i386/libsaio/biosfn.c =================================================================== --- branches/slice/i386/libsaio/biosfn.c (revision 688) +++ branches/slice/i386/libsaio/biosfn.c (revision 689) @@ -250,9 +250,9 @@ #if DEBUG { int i; - printf("%d total ranges\n", count);getc(); + verbose("%d total ranges\n", count);getc(); for (i=0, range = rangeArray; itype, (unsigned int)range->base, (unsigned int)range->length); getc(); } } Index: branches/slice/i386/boot2/graphics.c =================================================================== --- branches/slice/i386/boot2/graphics.c (revision 688) +++ branches/slice/i386/boot2/graphics.c (revision 689) @@ -104,7 +104,7 @@ } #if DEBUG - printf("Mode %x: %dx%dx%d mm:%d attr:%x\n", + verbose("Mode %x: %dx%dx%d mm:%d attr:%x\n", *modePtr, modeInfo.XResolution, modeInfo.YResolution, modeInfo.BitsPerPixel, modeInfo.MemoryModel, modeInfo.ModeAttributes); @@ -683,8 +683,15 @@ // Try to find a resolution if "Graphics Mode" setting is not available. if ( count < 3 ) { - params[0] = DEFAULT_SCREEN_WIDTH; - params[1] = DEFAULT_SCREEN_HEIGHT; + // Use the default resolution if we don't have an initialized GUI. +/* if (gui.screen.width == 0 || gui.screen.height == 0) + { + gui.screen.width = DEFAULT_SCREEN_WIDTH; + gui.screen.height = DEFAULT_SCREEN_HEIGHT; + } +*/ + params[0] = DEFAULT_SCREEN_WIDTH; //gui.screen.width; + params[1] = DEFAULT_SCREEN_HEIGHT; // gui.screen.height; params[2] = 32; } Index: branches/slice/i386/boot2/boot.c =================================================================== --- branches/slice/i386/boot2/boot.c (revision 688) +++ branches/slice/i386/boot2/boot.c (revision 689) @@ -192,7 +192,7 @@ if ( (gBootFileType == kNetworkDeviceType) && gUnloadPXEOnExit ) { if ( (ret = nbpUnloadBaseCode()) != nbpStatusSuccess ) { - printf("nbpUnloadBaseCode error %d\n", (int) ret); + verbose("nbpUnloadBaseCode error %d\n", (int) ret); sleep(2); } } @@ -307,7 +307,7 @@ int part_no; /* partition number (1 based) */ #endif #if DEBUG - printf("get bvChain dev=%02x type=%02x part_no=%d\n", bvChain->biosdev, bvChain->type, bvChain->part_no); //dev=0x80 - flash-stick + verbose("get bvChain dev=%02x type=%02x part_no=%d\n", bvChain->biosdev, bvChain->type, bvChain->part_no); //dev=0x80 - flash-stick #endif setBootGlobals(bvChain); @@ -346,7 +346,7 @@ gBootVolume = selectBootVolume(bvChain); #if DEBUG - printf("separated bvChain dev=%02x type=%02x part_no=%d\n", bvChain->biosdev, bvChain->type, bvChain->part_no); //dev=0x81 - HDD + verbose("separated bvChain dev=%02x type=%02x part_no=%d\n", bvChain->biosdev, bvChain->type, bvChain->part_no); //dev=0x81 - HDD pause(); #endif @@ -354,7 +354,7 @@ if(init_module_system()) { #if DEBUG - printf("begin load_all_modules\n"); + verbose("begin load_all_modules\n"); pause(); #endif @@ -363,7 +363,7 @@ execute_hook("ModulesLoaded", NULL, NULL, NULL, NULL); #if DEBUG - printf("ModulesLoaded\n"); + verbose("ModulesLoaded\n"); pause(); #endif @@ -388,7 +388,7 @@ #endif #if DEBUG - printf("After rescan\n"); + verbose("After rescan\n"); pause(); #endif @@ -472,8 +472,19 @@ // Other status (e.g. 0) means that we should proceed with boot. - - +/* + // Turn off any GUI elements + if( bootArgs->Video.v_display == GRAPHICS_MODE ) + { + gui.devicelist.draw = false; + gui.bootprompt.draw = false; + gui.menu.draw = false; + gui.infobox.draw = false; + gui.logo.draw = false; + drawBackground(); + updateVRAM(); + } +*/ // Find out which version mac os we're booting. getOSVersion(gMacOSVersion); Index: branches/slice/i386/boot2/modules.c =================================================================== --- branches/slice/i386/boot2/modules.c (revision 688) +++ branches/slice/i386/boot2/modules.c (revision 689) @@ -14,7 +14,7 @@ #endif #if DEBUG_MODULES -#define DBG(x...) printf(x); getc() +#define DBG(x...) verbose(x); //getc() #else #define DBG(x...) #endif @@ -35,15 +35,15 @@ -#if DEBUG_MODULES +#if 1 //DEBUG_MODULES void print_hook_list() { - printf("---Hook Table---\n"); + msglog("---Hook Table---\n"); moduleHook_t* hooks = moduleCallbacks; while(hooks) { - printf("Hook: %s\n", hooks->name); + msglog("Hook: %s\n", hooks->name); hooks = hooks->next; } } @@ -92,8 +92,8 @@ } else { // The module does not have a valid start function - printf("Unable to start %s\n", SYMBOLS_MODULE); - getc(); + verbose("Unable to start %s\n", SYMBOLS_MODULE); + //getc(); } return 0; } @@ -102,7 +102,7 @@ /* * Load all modules in the /Extra/modules/ directory * Module depencdies will be loaded first - * MOdules will only be loaded once. When loaded a module must + * Modules will only be loaded once. When loaded a module must * setup apropriete function calls and hooks as required. * NOTE: To ensure a module loads after another you may * link one module with the other. For dyld to allow this, you must @@ -126,7 +126,7 @@ { // failed to load // free(tmp); - verbose("...failed to load\n"); + DBG("...failed to load\n"); } } else @@ -162,7 +162,7 @@ fh = open(modString, 0); if(fh < 0) { - printf("Unable to locate module %s\n", modString); + verbose("Unable to locate module %s\n", modString); getc(); return 0; } @@ -182,18 +182,18 @@ // Notify the system that it was laoded module_loaded(module/*moduleName, moduleVersion, moduleCompat*/); (*module_start)(); // Start the module - DBG("Module %s Loaded.\n", module); + verbose("Module %s Loaded.\n", module); } else { // The module does not have a valid start function - printf("Unable to start %s\n", module); + verbose("Unable to start %s\n", module); getc(); } } else { DBG("Unable to read in module %s\n.", module); - getc(); + //getc(); } close(fh); return 1; @@ -319,9 +319,9 @@ } } -#if DEBUG_MODULES +#if 1 //DEBUG_MODULES print_hook_list(); - getc(); + //getc(); #endif } @@ -373,7 +373,7 @@ } else { - printf("Invalid mach magic\n"); + verbose("Invalid mach magic\n"); getc(); return NULL; } @@ -382,7 +382,7 @@ /*if(((struct mach_header*)binary)->filetype != MH_DYLIB) { - printf("Module is not a dylib. Unable to load.\n"); + verbose("Module is not a dylib. Unable to load.\n"); getc(); return NULL; // Module is in the incorrect format }*/ @@ -935,7 +935,7 @@ } else //if(strcmp(symbolName, SYMBOL_DYLD_STUB_BINDER) != 0) { - printf("Unable to bind symbol %s\n", symbolName); + verbose("Unable to bind symbol %s\n", symbolName); getc(); } @@ -966,7 +966,7 @@ } else //if(strcmp(symbolName, SYMBOL_DYLD_STUB_BINDER) != 0) { - printf("Unable to bind symbol %s\n", symbolName); + verbose("Unable to bind symbol %s\n", symbolName); getc(); } segmentAddress += tmp + sizeof(void*); @@ -985,7 +985,7 @@ } else //if(strcmp(symbolName, SYMBOL_DYLD_STUB_BINDER) != 0) { - printf("Unable to bind symbol %s\n", symbolName); + verbose("Unable to bind symbol %s\n", symbolName); getc(); } segmentAddress += (immediate * sizeof(void*)) + sizeof(void*); @@ -1032,7 +1032,7 @@ } else //if(strcmp(symbolName, SYMBOL_DYLD_STUB_BINDER) != 0) { - printf("Unable to bind symbol %s\n", symbolName); + verbose("Unable to bind symbol %s\n", symbolName); getc(); } Index: branches/slice/i386/boot2/boot.h =================================================================== --- branches/slice/i386/boot2/boot.h (revision 688) +++ branches/slice/i386/boot2/boot.h (revision 689) @@ -67,6 +67,7 @@ #define kWaitForKeypressKey "Wait" /* AsereBLN: added the other keys */ #define kUseAtiROM "UseAtiROM" /* ati.c */ +#define kAtiConfig "AtiConfig" /* ati.c */ #define kWake "Wake" /* boot.c */ #define kForceWake "ForceWake" /* boot.c */ #define kWakeImage "WakeImage" /* boot.c */ Index: branches/slice/i386/boot2/drivers.c =================================================================== --- branches/slice/i386/boot2/drivers.c (revision 688) +++ branches/slice/i386/boot2/drivers.c (revision 689) @@ -755,12 +755,12 @@ unsigned long len; #if 0 - printf("kernel header:\n"); - printf("signature: 0x%x\n", kernel_header->signature); - printf("compress_type: 0x%x\n", kernel_header->compress_type); - printf("adler32: 0x%x\n", kernel_header->adler32); - printf("uncompressed_size: 0x%x\n", kernel_header->uncompressed_size); - printf("compressed_size: 0x%x\n", kernel_header->compressed_size); + verbose("kernel header:\n"); + verbose("signature: 0x%x\n", kernel_header->signature); + verbose("compress_type: 0x%x\n", kernel_header->compress_type); + verbose("adler32: 0x%x\n", kernel_header->adler32); + verbose("uncompressed_size: 0x%x\n", kernel_header->uncompressed_size); + verbose("compressed_size: 0x%x\n", kernel_header->compressed_size); getc(); #endif @@ -787,7 +787,7 @@ } if (OSSwapBigToHostInt32(kernel_header->adler32) != Adler32(binary, uncompressed_size)) { - printf("adler mismatch\n"); + verbose("adler mismatch\n"); return -1; } } Index: branches/slice/i386/boot2/ramdisk.c =================================================================== --- branches/slice/i386/boot2/ramdisk.c (revision 688) +++ branches/slice/i386/boot2/ramdisk.c (revision 689) @@ -124,7 +124,7 @@ // Reset ramdisk bvr gRAMDiskVolume = NULL; - printf("\nunmounting: done"); + verbose("\nunmounting: done"); } } @@ -185,8 +185,8 @@ if(gRAMDiskVolume == NULL) { umountRAMDisk(); - printf("\nRamdisk contains no partitions.\n"); - pause(); + verbose("\nRamdisk contains no partitions.\n"); + //pause(); } else @@ -217,11 +217,11 @@ gRAMDiskBTAliased = mode; if (mode) { - printf("\nEnabled bt(0,0) alias."); + verbose("\nEnabled bt(0,0) alias."); } else { - printf("\nDisabled bt(0,0) alias."); + verbose("\nDisabled bt(0,0) alias."); } } @@ -234,23 +234,23 @@ { struct multiboot_module * ramdisk_module = (void *)gRAMDiskMI->mi_mods_addr; - printf("\nfile: %s %d", gRAMDiskFile, + verbose("\nfile: %s %d", gRAMDiskFile, ramdisk_module->mm_mod_end - ramdisk_module->mm_mod_start); - printf("\nalias: %s", gRAMDiskBTAliased ? "enabled" : "disabled"); + verbose("\nalias: %s", gRAMDiskBTAliased ? "enabled" : "disabled"); // Display ramdisk information if available. if (getValueForKey("Info", &val, &len, &bootInfo->ramdiskConfig)) { - printf("\ninfo: %s", val); + verbose("\ninfo: %s", val); } else { - printf("\nramdisk info not available."); + verbose("\nramdisk info not available."); } } else { - printf("\nNo ramdisk mounted."); + verbose("\nNo ramdisk mounted."); } } @@ -259,7 +259,7 @@ mountRAMDisk("bt(0,0)/Extra/Preboot.dmg"); if (gRAMDiskMI != NULL) { - printf("\n"); + verbose("\n"); return 0; } else Index: branches/slice/i386/modules/KextPatcher/kext_patcher.c =================================================================== --- branches/slice/i386/modules/KextPatcher/kext_patcher.c (revision 688) +++ branches/slice/i386/modules/KextPatcher/kext_patcher.c (revision 689) @@ -28,7 +28,7 @@ #endif #if DEBUG_KEXT_PATCHER -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif @@ -222,7 +222,7 @@ zlib_result = inflateInit(&zstream); if (Z_OK != zlib_result) { - printf("ZLIB Error: %s\n", zstream.msg); + verbose("ZLIB Error: %s\n", zstream.msg); getc(); } else @@ -454,7 +454,7 @@ char* orig_string = "0x04020000&0xFFFE0000"; //XMLCastString(match_class); - printf("Attemting to replace '%s' with '%s'\n", orig_string, new_str); + verbose("Attemting to replace '%s' with '%s'\n", orig_string, new_str); // TODO: verify string doesn't exist first. @@ -566,12 +566,12 @@ /* deflate filled output buffer, meaning the data doesn't compress. */ DBG("Buffer FULL: deflated result is %d, avail: %d bytes, out: %d bytes, full: %d\n", zlib_result, compressed_size, zstream.total_out, full_size); - printf("Unable to patch AppleHDA\n"); + verbose("Unable to patch AppleHDA\n"); } else if (zlib_result != Z_STREAM_ERROR) { - printf("AppleHDA: ZLIB Deflate Error: %s\n", zstream.msg); + verbose("AppleHDA: ZLIB Deflate Error: %s\n", zstream.msg); getc(); } @@ -783,8 +783,8 @@ { /* deflate filled output buffer, meaning the data doesn't compress. */ - printf("Deflated result is %d, in: %d bytes, out: %d bytes, full: %d\n", zlib_result, zstream.total_in, zstream.total_out, full_size); - printf("ERROR: Unable to compress patched kext, not enough room.\n"); + verbose("Deflated result is %d, in: %d bytes, out: %d bytes, full: %d\n", zlib_result, zstream.total_in, zstream.total_out, full_size); + verbose("ERROR: Unable to compress patched kext, not enough room.\n"); pause(); } Index: branches/slice/i386/modules/KextPatcher/hex_editor.c =================================================================== --- branches/slice/i386/modules/KextPatcher/hex_editor.c (revision 688) +++ branches/slice/i386/modules/KextPatcher/hex_editor.c (revision 689) @@ -14,7 +14,7 @@ long index = 0; int num_replaced = 0; // NOTE: patehrn and replacement are null terminated. This may change later - // If I need to replce null bytes + // If I need to replace null bytes if(!pattern || !replacement || Index: branches/slice/i386/modules/ACPIPatcher/acpi_patcher.c =================================================================== --- branches/slice/i386/modules/ACPIPatcher/acpi_patcher.c (revision 688) +++ branches/slice/i386/modules/ACPIPatcher/acpi_patcher.c (revision 689) @@ -184,7 +184,7 @@ { if (read (fd, tableAddr, file_size (fd))!=file_size (fd)) { - printf("Couldn't read table %s\n",dirspec); + verbose("Couldn't read table %s\n",dirspec); free (tableAddr); close (fd); return NULL; @@ -195,7 +195,7 @@ return tableAddr; } close (fd); - printf("Couldn't allocate memory for table \n", dirspec); + verbose("Couldn't allocate memory for table \n", dirspec); } //printf("Couldn't find table %s\n", filename); return NULL; @@ -1104,7 +1104,7 @@ else { rsdp_mod->RsdtAddress=0; - printf("RSDT not found or RSDT incorrect\n"); + verbose("RSDT not found or RSDT incorrect\n"); } if (version) Index: branches/slice/i386/modules/ACPIPatcher/ACPIPatcher.c =================================================================== --- branches/slice/i386/modules/ACPIPatcher/ACPIPatcher.c (revision 688) +++ branches/slice/i386/modules/ACPIPatcher/ACPIPatcher.c (revision 689) @@ -89,7 +89,7 @@ if (ACPIPatcher_rootuid == 11) ACPIPatcher_rootuid=0; //usually when _UID isnt present, it means uid is zero else if (ACPIPatcher_rootuid < 0 || ACPIPatcher_rootuid > 9) { - printf("PciRoot uid value wasnt found, using 0, if you want it to be 1, use -PciRootUID flag"); + verbose("PciRoot uid value wasnt found, using 0, if you want it to be 1, use -PciRootUID flag"); ACPIPatcher_rootuid = 0; } out: Index: branches/slice/i386/modules/NVRAM/NVRAM.c =================================================================== --- branches/slice/i386/modules/NVRAM/NVRAM.c (revision 688) +++ branches/slice/i386/modules/NVRAM/NVRAM.c (revision 689) @@ -144,6 +144,7 @@ void NVRAM_start() { + register_hook_callback("ExecKernel", &NVRAM_hook); register_hook_callback("Kernel Start", &NVRAM_hook); } Index: branches/slice/i386/modules/klibc/sha1hash.c =================================================================== --- branches/slice/i386/modules/klibc/sha1hash.c (revision 688) +++ branches/slice/i386/modules/klibc/sha1hash.c (revision 689) @@ -114,7 +114,7 @@ #ifdef VERBOSE /* SAK */ void SHAPrintContext(SHA1_CTX *context, char *msg){ - printf("%s (%d,%d) %x %x %x %x %x\n", + verbose("%s (%d,%d) %x %x %x %x %x\n", msg, context->count[0], context->count[1], context->state[0], Index: branches/slice/i386/modules/GUI/graphic_utils.c =================================================================== --- branches/slice/i386/modules/GUI/graphic_utils.c (revision 688) +++ branches/slice/i386/modules/GUI/graphic_utils.c (revision 689) @@ -77,7 +77,7 @@ clearScreenRows(0, 24); setCursorPosition( 0, 0, 1 ); - printf("Video modes supported:\n", VBEDecodeFP(const char *, vbeInfo.OEMStringPtr)); + verbose("Video modes supported:\n", VBEDecodeFP(const char *, vbeInfo.OEMStringPtr)); // Loop through the mode list, and find the matching mode. @@ -93,7 +93,7 @@ continue; } - printf("Mode %x: %dx%dx%d mm:%d attr:%x\n", + verbose("Mode %x: %dx%dx%d mm:%d attr:%x\n", *modePtr, modeInfo.XResolution, modeInfo.YResolution, modeInfo.BitsPerPixel, modeInfo.MemoryModel, modeInfo.ModeAttributes); Index: branches/slice/i386/modules/KernelPatcher/kernel_patcher.c =================================================================== --- branches/slice/i386/modules/KernelPatcher/kernel_patcher.c (revision 688) +++ branches/slice/i386/modules/KernelPatcher/kernel_patcher.c (revision 689) @@ -287,7 +287,7 @@ UInt32 panicAddr = symbol ? symbol->addr - textAddress: 0; //kernelSymbolAddresses[SYMBOL_PANIC] - textAddress; if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate _panic\n"); + verbose("Unable to locate _panic\n"); return; } panicAddr -= (UInt32)kernelData; @@ -377,12 +377,12 @@ // On 10.2.0+ kernels, this requires ~16 bytes // Total: 24 bytes - printf("Running on a 10.2.0+ kernel\n"); + verbose("Running on a 10.2.0+ kernel\n"); getc(); } else { - printf("Running on a 10.0.0 kernel, patch unsupported\n"); + verbose("Running on a 10.0.0 kernel, patch unsupported\n"); getc(); } @@ -418,7 +418,7 @@ UInt32 panicAddr = symbol ? symbol->addr - textAddress: 0; //kernelSymbolAddresses[SYMBOL_PANIC] - textAddress; if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate _panic\n"); + verbose("Unable to locate _panic\n"); return; } panicAddr -= (UInt32)kernelData; @@ -603,7 +603,7 @@ if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate _pmCPUExitHaltToOff\n"); + verbose("Unable to locate _pmCPUExitHaltToOff\n"); return; } @@ -632,7 +632,7 @@ UInt32 patchLocation = symbol ? symbol->addr - textAddress + textSection: 0; if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate %s\n", "_lapic_init"); + verbose("Unable to locate %s\n", "_lapic_init"); return; } @@ -641,7 +641,7 @@ UInt32 panicAddr = symbol ? symbol->addr - textAddress: 0; if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate %s\n", "_panic"); + verbose("Unable to locate %s\n", "_panic"); return; } @@ -697,7 +697,7 @@ symbol = lookup_kernel_symbol("_panic"); if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate %s\n", "_panic"); + verbose("Unable to locate %s\n", "_panic"); return; } UInt32 panicAddr = symbol->addr - textAddress; @@ -735,7 +735,7 @@ kernSymbols_t *symbol = lookup_kernel_symbol("_lapic_interrupt"); if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate %s\n", "_lapic_interrupt"); + verbose("Unable to locate %s\n", "_lapic_interrupt"); return; } @@ -746,7 +746,7 @@ symbol = lookup_kernel_symbol("_panic"); if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate %s\n", "_panic"); + verbose("Unable to locate %s\n", "_panic"); return; } UInt32 panicAddr = symbol->addr - textAddress; @@ -788,7 +788,7 @@ kernSymbols_t *symbol = lookup_kernel_symbol("_lapic_configure"); if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate %s\n", "_lapic_configure"); + verbose("Unable to locate %s\n", "_lapic_configure"); return; } patchLocation = symbol->addr - textAddress + textSection; @@ -796,7 +796,7 @@ symbol = lookup_kernel_symbol("_lapic_start"); if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate %s\n", "_lapic_start"); + verbose("Unable to locate %s\n", "_lapic_start"); return; } lapicStart = symbol->addr; @@ -805,7 +805,7 @@ symbol = lookup_kernel_symbol("_lapic_interrupt_base"); if(symbol == 0 || symbol->addr == 0) { - printf("Unable to locate %s\n", "_lapic_interrupt_base"); + verbose("Unable to locate %s\n", "_lapic_interrupt_base"); return; } lapicInterruptBase = symbol->addr; Index: branches/slice/i386/modules/Networking/Networking.c =================================================================== --- branches/slice/i386/modules/Networking/Networking.c (revision 688) +++ branches/slice/i386/modules/Networking/Networking.c (revision 689) @@ -15,7 +15,7 @@ #endif #if DEBUG_ETHERNET -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif Index: branches/slice/i386/modules/GraphicsEnabler/gma.c =================================================================== --- branches/slice/i386/modules/GraphicsEnabler/gma.c (revision 688) +++ branches/slice/i386/modules/GraphicsEnabler/gma.c (revision 689) @@ -13,7 +13,7 @@ #endif #if DEBUG_GMA -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif @@ -99,7 +99,7 @@ if(!device) { - printf("Failed initializing dev-prop string dev-entry, press any key...\n"); + verbose("Failed initializing dev-prop string dev-entry, press any key...\n"); getc(); return false; @@ -152,7 +152,7 @@ stringdata = malloc(sizeof(uint8_t) * string->length); if(!stringdata) { - printf("no stringdata press a key...\n"); + verbose("no stringdata press a key...\n"); getc(); return false; } Index: branches/slice/i386/modules/GraphicsEnabler/nvidia.c =================================================================== --- branches/slice/i386/modules/GraphicsEnabler/nvidia.c (revision 688) +++ branches/slice/i386/modules/GraphicsEnabler/nvidia.c (revision 689) @@ -61,7 +61,7 @@ #endif #if DEBUG_NVIDIA -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif @@ -512,16 +512,16 @@ static int patch_nvidia_rom(uint8_t *rom) { if (!rom || (rom[0] != 0x55 && rom[1] != 0xaa)) { - printf("False ROM signature: 0x%02x%02x\n", rom[0], rom[1]); + verbose("False ROM signature: 0x%02x%02x\n", rom[0], rom[1]); return PATCH_ROM_FAILED; } uint16_t dcbptr = swap16(read16(rom, 0x36)); if(!dcbptr) { - printf("no dcb table found\n"); + verbose("no dcb table found\n"); return PATCH_ROM_FAILED; }/* else - printf("dcb table at offset 0x%04x\n", dcbptr); + verbose("dcb table at offset 0x%04x\n", dcbptr); */ uint8_t *dcbtable = &rom[dcbptr]; uint8_t dcbtable_version = dcbtable[0]; @@ -542,7 +542,7 @@ headerlength = 8; } if (sig != 0x4edcbdcb) { - printf("bad display config block signature (0x%8x)\n", sig); + verbose("bad display config block signature (0x%8x)\n", sig); return PATCH_ROM_FAILED; } } else if (dcbtable_version >= 0x14) { /* some NV15/16, and NV11+ */ @@ -551,11 +551,11 @@ strncpy(sig, (char *)&dcbtable[-7], 7); recordlength = 10; if (strcmp(sig, "DEV_REC")) { - printf("Bad Display Configuration Block signature (%s)\n", sig); + verbose("Bad Display Configuration Block signature (%s)\n", sig); return PATCH_ROM_FAILED; } } else { - printf("ERROR: dcbtable_version is 0x%X\n", dcbtable_version); + verbose("ERROR: dcbtable_version is 0x%X\n", dcbtable_version); return PATCH_ROM_FAILED; } @@ -753,7 +753,7 @@ char buf[3]; if (hex == NULL || bin == NULL || len <= 0 || strlen(hex) != len * 2) { - printf("[ERROR] bin2hex input error\n"); + verbose("[ERROR] bin2hex input error\n"); return -1; } @@ -761,7 +761,7 @@ p = (char *) hex; for (i=0; ivendor << 16) | rom_pci_header->device); } else { - printf("nVidia incorrect PCI ROM signature: 0x%x\n", rom_pci_header->signature); + verbose("nVidia incorrect PCI ROM signature: 0x%x\n", rom_pci_header->signature); } } Index: branches/slice/i386/modules/GraphicsEnabler/ati.c =================================================================== --- branches/slice/i386/modules/GraphicsEnabler/ati.c (revision 688) +++ branches/slice/i386/modules/GraphicsEnabler/ati.c (revision 689) @@ -34,7 +34,7 @@ #endif #if DEBUG_ATI -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif @@ -113,8 +113,10 @@ // Known cards as of 2008/08/26 struct ati_chipsets_t ATIKnownChipsets[] = { { 0x00000000, "Unknown" } , - { 0x10029589, "ATI Radeon 2600 Series"} , { 0x10029588, "ATI Radeon 2600 Series"} , + { 0x10029589, "ATI Radeon 3600 Series"} , + { 0x10029591, "ATI Radeon 3600 Series"} , + { 0x100294C1, "ATI Radeon 2400XT Series"} , { 0x100294C3, "ATI Radeon 2400 Series"} , { 0x100294C4, "ATI Radeon 2400 Series"} , { 0x100294C6, "ATI Radeon 2400 Series"} , @@ -134,8 +136,8 @@ { 0x100295C5, "ATI Radeon 3400 Series"} , { 0x100295C7, "ATI Radeon 3400 Series"} , { 0x100295C0, "ATI Radeon 3400 Series"} , + { 0x10029590, "ATI Radeon 3600 Series"} , { 0x10029596, "ATI Radeon 3600 Series"} , - { 0x10029590, "ATI Radeon 3600 Series"} , { 0x10029599, "ATI Radeon 3600 Series"} , { 0x10029597, "ATI Radeon 3600 Series"} , { 0x10029598, "ATI Radeon 3600 Series"} , @@ -161,24 +163,39 @@ { 0x1002949E, "ATI Radeon 4600 Series"} , { 0x10029480, "ATI Radeon 4600 Series"} , { 0x10029488, "ATI Radeon 4600 Series"} , + { 0x100294B3, "ATI Radeon 4770 Series"} , + { 0x100294B5, "ATI Radeon 4770 Series"} , { 0x10029540, "ATI Radeon 4500 Series"} , { 0x10029541, "ATI Radeon 4500 Series"} , { 0x1002954E, "ATI Radeon 4500 Series"} , + { 0x1002954F, "ATI Radeon 4300 Series"} , { 0x10029552, "ATI Radeon 4300 Mobility Series"} , { 0x10029553, "ATI Radeon 4500 Mobility Series"} , - { 0x1002954F, "ATI Radeon 4300 Series"} , - { 0x100294B3, "ATI Radeon 4770 Series"} , - { 0x100294B5, "ATI Radeon 4770 Series"} , + { 0x10029610, "ATI Radeon 3200 Mobility Series"} , + { 0x10029611, "ATI Radeon 3100 Mobility Series"} , + { 0x10029614, "ATI Radeon 3300 Mobility Series"} , + { 0x10029616, "AMD 760G Series"} , + { 0x10029710, "ATI Radeon 4200 Mobility Series"} , + { 0x10029714, "ATI Radeon 4290 Mobility Series"} , + { 0x10029715, "ATI Radeon 4250 Mobility Series"} , + { 0x100268B8, "ATI Radeon 5770 Series"} , { 0x100268BE, "ATI Radeon 5750 Series"} , { 0x10026898, "ATI Radeon 5870 Series"} , - { 0x10026899, "ATI Radeon 5850 Series"} + { 0x10026899, "ATI Radeon 5850 Series"}, + { 0x1002689C, "ATI Radeon 5870 Series"} , + { 0x100268D8, "ATI Radeon 5690 Series"}, + { 0x100268D9, "ATI Radeon 5670 Series"}, + { 0x100268DA, "ATI Radeon 5630 Series"}, + { 0x100268F9, "ATI Radeon 5470 Series"} }; struct ati_chipsets_t ATIKnownFramebuffers[] = { { 0x00000000, "Megalodon" }, + { 0x10029588, "Lamna"} , { 0x10029589, "Lamna"} , - { 0x10029588, "Lamna"} , + { 0x10029591, "Lamna"} , + { 0x100294C1, "Iago"} , { 0x100294C3, "Iago"} , { 0x100294C4, "Iago"} , { 0x100294C6, "Iago"} , @@ -198,8 +215,8 @@ { 0x100295C5, "Iago"} , { 0x100295C7, "Iago"} , { 0x100295C0, "Iago"} , + { 0x10029590, "Megalodon"} , { 0x10029596, "Megalodon"} , - { 0x10029590, "Megalodon"} , { 0x10029599, "Megalodon"} , { 0x10029597, "Megalodon"} , { 0x10029598, "Megalodon"} , @@ -220,23 +237,35 @@ { 0x1002945A, "Motmot"} , { 0x1002945B, "Motmot"} , { 0x1002944B, "Motmot"} , - { 0x10029490, "Peregrine"} , - { 0x10029498, "Peregrine"} , - { 0x1002949E, "Peregrine"} , { 0x10029480, "Peregrine"} , { 0x10029488, "Peregrine"} , + { 0x10029490, "Flicker"} , + { 0x10029498, "Flicker"} , + { 0x1002949E, "Flicker"} , + { 0x100294B3, "Flicker"}, + { 0x100294B5, "Flicker"}, { 0x10029540, "Peregrine"} , { 0x10029541, "Peregrine"} , { 0x1002954E, "Peregrine"} , + { 0x1002954F, "Peregrine"} , { 0x10029552, "Peregrine"} , { 0x10029553, "Peregrine"} , - { 0x1002954F, "Peregrine"} , - { 0x100294B3, "Peregrine"}, - { 0x100294B5, "Peregrine"}, - { 0x100268B8, "Vervet"}, + { 0x10029610, "ATI Radeon 3200 Mobility Series"} , + { 0x10029611, "ATI Radeon 3100 Mobility Series"} , + { 0x10029614, "ATI Radeon 3300 Mobility Series"} , + { 0x10029616, "AMD 760G Series"} , + { 0x10029710, "ATI Radeon 4200 Mobility Series"} , + { 0x10029714, "ATI Radeon 4290 Mobility Series"} , + { 0x10029715, "ATI Radeon 4250 Mobility Series"} , + { 0x100268B8, "Vervet"}, { 0x100268BE, "Vervet"}, { 0x10026898, "Uakari"}, - { 0x10026899, "Uakari"} + { 0x10026899, "Uakari"}, + { 0x1002689C, "Baboon"}, + { 0x100268D8, "Baboon"}, + { 0x100268D9, "Baboon"}, + { 0x100268DA, "Baboon"}, + { 0x100268F9, "Baboon"} }; static uint32_t accessROM(pci_dt_t *ati_dev, unsigned int mode) @@ -436,7 +465,7 @@ if (!device || !ati_dev) { return 0; } - printf("dumping pci config space, 256 bytes\n"); + verbose("dumping pci config space, 256 bytes\n"); config_space = malloc(256); for (i=0; i<=255; i++) { config_space[i] = pci_config_read8( ati_dev->dev.addr, i); @@ -529,8 +558,8 @@ return 0; if(!DP_ADD_TEMP_VAL_DATA(device, ati_mvad)) return 0; - if(!DP_ADD_TEMP_VAL_DATA(device, ati_saved_config)) - return 0; +// if(!DP_ADD_TEMP_VAL_DATA(device, ati_saved_config)) +// return 0; return 1; } @@ -615,8 +644,8 @@ return 0; if(!DP_ADD_TEMP_VAL_DATA(device, ati_mvad_n4)) return 0; - if(!DP_ADD_TEMP_VAL_DATA(device, ati_saved_config_n4)) - return 0; +// if(!DP_ADD_TEMP_VAL_DATA(device, ati_saved_config_n4)) +// return 0; return 1; } @@ -727,7 +756,7 @@ rom_size = 0x10000; //we dont need rest anyway; } } else { - printf("ERROR: unable to open ATI Video BIOS File %s\n", tmp); + verbose("ERROR: unable to open ATI Video BIOS File %s\n", tmp); } } if (rom_size == 0) { @@ -751,7 +780,7 @@ } if (bios[0] == 0x55 && bios[1] == 0xaa) { - printf("Found bios image\n"); + verbose("Found bios image\n"); bios_size = bios[2] * 512; struct pci_rom_pci_header_t *rom_pci_header; Index: branches/slice/i386/modules/HPET/HPET.c =================================================================== --- branches/slice/i386/modules/HPET/HPET.c (revision 688) +++ branches/slice/i386/modules/HPET/HPET.c (revision 689) @@ -170,7 +170,7 @@ lpc_controllers_intel[i].name, lpc_dev->vendor_id, lpc_dev->device_id, rcba); if (rcba == 0) - printf(" RCBA disabled; cannot force enable HPET\n"); + verbose(" RCBA disabled; cannot force enable HPET\n"); else { val = REG32(rcba, 0x3404); @@ -193,7 +193,7 @@ // verify if the job is done val = REG32(rcba, 0x3404); if (!(val & 0x80)) - printf(" Failed to force enable HPET\n"); + verbose(" Failed to force enable HPET\n"); } break; } Index: branches/slice/i386/modules/USBFix/usb.c =================================================================== --- branches/slice/i386/modules/USBFix/usb.c (revision 688) +++ branches/slice/i386/modules/USBFix/usb.c (revision 689) @@ -17,7 +17,7 @@ #endif #if DEBUG_USB -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif Index: branches/slice/i386/modules/Resolution/915resolution.c =================================================================== --- branches/slice/i386/modules/Resolution/915resolution.c (revision 688) +++ branches/slice/i386/modules/Resolution/915resolution.c (revision 689) @@ -299,10 +299,10 @@ map->ati_mode_table = (char *) &std_vesa->aModeTimings; if (map->ati_mode_table == 0) { - printf("Unable to locate the mode table.\n"); - printf("Please run the program 'dump_bios' as root and\n"); - printf("email the file 'vbios.dmp' to stomljen@yahoo.com.\n"); - printf("Chipset: %d\n", map->chipset); + verbose("Unable to locate the mode table.\n"); + verbose("Please run the program 'dump_bios' as root and\n"); + verbose("email the file 'vbios.dmp' to stomljen@yahoo.com.\n"); + verbose("Chipset: %d\n", map->chipset); close_vbios(map); return 0; } @@ -351,10 +351,10 @@ map->nv_mode_table = (char *) std_vesa->sModelines; if (map->nv_mode_table == 0) { - printf("Unable to locate the mode table.\n"); - printf("Please run the program 'dump_bios' as root and\n"); - printf("email the file 'vbios.dmp' to stomljen@yahoo.com.\n"); - printf("Chipset: %s\n", map->chipset); + verbose("Unable to locate the mode table.\n"); + verbose("Please run the program 'dump_bios' as root and\n"); + verbose("email the file 'vbios.dmp' to stomljen@yahoo.com.\n"); + verbose("Chipset: %s\n", map->chipset); close_vbios(map); return 0; } Index: branches/slice/i386/modules/Resolution/edid.c =================================================================== --- branches/slice/i386/modules/Resolution/edid.c (revision 688) +++ branches/slice/i386/modules/Resolution/edid.c (revision 689) @@ -101,7 +101,7 @@ if ( reported > blocks_left ) { - printf("EDID claims %d more blocks left\n", reported); + verbose("EDID claims %d more blocks left\n", reported); } if ( (last_reported <= reported && last_reported != -1) @@ -110,8 +110,8 @@ //|| reported == MAGIC ) { - printf("Last reported %d\n", last_reported); - printf( "EDID blocks left is wrong.\n" + verbose("Last reported %d\n", last_reported); + verbose( "EDID blocks left is wrong.\n" "Your EDID is probably invalid.\n"); return 0; } @@ -127,9 +127,9 @@ } else { - printf("Invalid block %d\n", blocks_left); - printf("Header1 = %d", memcmp(edidInfo, header1, sizeof(header1)) ); - printf("Header2 = %d", memcmp(edidInfo, header2, sizeof(header2)) ); + verbose("Invalid block %d\n", blocks_left); + verbose("Header1 = %d", memcmp(edidInfo, header1, sizeof(header1)) ); + verbose("Header2 = %d", memcmp(edidInfo, header2, sizeof(header2)) ); return 0; } } Index: branches/slice/i386/modules/Memory/spd.c =================================================================== --- branches/slice/i386/modules/Memory/spd.c (revision 688) +++ branches/slice/i386/modules/Memory/spd.c (revision 689) @@ -255,12 +255,19 @@ { int i, speed; uint8_t spd_size, spd_type; - uint32_t base; + uint32_t base, mmio, hostc; bool dump = false; RamSlotInfo_t* slot; + uint16_t cmd = pci_config_read16(smbus_dev->dev.addr, 0x04); + DBG("SMBus CmdReg: 0x%x\n", cmd); + pci_config_write16(smbus_dev->dev.addr, 0x04, cmd | 1); + + mmio = pci_config_read32(smbus_dev->dev.addr, 0x10);// & ~0x0f; base = pci_config_read16(smbus_dev->dev.addr, 0x20) & 0xFFFE; - DBG("Scanning smbus_dev <%04x, %04x> ...\n",smbus_dev->vendor_id, smbus_dev->device_id); + hostc = pci_config_read8(smbus_dev->dev.addr, 0x40); + verbose("Scanning SMBus [%04x:%04x], mmio: 0x%x, ioport: 0x%x, hostc: 0x%x\n", + smbus_dev->vendor_id, smbus_dev->device_id, mmio, base, hostc); getBoolForKey("DumpSPD", &dump, &bootInfo->bootConfig); bool fullBanks = // needed at least for laptops @@ -272,8 +279,11 @@ //DBG("Scanning slot %d\n", i); slot = &Platform->RAM.DIMM[i]; spd_size = smb_read_byte_intel(base, 0x50 + i, 0); + DBG("SPD[0] (size): %d @0x%x\n", spd_size, 0x50 + i); // Check spd is present - if (spd_size && (spd_size != 0xff) ) { + if (spd_size && (spd_size != 0xff)) + { + slot->spd = spdbuf; slot->InUse = true; Index: branches/slice/i386/modules/Memory/dram_controllers.c =================================================================== --- branches/slice/i386/modules/Memory/dram_controllers.c (revision 688) +++ branches/slice/i386/modules/Memory/dram_controllers.c (revision 689) @@ -24,7 +24,7 @@ #endif #if DEBUG_DRAM -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif Index: branches/slice/i386/util/bdmesg.c =================================================================== --- branches/slice/i386/util/bdmesg.c (revision 688) +++ branches/slice/i386/util/bdmesg.c (revision 689) @@ -18,7 +18,7 @@ io_registry_entry_t root = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/"); if (!root) { - printf("IORegistryEntry \"IOIOService:/\" not found.\n"); + printf("IORegistryEntry \"IOService:/\" not found.\n"); return 0; } Index: branches/slice/revision =================================================================== --- branches/slice/revision (revision 688) +++ branches/slice/revision (revision 689) @@ -1 +1 @@ -676:681 \ No newline at end of file +676:682 \ No newline at end of file Index: branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser =================================================================== --- branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser (revision 688) +++ branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser (revision 689) @@ -60,8 +60,24 @@ PBXFindDataSource_LocationID, ); }; - PBXPerProjectTemplateStateSaveDate = 314481806; - PBXWorkspaceStateSaveDate = 314481806; + PBXConfiguration.PBXFileTableDataSource3.PBXSymbolsDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXSymbolsDataSource_SymbolNameID; + PBXFileTableDataSourceColumnWidthsKey = ( + 16, + 200, + 50, + 665.20849609375, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXSymbolsDataSource_SymbolTypeIconID, + PBXSymbolsDataSource_SymbolNameID, + PBXSymbolsDataSource_SymbolTypeID, + PBXSymbolsDataSource_ReferenceNameID, + ); + }; + PBXPerProjectTemplateStateSaveDate = 314796425; + PBXWorkspaceStateSaveDate = 314796425; }; perUserProjectItems = { 120DFB1712BA3A4D00C7EAC8 /* PBXTextBookmark */ = 120DFB1712BA3A4D00C7EAC8 /* PBXTextBookmark */; @@ -79,10 +95,16 @@ 124C494B12B8EA5D005AA276 /* PBXTextBookmark */ = 124C494B12B8EA5D005AA276 /* PBXTextBookmark */; 1267813012B7B13E00A25CED /* PBXTextBookmark */ = 1267813012B7B13E00A25CED /* PBXTextBookmark */; 12679BA312BE822E00E3637F /* PBXTextBookmark */ = 12679BA312BE822E00E3637F /* PBXTextBookmark */; - 1269260612BC99AD004D09F1 /* PBXTextBookmark */ = 1269260612BC99AD004D09F1 /* PBXTextBookmark */; - 1299583012BEA42800C307EC /* PBXTextBookmark */ = 1299583012BEA42800C307EC /* PBXTextBookmark */; - 1299583112BEA42800C307EC /* PBXTextBookmark */ = 1299583112BEA42800C307EC /* PBXTextBookmark */; - 1299583312BEA42800C307EC /* PBXTextBookmark */ = 1299583312BEA42800C307EC /* PBXTextBookmark */; + 1279BD7112BF4D8700612F62 /* PBXTextBookmark */ = 1279BD7112BF4D8700612F62 /* PBXTextBookmark */; + 1288318212C3608100EA4CB2 /* PBXTextBookmark */ = 1288318212C3608100EA4CB2 /* PBXTextBookmark */; + 128835DC12C366AB00EA4CB2 /* PBXTextBookmark */ = 128835DC12C366AB00EA4CB2 /* PBXTextBookmark */; + 128835F612C3681F00EA4CB2 /* PBXTextBookmark */ = 128835F612C3681F00EA4CB2 /* PBXTextBookmark */; + 1288360C12C3690C00EA4CB2 /* PBXTextBookmark */ = 1288360C12C3690C00EA4CB2 /* PBXTextBookmark */; + 1288361712C3698700EA4CB2 /* PBXTextBookmark */ = 1288361712C3698700EA4CB2 /* PBXTextBookmark */; + 1288362912C3699600EA4CB2 /* PBXTextBookmark */ = 1288362912C3699600EA4CB2 /* PBXTextBookmark */; + 128A97B712C2336000600556 /* PBXTextBookmark */ = 128A97B712C2336000600556 /* PBXTextBookmark */; + 128A97B812C2336000600556 /* PBXTextBookmark */ = 128A97B812C2336000600556 /* PBXTextBookmark */; + 128A9AF412C233CE00600556 /* PBXTextBookmark */ = 128A9AF412C233CE00600556 /* PBXTextBookmark */; 1299A51F12B3C328007ED516 /* PBXTextBookmark */ = 1299A51F12B3C328007ED516 /* PBXTextBookmark */; 1299A55612B3C4DF007ED516 /* PBXTextBookmark */ = 1299A55612B3C4DF007ED516 /* PBXTextBookmark */; 12AB04BD12B663F5005A745F /* PBXTextBookmark */ = 12AB04BD12B663F5005A745F /* PBXTextBookmark */; @@ -110,7 +132,6 @@ 12D6232512BA5F380032F367 /* PBXTextBookmark */ = 12D6232512BA5F380032F367 /* PBXTextBookmark */; 12D6232612BA5F380032F367 /* PBXTextBookmark */ = 12D6232612BA5F380032F367 /* PBXTextBookmark */; 12DCD38E12BBA5D600A20635 /* PBXTextBookmark */ = 12DCD38E12BBA5D600A20635 /* PBXTextBookmark */; - 12DCD38F12BBA5D600A20635 /* PBXTextBookmark */ = 12DCD38F12BBA5D600A20635 /* PBXTextBookmark */; 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */ = 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */; 12E6FB5712BB458400C2A021 /* PBXTextBookmark */ = 12E6FB5712BB458400C2A021 /* PBXTextBookmark */; 12EFD98A12B510D9002A1712 /* PBXTextBookmark */ = 12EFD98A12B510D9002A1712 /* PBXTextBookmark */; @@ -125,6 +146,13 @@ userBuildSettings = { }; }; + 08FB7796FE84155DC02AAC07 /* main.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {903, 304}}"; + sepNavSelRange = "{192, 7}"; + sepNavVisRange = "{0, 235}"; + }; + }; 12078D9812BA5AF400A1C013 /* fake_efi.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; @@ -366,73 +394,166 @@ vrLen = 894; vrLoc = 14871; }; - 12679BA712BE822E00E3637F /* boot.c */ = { + 1269260B12BC9B1B004D09F1 /* acpi_patcher.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; + name = acpi_patcher.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/ACPIPatcher/acpi_patcher.c; + sourceTree = ""; + }; + 1279BD7112BF4D8700612F62 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12D170AB12BF114400B78E60 /* cpu.c */; + name = "cpu.c: 13"; + rLen = 0; + rLoc = 269; + rType = 0; + vrLen = 446; + vrLoc = 0; + }; + 1279BD7512BF4D8700612F62 /* ACPIPatcher.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = ACPIPatcher.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/ACPIPatcher/ACPIPatcher.c; + sourceTree = ""; + }; + 1288318212C3608100EA4CB2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 128A9AF812C233CE00600556 /* Makefile */; + name = "Makefile: 14"; + rLen = 6; + rLoc = 217; + rType = 0; + vrLen = 858; + vrLoc = 0; + }; + 1288318612C3608100EA4CB2 /* ati.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = ati.h; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/GraphicsEnabler/ati.h; + sourceTree = ""; + }; + 128835DC12C366AB00EA4CB2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1288318612C3608100EA4CB2 /* ati.h */; + name = "ati.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1032; + vrLoc = 0; + }; + 128835DE12C366AB00EA4CB2 /* modules.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = modules.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/modules.c; + sourceTree = ""; + }; + 128835F612C3681F00EA4CB2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 128835DE12C366AB00EA4CB2 /* modules.c */; + name = "modules.c: 231"; + rLen = 17; + rLoc = 5492; + rType = 0; + vrLen = 833; + vrLoc = 4457; + }; + 128835FD12C368BF00EA4CB2 /* boot.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; name = boot.c; path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/boot.c; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 9698}}"; - sepNavSelRange = "{16367, 7}"; - sepNavVisRange = "{15853, 1136}"; - }; }; - 1269260612BC99AD004D09F1 /* PBXTextBookmark */ = { + 1288360C12C3690C00EA4CB2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 12DCD39312BBA5D600A20635 /* NVRAM.c */; - name = "NVRAM.c: 147"; - rLen = 14; - rLoc = 4792; + fRef = 128835FD12C368BF00EA4CB2 /* boot.c */; + name = "boot.c: 488"; + rLen = 0; + rLoc = 14514; rType = 0; - vrLen = 574; - vrLoc = 4564; + vrLen = 1506; + vrLoc = 16104; }; - 1269260B12BC9B1B004D09F1 /* acpi_patcher.c */ = { + 1288360E12C3690C00EA4CB2 /* pci_root.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; - name = acpi_patcher.c; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/ACPIPatcher/acpi_patcher.c; + name = pci_root.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/pci_root.c; sourceTree = ""; }; - 1299583012BEA42800C307EC /* PBXTextBookmark */ = { + 1288361712C3698700EA4CB2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 12679BA712BE822E00E3637F /* boot.c */; - name = "boot.c: 549"; - rLen = 7; - rLoc = 16367; + fRef = 1288360E12C3690C00EA4CB2 /* pci_root.c */; + name = "pci_root.c: 22"; + rLen = 11; + rLoc = 431; rType = 0; - vrLen = 1136; - vrLoc = 15853; + vrLen = 735; + vrLoc = 0; }; - 1299583112BEA42800C307EC /* PBXTextBookmark */ = { + 1288362912C3699600EA4CB2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 1299583212BEA42800C307EC /* cpu.c */; + fRef = 1288362A12C3699600EA4CB2 /* pci_root.c */; + name = "pci_root.c: 25"; + rLen = 11; + rLoc = 470; + rType = 0; + vrLen = 733; + vrLoc = 0; + }; + 1288362A12C3699600EA4CB2 /* pci_root.c */ = { + isa = PBXFileReference; + name = pci_root.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/pci_root.c; + sourceTree = ""; + }; + 128A97B712C2336000600556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1279BD7512BF4D8700612F62 /* ACPIPatcher.c */; + name = "ACPIPatcher.c: 61"; rLen = 8; - rLoc = 4274; + rLoc = 1715; rType = 0; + vrLen = 561; + vrLoc = 1350; }; - 1299583212BEA42800C307EC /* cpu.c */ = { + 128A97B812C2336000600556 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 08FB7796FE84155DC02AAC07 /* main.c */; + name = "main.c: 10"; + rLen = 7; + rLoc = 192; + rType = 0; + vrLen = 235; + vrLoc = 0; + }; + 128A97BC12C2336000600556 /* USBFix.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; - name = cpu.c; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/cpu.c; + name = USBFix.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/USBFix/USBFix.c; sourceTree = ""; }; - 1299583312BEA42800C307EC /* PBXTextBookmark */ = { + 128A9AF412C233CE00600556 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 1299583412BEA42800C307EC /* cpu.c */; - name = "cpu.c: 133"; - rLen = 8; - rLoc = 4274; + fRef = 128A97BC12C2336000600556 /* USBFix.c */; + name = "USBFix.c: 31"; + rLen = 14; + rLoc = 559; rType = 0; - vrLen = 967; - vrLoc = 3935; + vrLen = 454; + vrLoc = 145; }; - 1299583412BEA42800C307EC /* cpu.c */ = { + 128A9AF812C233CE00600556 /* Makefile */ = { isa = PBXFileReference; - name = cpu.c; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/cpu.c; + lastKnownFileType = sourcecode.make; + name = Makefile; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/HPET/Makefile; sourceTree = ""; }; 1299A51F12B3C328007ED516 /* PBXTextBookmark */ = { @@ -900,6 +1021,13 @@ path = /Users/slice/Projects/fakesmc/Chameleon/RC5m/i386/libsaio/pci_setup.c; sourceTree = ""; }; + 12D170AB12BF114400B78E60 /* cpu.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = cpu.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/cpu.c; + sourceTree = ""; + }; 12D6232512BA5F380032F367 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 12078D9812BA5AF400A1C013 /* fake_efi.c */; @@ -920,13 +1048,6 @@ vrLen = 419; vrLoc = 398; }; - 12DCD38A12BBA53700A20635 /* modules.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = modules.c; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/modules.c; - sourceTree = ""; - }; 12DCD38E12BBA5D600A20635 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 12F7FF0412BB9F3200949DEC /* ntfs_private.h */; @@ -937,23 +1058,6 @@ vrLen = 1189; vrLoc = 0; }; - 12DCD38F12BBA5D600A20635 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 12DCD38A12BBA53700A20635 /* modules.c */; - name = "modules.c: 1274"; - rLen = 10; - rLoc = 29698; - rType = 0; - vrLen = 855; - vrLoc = 29322; - }; - 12DCD39312BBA5D600A20635 /* NVRAM.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = NVRAM.c; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/NVRAM/NVRAM.c; - sourceTree = ""; - }; 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 12B90A5712B2AE1300FE287A /* 915resolution.h */; Index: branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 =================================================================== --- branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 (revision 688) +++ branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 (revision 689) @@ -274,6 +274,9 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey + 17 + 2 + 1 0 @@ -299,7 +302,7 @@ 164 RubberWindowFrame - 174 184 1172 694 0 0 1440 878 + 243 138 1172 694 0 0 1440 878 Module PBXSmartGroupTreeModule @@ -310,12 +313,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - cpu.c + pci_root.c PBXSplitModuleInNavigatorKey Split0 @@ -323,11 +328,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - cpu.c + pci_root.c _historyCapacity 0 bookmark - 1299583312BEA42800C307EC + 1288362912C3699600EA4CB2 history 12121ED112B261EA00207E55 @@ -378,13 +383,18 @@ 12FC0E9412BB65A800E9CFA8 12F7FF0012BB9F3200949DEC 12DCD38E12BBA5D600A20635 - 12DCD38F12BBA5D600A20635 - 1269260612BC99AD004D09F1 1236A82312BD6023003F1DA9 12BB721512BE659500B11948 12679BA312BE822E00E3637F - 1299583012BEA42800C307EC - 1299583112BEA42800C307EC + 1279BD7112BF4D8700612F62 + 128A97B712C2336000600556 + 128A97B812C2336000600556 + 128A9AF412C233CE00600556 + 1288318212C3608100EA4CB2 + 128835DC12C366AB00EA4CB2 + 128835F612C3681F00EA4CB2 + 1288360C12C3690C00EA4CB2 + 1288361712C3698700EA4CB2 SplitCount @@ -396,18 +406,16 @@ GeometryConfiguration Frame - {{0, 0}, {964, 351}} + {{0, 0}, {964, 470}} RubberWindowFrame - 174 184 1172 694 0 0 1440 878 + 243 138 1172 694 0 0 1440 878 Module PBXNavigatorGroup Proportion - 351pt + 470pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -418,14 +426,14 @@ GeometryConfiguration Frame - {{0, 356}, {964, 297}} + {{0, 475}, {964, 178}} RubberWindowFrame - 174 184 1172 694 0 0 1440 878 + 243 138 1172 694 0 0 1440 878 Module XCDetailModule Proportion - 297pt + 178pt Proportion @@ -444,9 +452,9 @@ TableOfContents - 1299583512BEA42800C307EC + 1288362B12C3699600EA4CB2 1CE0B1FE06471DED0097A5F4 - 1299583612BEA42800C307EC + 1288362C12C3699600EA4CB2 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -584,12 +592,12 @@ 5 WindowOrderList - 1C530D57069F1CE1000CFCEE + 1CD10A99069EF8BA00B06720 12C26D3512B0DDFC00AF7F4B /Users/slice/Projects/Chameleons/chameleon/branches/slice/ChamMek/ChamMek.xcodeproj WindowString - 174 184 1172 694 0 0 1440 878 + 243 138 1172 694 0 0 1440 878 WindowToolsV3 @@ -666,7 +674,7 @@ TableOfContents 12C26D3512B0DDFC00AF7F4B - 1299582212BEA40900C307EC + 1288362D12C3699600EA4CB2 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -788,13 +796,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 1236A82512BD6023003F1DA9 + 1288362E12C3699600EA4CB2 1C162984064C10D400B95A72 - 1236A82612BD6023003F1DA9 - 1236A82712BD6023003F1DA9 - 1236A82812BD6023003F1DA9 - 1236A82912BD6023003F1DA9 - 1236A82A12BD6023003F1DA9 + 1288362F12C3699600EA4CB2 + 1288363012C3699600EA4CB2 + 1288363112C3699600EA4CB2 + 1288363212C3699600EA4CB2 + 1288363312C3699600EA4CB2 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -828,7 +836,7 @@ PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - cpu.c + pci_root.c StatusBarVisibility @@ -837,7 +845,7 @@ Frame {{0, 0}, {1109, 510}} RubberWindowFrame - 254 61 1109 816 0 0 1440 878 + 331 62 1109 816 0 0 1440 878 Module PBXNavigatorGroup @@ -861,7 +869,7 @@ Frame {{0, 515}, {1109, 260}} RubberWindowFrame - 254 61 1109 816 0 0 1440 878 + 331 62 1109 816 0 0 1440 878 Module PBXProjectFindModule @@ -884,13 +892,13 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 1299582C12BEA40900C307EC - 1299582D12BEA40900C307EC + 1288360A12C3690800EA4CB2 + 1288360B12C3690800EA4CB2 1CDD528C0622207200134675 1CD0528E0623707200166675 WindowString - 254 61 1109 816 0 0 1440 878 + 331 62 1109 816 0 0 1440 878 WindowToolGUID 1C530D57069F1CE1000CFCEE WindowToolIsVisible