Index: branches/slice/i386/libsaio/disk.c =================================================================== --- branches/slice/i386/libsaio/disk.c (revision 748) +++ branches/slice/i386/libsaio/disk.c (revision 749) @@ -1301,6 +1301,12 @@ 0, 0, 0, 0, 0, 0, NTFSGetDescription, (BVFree)free, 0, kBIOSDevTypeHardDrive, 0); break; + + case FDISK_LINUX: + bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap, + 0, 0, 0, 0, 0, 0, EX2GetDescription, + (BVFree)free, 0, kBIOSDevTypeHardDrive, 0); + break; #endif default: bvr = newGPTBVRef(biosdev, gptID, gptMap->ent_lba_start, gptMap, Index: branches/slice/i386/boot2/graphics.c =================================================================== --- branches/slice/i386/boot2/graphics.c (revision 748) +++ branches/slice/i386/boot2/graphics.c (revision 749) @@ -739,7 +739,7 @@ //video_mode(1); } } - else video_mode(1); +// else video_mode(1); } if ( (mode == VGA_TEXT_MODE) || (err != errSuccess) ) Index: branches/slice/i386/boot2/boot.c =================================================================== --- branches/slice/i386/boot2/boot.c (revision 748) +++ branches/slice/i386/boot2/boot.c (revision 749) @@ -205,13 +205,14 @@ execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL); // Notify modules that the kernel is about to be started - if (bootArgs->Video.v_display == VGA_TEXT_MODE) + if (bootArgs->Video.v_display == VGA_TEXT_MODE || gVerboseMode) { - setVideoMode( GRAPHICS_MODE, 0 ); +// setVideoMode( GRAPHICS_MODE, 0 ); // Draw gray screen. NOTE: no boot image, that's in the gui module #ifndef OPTION_ROM if(!gVerboseMode) drawColorRectangle(0, 0, DEFAULT_SCREEN_WIDTH, DEFAULT_SCREEN_HEIGHT, 0x01); //Slice -??? #endif + setVideoMode( GRAPHICS_MODE, 0 ); } @@ -521,7 +522,7 @@ if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig) == true) { strlcpy(gBootKernelCacheFile, val, len+1); } else { - if(gMacOSVersion[3] == '6') { + if(gMacOSVersion[3] >= '6') { sprintf(gBootKernelCacheFile, "kernelcache_%s", /*kDefaultCachePathSnow,*/ (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64"); //, adler32); msglog("search for kernelcache %s\n", gBootKernelCacheFile); int lnam = sizeof(gBootKernelCacheFile) + 9; //with adler32 @@ -700,7 +701,7 @@ // config_file_t systemVersion; const char *val; int len; - msglog("Address loadConfigFile=%x bootInfo=%x\n", &loadConfigFile, &bootInfo); +// msglog("Address loadConfigFile=%x bootInfo=%x\n", &loadConfigFile, &bootInfo); if (!loadConfigFile("/System/Library/CoreServices/SystemVersion.plist", &systemVersion)) { valid = true; Index: branches/slice/i386/boot2/modules.c =================================================================== --- branches/slice/i386/boot2/modules.c (revision 748) +++ branches/slice/i386/boot2/modules.c (revision 749) @@ -87,7 +87,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 @@ -341,6 +341,9 @@ UInt32 binaryIndex = 0; UInt16 cmd = 0; + textSection = 0; + textAddress = 0; // reinitialize text location in case it doesn't exist; + // Parse through the load commands if(((struct mach_header*)binary)->magic == MH_MAGIC) { @@ -557,11 +560,11 @@ { // If the symbol is exported by this module if(symbolEntry->n_value && - symbol_handler(symbolString + symbolEntry->n_un.n_strx, (long long)base + symbolEntry->n_value, is64) != 0xFFFFFFFF) + symbol_handler(symbolString + symbolEntry->n_un.n_strx, textAddress ? (long long)base + symbolEntry->n_value : symbolEntry->n_value, is64) != 0xFFFFFFFF) { // Module start located. Start is an alias so don't register it - module_start = base + symbolEntry->n_value; + module_start = textAddress ? base + symbolEntry->n_value : symbolEntry->n_value; } symbolEntry++; @@ -578,11 +581,11 @@ // If the symbol is exported by this module if(symbolEntry->n_value && - symbol_handler(symbolString + symbolEntry->n_un.n_strx, (long long)base + symbolEntry->n_value, is64) != 0xFFFFFFFF) + symbol_handler(symbolString + symbolEntry->n_un.n_strx, textAddress ? (long long)base + symbolEntry->n_value : symbolEntry->n_value, is64) != 0xFFFFFFFF) { // Module start located. Start is an alias so don't register it - module_start = base + symbolEntry->n_value; + module_start = textAddress ? base + symbolEntry->n_value : symbolEntry->n_value; } symbolEntry++; @@ -624,8 +627,11 @@ switch(opcode) { case REBASE_OPCODE_DONE: - // Rebase complete. - //done = 1; + // Rebase complete, reset vars + immediate = 0; + opcode = 0; + type = 0; + segmentAddress = 0; default: break; @@ -1095,14 +1101,10 @@ return 1; } - else - { return 0; - } +} -} - /* * execute_hook( const char* name ) * name - Name of the module hook Index: branches/slice/i386/modules/KextPatcher/kext_patcher.c =================================================================== --- branches/slice/i386/modules/KextPatcher/kext_patcher.c (revision 748) +++ branches/slice/i386/modules/KextPatcher/kext_patcher.c (revision 749) @@ -222,7 +222,7 @@ zlib_result = inflateInit(&zstream); if (Z_OK != zlib_result) { - verbose("ZLIB Error: %s\n", zstream.msg); + printf("ZLIB Error: %s\n", zstream.msg); getc(); } else @@ -318,7 +318,7 @@ - // re alder32 the new mkext2 package + // re adler32 the new mkext2 package MKEXT_HDR_CAST(package)->adler32 = MKEXT_SWAP(Adler32((unsigned char *)&package->version, MKEXT_GET_LENGTH(package) - 0x10)); @@ -448,7 +448,7 @@ TagPtr match_class =XMLCastArray(XMLGetProperty(personality, (const char*)"IOPCIClassMatch")); - char* new_str = malloc(strlen("0xXXXX000&0xFFFE0000")+1); + char* new_str = malloc(sizeof("0xXXXX000&0xFFFE0000")); sprintf(new_str, "0x04030000&0xFFFE0000"); // todo, pass in actual class id @@ -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); - verbose("Unable to patch AppleHDA\n"); + printf("Unable to patch AppleHDA\n"); } else if (zlib_result != Z_STREAM_ERROR) { - verbose("AppleHDA: ZLIB Deflate Error: %s\n", zstream.msg); + printf("AppleHDA: ZLIB Deflate Error: %s\n", zstream.msg); getc(); } @@ -594,7 +594,7 @@ TagPtr match_names =XMLCastArray(XMLGetProperty(personality, (const char*)"IONameMatch")); - char* new_str = malloc(strlen("pci14e4,xxxx")+1); + char* new_str = malloc(sizeof("pci14e4,xxxx")); sprintf(new_str, "pci14e4,%02x", patch_bcm_deviceid); // Check to see if we *really* need to modify the plist, if not, return false @@ -672,7 +672,7 @@ DBG("Inflated result is %d, in: %d bytes, out: %d bytes, full: %d\n", zlib_result, zstream.total_in, zstream.total_out, full_size); - char* newstring = malloc(strlen("0x00008086") + 1); + char* newstring = malloc(sizeof("0x00008086")); sprintf(newstring, "0x%04x", 0x8086 | (patch_gma_deviceid << 16)); @@ -783,8 +783,8 @@ { /* deflate filled output buffer, meaning the data doesn't compress. */ - 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"); + 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"); pause(); } Index: branches/slice/i386/modules/GUI/gui.c =================================================================== --- branches/slice/i386/modules/GUI/gui.c (revision 748) +++ branches/slice/i386/modules/GUI/gui.c (revision 749) @@ -764,10 +764,10 @@ screen_params[1] = DEFAULT_SCREEN_HEIGHT; msglog("GUI default screen width=%d height=%d\n",screen_params[0], screen_params[1]); } - if (((int)screen_params[0]>1280) || ((int)screen_params[1]>1024)) + if (((int)screen_params[0]>4000) || ((int)screen_params[1]>4000)) { - screen_params[0] = 1280; - screen_params[1] = 1024; + screen_params[0] = DEFAULT_SCREEN_WIDTH; + screen_params[1] = DEFAULT_SCREEN_HEIGHT; msglog("GUI MAX VESA screen width=%d height=%d\n",screen_params[0], screen_params[1]); } screen_params[2] = 32; Index: branches/slice/i386/modules/GUI/GUI_module.c =================================================================== --- branches/slice/i386/modules/GUI/GUI_module.c (revision 748) +++ branches/slice/i386/modules/GUI/GUI_module.c (revision 749) @@ -32,7 +32,7 @@ bool useGUI; -void GUI_Kernel_Start_hook(void* kernelEntry, void* arg2, void* arg3, void* arg4); +//void GUI_Kernel_Start_hook(void* kernelEntry, void* arg2, void* arg3, void* arg4); void GUI_PreBoot_hook(void* arg1, void* arg2, void* arg3, void* arg4); void GUI_ModulesLoaded_hook(void* arg1, void* arg2, void* arg3, void* arg4); @@ -83,7 +83,7 @@ // Note: shouldn't be needed, but just in case drawBootGraphics(); } - else + else if(!useGUI) { setVideoMode( GRAPHICS_MODE, 0 ); //Slice - Why GRAPHICS_MODE if gVerboseMode? // DBG("GUI set GRAPHICS_MODE\n"); @@ -96,7 +96,7 @@ void GUI_PreBoot_hook(void* arg1, void* arg2, void* arg3, void* arg4) { // Turn off any GUI elements - if( bootArgs->Video.v_display == GRAPHICS_MODE ) + if( useGUI ) { gui.devicelist.draw = false; gui.bootprompt.draw = false; @@ -110,7 +110,7 @@ { // Disable outputs, they will still show in the boot log. replace_function("_printf", &GUI_verbose); - drawBootGraphics(); +// drawBootGraphics(); } } @@ -127,7 +127,7 @@ // initGUI() returned with an error, disabling GUI. useGUI = false; } - if (useGUI) + else if(useGUI) { replace_function("_initGraphicsMode", &GUI_initGraphicsMode); replace_function("_getBootOptions", &GUI_getBootOptions); @@ -138,6 +138,10 @@ replace_function("_verbose", &GUI_verbose); replace_function("_error", &GUI_error); replace_function("_stop", &GUI_stop); + + setVideoMode( GRAPHICS_MODE, 0 ); + drawBackground(); + } // DBG("GUI loaded\n"); } @@ -251,14 +255,14 @@ addBootArg(kIgnoreCachesFlag); break; - +/* case BOOT_SAFEMODE: gVerboseMode = true; gBootMode = kBootModeNormal; addBootArg(kSafeModeFlag); break; +*/ - case BOOT_SINGLEUSER: gVerboseMode = true; gBootMode = kBootModeNormal; @@ -744,7 +748,7 @@ // Associate a menu item for each BVRef. for (bvr=bvChain, i=gDeviceCount-1, selectIndex=0; bvr; bvr=bvr->next) { - DBG("GUI menu for device %d\n", bvr->biosdev); +// DBG("GUI menu for device %d\n", bvr->biosdev); if (bvr->visible) { getBootVolumeDescription(bvr, menuItems[i].name, sizeof(menuItems[i].name) - 1, true); Index: branches/slice/i386/modules/GUI/Makefile =================================================================== --- branches/slice/i386/modules/GUI/Makefile (revision 748) +++ branches/slice/i386/modules/GUI/Makefile (revision 749) @@ -2,7 +2,7 @@ MODULE_VERSION = "1.0.0" MODULE_COMPAT_VERSION = "1.0.0" MODULE_START = _$(MODULE_NAME)_start -MODULE_DEPENDENCIES = +MODULE_DEPENDENCIES = Resolution DIR = GUI @@ -38,7 +38,7 @@ $(HFILES) $(OTHERFILES) DIRS_NEEDED = $(OBJROOT) $(SYMROOT) -all embedtheme optionrom: dylib +all optionrom: dylib embedtheme: CFLAGS += -DEMBED_THEME embedtheme: art.h all Index: branches/slice/i386/modules/GUI/graphic_utils.c =================================================================== --- branches/slice/i386/modules/GUI/graphic_utils.c (revision 748) +++ branches/slice/i386/modules/GUI/graphic_utils.c (revision 749) @@ -77,7 +77,7 @@ clearScreenRows(0, 24); setCursorPosition( 0, 0, 1 ); - verbose("Video modes supported:\n", VBEDecodeFP(const char *, vbeInfo.OEMStringPtr)); + printf("Video modes supported:\n", VBEDecodeFP(const char *, vbeInfo.OEMStringPtr)); // Loop through the mode list, and find the matching mode. @@ -93,7 +93,7 @@ continue; } - verbose("Mode %x: %dx%dx%d mm:%d attr:%x\n", + printf("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/ATI5000Enabler/ati5.c =================================================================== --- branches/slice/i386/modules/ATI5000Enabler/ati5.c (revision 748) +++ branches/slice/i386/modules/ATI5000Enabler/ati5.c (revision 749) @@ -377,6 +377,7 @@ { 0x68D8, 0x5730174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5730", kNull }, { 0x68D8, 0x21D91458, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kBaboon }, { 0x68D8, 0x03561043, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kBaboon }, + { 0x68D8, 0xE151174B, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5670", kBaboon }, { 0x68D9, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull }, { 0x68DA, 0x301017AF, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull }, { 0x68DA, 0x30001787, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5630", kNull }, @@ -1066,6 +1067,9 @@ card->mmio = (uint8_t *)(pci_config_read32(pci_dev->dev.addr, PCI_BASE_ADDRESS_2) & ~0x0f); card->io = (uint8_t *)(pci_config_read32(pci_dev->dev.addr, PCI_BASE_ADDRESS_4) & ~0x03); + verbose("Framebuffer @0x%08X MMIO @0x%08X I/O Port @0x%08X ROM Addr @0x%08X\n", + card->fb, card->mmio, card->io, pci_config_read32(pci_dev->dev.addr, PCI_ROM_ADDRESS)); + card->posted = radeon_card_posted(); verbose("ATI card %s, ", card->posted ? "POSTed" : "non-POSTed"); @@ -1103,8 +1107,8 @@ else { for (i = 0; i < kCfgEnd; i++) - if (strcmp(fb_name, card_configs[card->info->cfg_name].name) == 0) - card->ports = card_configs[card->info->cfg_name].ports; + if (strcmp(fb_name, card_configs[i].name) == 0) + card->ports = card_configs[i].ports; } sprintf(name, "ATY,%s", fb_name); Index: branches/slice/revision =================================================================== --- branches/slice/revision (revision 748) +++ branches/slice/revision (revision 749) @@ -1 +1 @@ -676:726 \ No newline at end of file +676:727 \ No newline at end of file Index: branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser =================================================================== --- branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser (revision 748) +++ branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser (revision 749) @@ -114,8 +114,8 @@ PBXFileDataSource_Target_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 318239850; - PBXWorkspaceStateSaveDate = 318239850; + PBXPerProjectTemplateStateSaveDate = 320572527; + PBXWorkspaceStateSaveDate = 320572527; }; perUserProjectItems = { 120DC73B12F5C87900345D09 /* PBXTextBookmark */ = 120DC73B12F5C87900345D09 /* PBXTextBookmark */; @@ -134,7 +134,6 @@ 121FAA3512F051A200385F21 /* PBXTextBookmark */ = 121FAA3512F051A200385F21 /* PBXTextBookmark */; 1220CE4112F2BFBF0045986D /* PBXTextBookmark */ = 1220CE4112F2BFBF0045986D /* PBXTextBookmark */; 1220CE4212F2BFBF0045986D /* PBXTextBookmark */ = 1220CE4212F2BFBF0045986D /* PBXTextBookmark */; - 122A869712EC5429004312F4 /* PBXTextBookmark */ = 122A869712EC5429004312F4 /* PBXTextBookmark */; 122A869812EC5429004312F4 /* PBXTextBookmark */ = 122A869812EC5429004312F4 /* PBXTextBookmark */; 122A86C612ECA817004312F4 /* PBXTextBookmark */ = 122A86C612ECA817004312F4 /* PBXTextBookmark */; 122C56E012F2CB51005FE786 /* PBXTextBookmark */ = 122C56E012F2CB51005FE786 /* PBXTextBookmark */; @@ -149,6 +148,7 @@ 125437C812EF1E99007175C8 /* PBXTextBookmark */ = 125437C812EF1E99007175C8 /* PBXTextBookmark */; 125437CB12EF1E99007175C8 /* PBXTextBookmark */ = 125437CB12EF1E99007175C8 /* PBXTextBookmark */; 12569C8612F0115B005A9113 /* PBXTextBookmark */ = 12569C8612F0115B005A9113 /* PBXTextBookmark */; + 125916A912F8445300001F4A /* PBXTextBookmark */ = 125916A912F8445300001F4A /* PBXTextBookmark */; 125A6C2512F53BCD00535D65 /* PBXTextBookmark */ = 125A6C2512F53BCD00535D65 /* PBXTextBookmark */; 1267813012B7B13E00A25CED /* PBXTextBookmark */ = 1267813012B7B13E00A25CED /* PBXTextBookmark */; 12679BA312BE822E00E3637F /* PBXTextBookmark */ = 12679BA312BE822E00E3637F /* PBXTextBookmark */; @@ -156,8 +156,6 @@ 1267A85C12F5771100751FC6 /* PBXTextBookmark */ = 1267A85C12F5771100751FC6 /* PBXTextBookmark */; 126C766312EEF67F00BDB81E /* PBXTextBookmark */ = 126C766312EEF67F00BDB81E /* PBXTextBookmark */; 126D84C612F7FA6E000AB776 /* PBXTextBookmark */ = 126D84C612F7FA6E000AB776 /* PBXTextBookmark */; - 126D84C712F7FA6E000AB776 /* PBXTextBookmark */ = 126D84C712F7FA6E000AB776 /* PBXTextBookmark */; - 126D84C912F7FA6E000AB776 /* PBXTextBookmark */ = 126D84C912F7FA6E000AB776 /* PBXTextBookmark */; 12715CDF12EA253100E3013B /* PBXTextBookmark */ = 12715CDF12EA253100E3013B /* PBXTextBookmark */; 12715CE012EA253100E3013B /* PBXTextBookmark */ = 12715CE012EA253100E3013B /* PBXTextBookmark */; 1288318212C3608100EA4CB2 /* PBXTextBookmark */ = 1288318212C3608100EA4CB2 /* PBXTextBookmark */; @@ -206,6 +204,9 @@ 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */ = 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */; 12E6FB5712BB458400C2A021 /* PBXTextBookmark */ = 12E6FB5712BB458400C2A021 /* PBXTextBookmark */; 12E8842612D8F833004C76C8 /* PBXTextBookmark */ = 12E8842612D8F833004C76C8 /* PBXTextBookmark */; + 12EA3B42131B91D4008D7D68 /* PBXTextBookmark */ = 12EA3B42131B91D4008D7D68 /* PBXTextBookmark */; + 12EA3B43131B91D4008D7D68 /* PBXTextBookmark */ = 12EA3B43131B91D4008D7D68 /* PBXTextBookmark */; + 12EA3B45131B91D4008D7D68 /* PBXTextBookmark */ = 12EA3B45131B91D4008D7D68 /* PBXTextBookmark */; 12EFD98A12B510D9002A1712 /* PBXTextBookmark */ = 12EFD98A12B510D9002A1712 /* PBXTextBookmark */; 12EFE2FD12B51ED5002A1712 /* PBXTextBookmark */ = 12EFE2FD12B51ED5002A1712 /* PBXTextBookmark */; 12EFE65A12B547A7002A1712 /* PBXTextBookmark */ = 12EFE65A12B547A7002A1712 /* PBXTextBookmark */; @@ -522,23 +523,6 @@ path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/Memory/mem.c; sourceTree = ""; }; - 122A869012EC534F004312F4 /* ext2fs.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = ext2fs.c; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/ext2fs.c; - sourceTree = ""; - }; - 122A869712EC5429004312F4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 122A869012EC534F004312F4 /* ext2fs.c */; - name = "ext2fs.c: 12"; - rLen = 4; - rLoc = 195; - rType = 0; - vrLen = 432; - vrLoc = 0; - }; 122A869812EC5429004312F4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 122A869912EC5429004312F4 /* disk.h */; @@ -630,6 +614,11 @@ name = bootstruct.c; path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/bootstruct.c; sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1048, 2236}}"; + sepNavSelRange = "{3153, 79}"; + sepNavVisRange = "{2481, 1024}"; + }; }; 124C492812B8C915005AA276 /* Memory.c */ = { isa = PBXFileReference; @@ -784,6 +773,35 @@ vrLen = 1670; vrLoc = 0; }; + 1259120512F8299C00001F4A /* gui.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = gui.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/GUI/gui.c; + sourceTree = ""; + }; + 125916A912F8445300001F4A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1259120512F8299C00001F4A /* gui.c */; + name = "gui.c: 745"; + rLen = 13; + rLoc = 22523; + rType = 0; + vrLen = 1232; + vrLoc = 21985; + }; + 125916AD12F8445300001F4A /* ext2fs.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = ext2fs.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/ext2fs.c; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {752, 572}}"; + sepNavSelRange = "{7, 4}"; + sepNavVisRange = "{0, 598}"; + }; + }; 125A6C2512F53BCD00535D65 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 1230722412F4BC2E000AAE98 /* bootstruct.c */; @@ -875,36 +893,6 @@ vrLen = 761; vrLoc = 22651; }; - 126D84C712F7FA6E000AB776 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 126D84C812F7FA6E000AB776 /* gui.c */; - rLen = 13; - rLoc = 22523; - rType = 0; - }; - 126D84C812F7FA6E000AB776 /* gui.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = gui.c; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/GUI/gui.c; - sourceTree = ""; - }; - 126D84C912F7FA6E000AB776 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 126D84CA12F7FA6E000AB776 /* gui.c */; - name = "gui.c: 745"; - rLen = 13; - rLoc = 22523; - rType = 0; - vrLen = 1319; - vrLoc = 21985; - }; - 126D84CA12F7FA6E000AB776 /* gui.c */ = { - isa = PBXFileReference; - name = gui.c; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/GUI/gui.c; - sourceTree = ""; - }; 1271587B12EA1C6400E3013B /* ntfs.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; @@ -1712,11 +1700,6 @@ name = boot0.s; path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot0/boot0.s; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {752, 11219}}"; - sepNavSelRange = "{22464, 0}"; - sepNavVisRange = "{22651, 761}"; - }; }; 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -1769,6 +1752,46 @@ vrLen = 763; vrLoc = 20973; }; + 12EA3B42131B91D4008D7D68 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 125916AD12F8445300001F4A /* ext2fs.c */; + name = "ext2fs.c: 2"; + rLen = 4; + rLoc = 7; + rType = 0; + vrLen = 598; + vrLoc = 0; + }; + 12EA3B43131B91D4008D7D68 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12EA3B44131B91D4008D7D68 /* drivers.c */; + rLen = 6; + rLoc = 1443; + rType = 0; + }; + 12EA3B44131B91D4008D7D68 /* drivers.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = drivers.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/drivers.c; + sourceTree = ""; + }; + 12EA3B45131B91D4008D7D68 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12EA3B46131B91D4008D7D68 /* drivers.c */; + name = "drivers.c: 44"; + rLen = 6; + rLoc = 1443; + rType = 0; + vrLen = 840; + vrLoc = 1094; + }; + 12EA3B46131B91D4008D7D68 /* drivers.c */ = { + isa = PBXFileReference; + name = drivers.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/drivers.c; + sourceTree = ""; + }; 12EFD98A12B510D9002A1712 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 129F6EF012B50BB6005A820E /* modules.c */; @@ -1928,11 +1951,6 @@ name = 915resolution.c; path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/Resolution/915resolution.c; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 10751}}"; - sepNavSelRange = "{13812, 8}"; - sepNavVisRange = "{20341, 1044}"; - }; }; 12FE987912C7E281001B1702 /* PBXTextBookmark */ = { isa = PBXTextBookmark; Index: branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 =================================================================== --- branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 (revision 748) +++ branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 (revision 749) @@ -211,7 +211,6 @@ active-combo-popup action NSToolbarFlexibleSpaceItem - clean-target buildOrClean servicesModulefind com.apple.ide.PBXToolbarStopButton @@ -269,15 +268,11 @@ 08FB7794FE84155DC02AAC07 08FB7795FE84155DC02AAC07 12C26D3912B0DE0A00AF7F4B - 126D803012F7F46A000AB776 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 33 - 2 - 1 0 @@ -321,7 +316,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - gui.c + drivers.c PBXSplitModuleInNavigatorKey Split0 @@ -329,11 +324,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - gui.c + drivers.c _historyCapacity 0 bookmark - 126D84C912F7FA6E000AB776 + 12EA3B45131B91D4008D7D68 history 12B9F42612B29A4A00FE287A @@ -403,7 +398,6 @@ 12E8842612D8F833004C76C8 12715CDF12EA253100E3013B 12715CE012EA253100E3013B - 122A869712EC5429004312F4 122A869812EC5429004312F4 122A86C612ECA817004312F4 126C766312EEF67F00BDB81E @@ -433,7 +427,9 @@ 12DFBB2112F6E9A500E2DA49 12DFBFDA12F7066500E2DA49 126D84C612F7FA6E000AB776 - 126D84C712F7FA6E000AB776 + 125916A912F8445300001F4A + 12EA3B42131B91D4008D7D68 + 12EA3B43131B91D4008D7D68 SplitCount @@ -445,14 +441,14 @@ GeometryConfiguration Frame - {{0, 0}, {813, 502}} + {{0, 0}, {813, 487}} RubberWindowFrame 364 171 1021 706 0 0 1440 878 Module PBXNavigatorGroup Proportion - 502pt + 487pt ContentConfiguration @@ -465,14 +461,14 @@ GeometryConfiguration Frame - {{0, 507}, {813, 158}} + {{0, 492}, {813, 173}} RubberWindowFrame 364 171 1021 706 0 0 1440 878 Module XCDetailModule Proportion - 158pt + 173pt Proportion @@ -491,9 +487,9 @@ TableOfContents - 126D84CB12F7FA6E000AB776 + 12EA3B47131B91D4008D7D68 1CE0B1FE06471DED0097A5F4 - 126D84CC12F7FA6E000AB776 + 12EA3B48131B91D4008D7D68 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -713,7 +709,7 @@ TableOfContents 12C26D3512B0DDFC00AF7F4B - 126D84BE12F7FA66000AB776 + 12EA3B37131B91BB008D7D68 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -868,12 +864,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - 915resolution.c + bootstruct.c StatusBarVisibility @@ -894,8 +892,6 @@ 510pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -931,8 +927,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 126D84C412F7FA66000AB776 - 126D84C512F7FA66000AB776 + 12EA3B40131B91BB008D7D68 + 12EA3B41131B91BB008D7D68 1CDD528C0622207200134675 1CD0528E0623707200166675