Index: trunk/i386/libsaio/nvidia.c =================================================================== --- trunk/i386/libsaio/nvidia.c (revision 2244) +++ trunk/i386/libsaio/nvidia.c (revision 2245) @@ -1906,6 +1906,7 @@ else { printf("ERROR: unable to open nVidia Video BIOS File %s\n", nvFilename); + free(rom); return false; } } @@ -2050,7 +2051,7 @@ } } } - + sprintf(biosVersion, "%s", (nvBiosOveride > 0) ? nvFilename : version_str); sprintf(kNVCAP, "NVCAP_%04x", nvda_dev->device_id); Index: trunk/i386/libsaio/ati.c =================================================================== --- trunk/i386/libsaio/ati.c (revision 2244) +++ trunk/i386/libsaio/ati.c (revision 2245) @@ -1950,7 +1950,9 @@ verbose(" @0x%x\n", rom_addr); } else + { rom_addr = (option_rom_header_t *)0xc0000; + } if (!validate_rom(rom_addr, card->pci_dev)) { @@ -1964,7 +1966,9 @@ card->rom = malloc(card->rom_size); if (!card->rom) + { return false; + } memcpy(card->rom, (void *)rom_addr, card->rom_size); @@ -2008,7 +2012,9 @@ // wait for SPLL_CHG_STATUS to change to 1 cg_spll_status = 0; while (!(cg_spll_status & R600_SPLL_CHG_STATUS)) + { cg_spll_status = RegRead32(R600_CG_SPLL_STATUS); + } RegWrite32(R600_ROM_CNTL, (rom_cntl & ~R600_SCK_OVERWRITE)); } @@ -2123,7 +2129,9 @@ } for (offset = 0; offset < 0x100; offset += 4) + { config_space[offset / 4] = pci_config_read32(card->pci_dev->dev.addr, offset); + } devprop_add_value(card->device, "ATY,PCIConfigSpace", config_space, 0x100); free(config_space); @@ -2139,7 +2147,7 @@ char name_parent[24]; int i; int n_ports = 0; - + card = malloc(sizeof(card_t)); if (!card) { Index: trunk/i386/boot2/boot.c =================================================================== --- trunk/i386/boot2/boot.c (revision 2244) +++ trunk/i386/boot2/boot.c (revision 2245) @@ -198,8 +198,9 @@ finalizeBootStruct(); // Jump to kernel's entry point. There's no going back now. - if ((checkOSVersion("10.7")) || (checkOSVersion("10.8"))) { - + if ((checkOSVersion("10.7")) || (checkOSVersion("10.8")) || (checkOSVersion("10.9"))) + { + // Notify modules that the kernel is about to be started execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL); @@ -238,10 +239,14 @@ // Use specify kernel cache file if not empty if (cacheFile[0] != 0) + { strlcpy(kernelCacheFile, cacheFile, sizeof(kernelCacheFile)); - else { - // Lion and Mountain Lion prelink kernel cache file - if ((checkOSVersion("10.7")) || (checkOSVersion("10.8"))) { + } + else + { + // Lion, Mountain Lion and Mavericks prelink kernel cache file + if ((checkOSVersion("10.7")) || (checkOSVersion("10.8")) || (checkOSVersion("10.9"))) + { sprintf(kernelCacheFile, "%skernelcache", kDefaultCachePathSnow); } // Snow Leopard prelink kernel cache file Index: trunk/i386/boot2/gui.c =================================================================== --- trunk/i386/boot2/gui.c (revision 2244) +++ trunk/i386/boot2/gui.c (revision 2245) @@ -39,151 +39,159 @@ iBackground = 0, iLogo, - iDeviceGeneric, - iDeviceGeneric_o, - iDeviceHFS, - iDeviceHFS_o, - iDeviceHFS_ML, - iDeviceHFS_ML_o, - iDeviceHFS_Lion, - iDeviceHFS_Lion_o, - iDeviceHFS_SL, - iDeviceHFS_SL_o, - iDeviceHFS_Leo, - iDeviceHFS_Leo_o, - iDeviceHFS_Tiger, - iDeviceHFS_Tiger_o, - iDeviceHFSRAID, - iDeviceHFSRAID_o, - iDeviceHFSRAID_ML, - iDeviceHFSRAID_ML_o, - iDeviceHFSRAID_Lion, - iDeviceHFSRAID_Lion_o, - iDeviceHFSRAID_SL, - iDeviceHFSRAID_SL_o, - iDeviceHFSRAID_Leo, - iDeviceHFSRAID_Leo_o, - iDeviceHFSRAID_Tiger, - iDeviceHFSRAID_Tiger_o, - iDeviceEXT3, - iDeviceEXT3_o, - iDeviceFreeBSD, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ - iDeviceFreeBSD_o, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ - iDeviceOpenBSD, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ - iDeviceOpenBSD_o, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ - iDeviceBEFS, /* Haiku detection and Icon credits to scorpius */ - iDeviceBEFS_o, /* Haiku detection and Icon credits to scorpius */ - iDeviceFAT, - iDeviceFAT_o, - iDeviceFAT16, - iDeviceFAT16_o, - iDeviceFAT32, - iDeviceFAT32_o, - iDeviceNTFS, - iDeviceNTFS_o, - iDeviceCDROM, - iDeviceCDROM_o, + iDeviceGeneric, + iDeviceGeneric_o, + iDeviceHFS, + iDeviceHFS_o, + iDeviceHFS_mav, + iDeviceHFS_mav_o, + iDeviceHFS_ML, + iDeviceHFS_ML_o, + iDeviceHFS_Lion, + iDeviceHFS_Lion_o, + iDeviceHFS_SL, + iDeviceHFS_SL_o, + iDeviceHFS_Leo, + iDeviceHFS_Leo_o, + iDeviceHFS_Tiger, + iDeviceHFS_Tiger_o, + iDeviceHFSRAID, + iDeviceHFSRAID_o, + iDeviceHFSRAID_mav, + iDeviceHFSRAID_mav_o, + iDeviceHFSRAID_ML, + iDeviceHFSRAID_ML_o, + iDeviceHFSRAID_Lion, + iDeviceHFSRAID_Lion_o, + iDeviceHFSRAID_SL, + iDeviceHFSRAID_SL_o, + iDeviceHFSRAID_Leo, + iDeviceHFSRAID_Leo_o, + iDeviceHFSRAID_Tiger, + iDeviceHFSRAID_Tiger_o, + iDeviceEXT3, + iDeviceEXT3_o, + iDeviceFreeBSD, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ + iDeviceFreeBSD_o, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ + iDeviceOpenBSD, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ + iDeviceOpenBSD_o, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ + iDeviceBEFS, /* Haiku detection and Icon credits to scorpius */ + iDeviceBEFS_o, /* Haiku detection and Icon credits to scorpius */ + iDeviceFAT, + iDeviceFAT_o, + iDeviceFAT16, + iDeviceFAT16_o, + iDeviceFAT32, + iDeviceFAT32_o, + iDeviceNTFS, + iDeviceNTFS_o, + iDeviceCDROM, + iDeviceCDROM_o, - iSelection, - iDeviceScrollPrev, - iDeviceScrollNext, + iSelection, + iDeviceScrollPrev, + iDeviceScrollNext, - iMenuBoot, - iMenuVerbose, - iMenuIgnoreCaches, - iMenuSingleUser, - iMenuMemoryInfo, - iMenuVideoInfo, - iMenuHelp, - iMenuVerboseDisabled, - iMenuIgnoreCachesDisabled, - iMenuSingleUserDisabled, - iMenuSelection, + iMenuBoot, + iMenuVerbose, + iMenuIgnoreCaches, + iMenuSingleUser, + iMenuMemoryInfo, + iMenuVideoInfo, + iMenuHelp, + iMenuVerboseDisabled, + iMenuIgnoreCachesDisabled, + iMenuSingleUserDisabled, + iMenuSelection, - iProgressBar, - iProgressBarBackground, + iProgressBar, + iProgressBarBackground, - iTextScrollPrev, - iTextScrollNext, + iTextScrollPrev, + iTextScrollNext, - iFontConsole, - iFontSmall, + iFontConsole, + iFontSmall, }; image_t images[] = { - {.name = "background", .image = NULL}, - {.name = "logo", .image = NULL}, - - {.name = "device_generic", .image = NULL}, - {.name = "device_generic_o", .image = NULL}, - {.name = "device_hfsplus", .image = NULL}, - {.name = "device_hfsplus_o", .image = NULL}, - {.name = "device_hfsplus_ml", .image = NULL}, - {.name = "device_hfsplus_ml_o", .image = NULL}, - {.name = "device_hfsplus_lion", .image = NULL}, - {.name = "device_hfsplus_lion_o", .image = NULL}, - {.name = "device_hfsplus_sl", .image = NULL}, - {.name = "device_hfsplus_sl_o", .image = NULL}, - {.name = "device_hfsplus_leo", .image = NULL}, - {.name = "device_hfsplus_leo_o", .image = NULL}, - {.name = "device_hfsplus_tiger", .image = NULL}, - {.name = "device_hfsplus_tiger_o", .image = NULL}, + {.name = "background", .image = NULL}, + {.name = "logo", .image = NULL}, - {.name = "device_hfsraid", .image = NULL}, - {.name = "device_hfsraid_o", .image = NULL}, - {.name = "device_hfsraid_ml", .image = NULL}, - {.name = "device_hfsraid_ml_o", .image = NULL}, - {.name = "device_hfsraid_lion", .image = NULL}, - {.name = "device_hfsraid_lion_o", .image = NULL}, - {.name = "device_hfsraid_sl", .image = NULL}, - {.name = "device_hfsraid_sl_o", .image = NULL}, - {.name = "device_hfsraid_leo", .image = NULL}, - {.name = "device_hfsraid_leo_o", .image = NULL}, - {.name = "device_hfsraid_tiger", .image = NULL}, - {.name = "device_hfsraid_tiger_o", .image = NULL}, - {.name = "device_ext3", .image = NULL}, - {.name = "device_ext3_o", .image = NULL}, - {.name = "device_freebsd", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ - {.name = "device_freebsd_o", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ - {.name = "device_openbsd", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ - {.name = "device_openbsd_o", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ - {.name = "device_befs", .image = NULL}, /* Haiku detection and Icon credits to scorpius */ - {.name = "device_befs_o", .image = NULL}, /* Haiku detection and Icon credits to scorpius */ - {.name = "device_fat", .image = NULL}, - {.name = "device_fat_o", .image = NULL}, - {.name = "device_fat16", .image = NULL}, - {.name = "device_fat16_o", .image = NULL}, - {.name = "device_fat32", .image = NULL}, - {.name = "device_fat32_o", .image = NULL}, - {.name = "device_ntfs", .image = NULL}, - {.name = "device_ntfs_o", .image = NULL}, - {.name = "device_cdrom", .image = NULL}, - {.name = "device_cdrom_o", .image = NULL}, + {.name = "device_generic", .image = NULL}, + {.name = "device_generic_o", .image = NULL}, + {.name = "device_hfsplus", .image = NULL}, + {.name = "device_hfsplus_o", .image = NULL}, + {.name = "device_hfsplus_mav", .image = NULL}, + {.name = "device_hfsplus_mav_o", .image = NULL}, + {.name = "device_hfsplus_ml", .image = NULL}, + {.name = "device_hfsplus_ml_o", .image = NULL}, + {.name = "device_hfsplus_lion", .image = NULL}, + {.name = "device_hfsplus_lion_o", .image = NULL}, + {.name = "device_hfsplus_sl", .image = NULL}, + {.name = "device_hfsplus_sl_o", .image = NULL}, + {.name = "device_hfsplus_leo", .image = NULL}, + {.name = "device_hfsplus_leo_o", .image = NULL}, + {.name = "device_hfsplus_tiger", .image = NULL}, + {.name = "device_hfsplus_tiger_o", .image = NULL}, - {.name = "device_selection", .image = NULL}, - {.name = "device_scroll_prev", .image = NULL}, - {.name = "device_scroll_next", .image = NULL}, - - {.name = "menu_boot", .image = NULL}, - {.name = "menu_verbose", .image = NULL}, - {.name = "menu_ignore_caches", .image = NULL}, - {.name = "menu_single_user", .image = NULL}, - {.name = "menu_memory_info", .image = NULL}, - {.name = "menu_video_info", .image = NULL}, - {.name = "menu_help", .image = NULL}, - {.name = "menu_verbose_disabled", .image = NULL}, - {.name = "menu_ignore_caches_disabled", .image = NULL}, - {.name = "menu_single_user_disabled", .image = NULL}, - {.name = "menu_selection", .image = NULL}, - - {.name = "progress_bar", .image = NULL}, - {.name = "progress_bar_background", .image = NULL}, - - {.name = "text_scroll_prev", .image = NULL}, - {.name = "text_scroll_next", .image = NULL}, - - {.name = "font_console", .image = NULL}, - {.name = "font_small", .image = NULL}, + {.name = "device_hfsraid", .image = NULL}, + {.name = "device_hfsraid_o", .image = NULL}, + {.name = "device_hfsraid_mav", .image = NULL}, + {.name = "device_hfsraid_mav_o", .image = NULL}, + {.name = "device_hfsraid_ml", .image = NULL}, + {.name = "device_hfsraid_ml_o", .image = NULL}, + {.name = "device_hfsraid_lion", .image = NULL}, + {.name = "device_hfsraid_lion_o", .image = NULL}, + {.name = "device_hfsraid_sl", .image = NULL}, + {.name = "device_hfsraid_sl_o", .image = NULL}, + {.name = "device_hfsraid_leo", .image = NULL}, + {.name = "device_hfsraid_leo_o", .image = NULL}, + {.name = "device_hfsraid_tiger", .image = NULL}, + {.name = "device_hfsraid_tiger_o", .image = NULL}, + {.name = "device_ext3", .image = NULL}, + {.name = "device_ext3_o", .image = NULL}, + {.name = "device_freebsd", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ + {.name = "device_freebsd_o", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ + {.name = "device_openbsd", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ + {.name = "device_openbsd_o", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ + {.name = "device_befs", .image = NULL}, /* Haiku detection and Icon credits to scorpius */ + {.name = "device_befs_o", .image = NULL}, /* Haiku detection and Icon credits to scorpius */ + {.name = "device_fat", .image = NULL}, + {.name = "device_fat_o", .image = NULL}, + {.name = "device_fat16", .image = NULL}, + {.name = "device_fat16_o", .image = NULL}, + {.name = "device_fat32", .image = NULL}, + {.name = "device_fat32_o", .image = NULL}, + {.name = "device_ntfs", .image = NULL}, + {.name = "device_ntfs_o", .image = NULL}, + {.name = "device_cdrom", .image = NULL}, + {.name = "device_cdrom_o", .image = NULL}, + + {.name = "device_selection", .image = NULL}, + {.name = "device_scroll_prev", .image = NULL}, + {.name = "device_scroll_next", .image = NULL}, + + {.name = "menu_boot", .image = NULL}, + {.name = "menu_verbose", .image = NULL}, + {.name = "menu_ignore_caches", .image = NULL}, + {.name = "menu_single_user", .image = NULL}, + {.name = "menu_memory_info", .image = NULL}, + {.name = "menu_video_info", .image = NULL}, + {.name = "menu_help", .image = NULL}, + {.name = "menu_verbose_disabled", .image = NULL}, + {.name = "menu_ignore_caches_disabled", .image = NULL}, + {.name = "menu_single_user_disabled", .image = NULL}, + {.name = "menu_selection", .image = NULL}, + + {.name = "progress_bar", .image = NULL}, + {.name = "progress_bar_background", .image = NULL}, + + {.name = "text_scroll_prev", .image = NULL}, + {.name = "text_scroll_next", .image = NULL}, + + {.name = "font_console", .image = NULL}, + {.name = "font_small", .image = NULL}, }; int imageCnt = 0; @@ -224,11 +232,13 @@ static int getImageIndexByName(const char *name) { - int i; + int i; for (i = 0; i < sizeof(images) / sizeof(images[0]); i++) { - if (strcmp(name, images[i].name) == 0) - return i; // found the name + if (strcmp(name, images[i].name) == 0) + { + return i; // found the name + } } return -1; } @@ -351,6 +361,8 @@ LOADPNG(device_generic_o, iDeviceGeneric); LOADPNG(device_hfsplus, iDeviceGeneric); LOADPNG(device_hfsplus_o, iDeviceHFS); + LOADPNG(device_hfsplus_mav, iDeviceHFS); + LOADPNG(device_hfsplus_mav_o, iDeviceHFS_mav); LOADPNG(device_hfsplus_ml, iDeviceHFS); LOADPNG(device_hfsplus_ml_o, iDeviceHFS_ML); LOADPNG(device_hfsplus_lion, iDeviceHFS); @@ -364,6 +376,8 @@ LOADPNG(device_hfsraid, iDeviceHFS); LOADPNG(device_hfsraid_o, iDeviceHFSRAID); + LOADPNG(device_hfsraid_mav, iDeviceHFSRAID); + LOADPNG(device_hfsraid_mav_o, iDeviceHFSRAID_mav); LOADPNG(device_hfsraid_ml, iDeviceHFSRAID); LOADPNG(device_hfsraid_ml_o, iDeviceHFSRAID_ML); LOADPNG(device_hfsraid_lion, iDeviceHFSRAID); @@ -884,6 +898,9 @@ { // Use HFS or HFSRAID icon depending on bvr flags. Fallbacks are handled by alt_image above. switch (device->OSVersion[3]) { + case '9': + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_mav : iDeviceHFS_mav); + break; case '8': devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_ML : iDeviceHFS_ML); break; @@ -936,7 +953,7 @@ break; default: - devicetype = iDeviceGeneric; // Use Generic icon + devicetype = iDeviceGeneric; // Use Generic icon break; } } Index: trunk/artwork/themes/default/device_hfsraid_mav_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsraid_mav_o.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: trunk/artwork/themes/default/device_hfsraid_mav.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsraid_mav.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: trunk/artwork/themes/default/device_hfsplus_mav_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsplus_mav_o.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: trunk/artwork/themes/default/device_hfsplus_mav.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsplus_mav.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: trunk/artwork/themes/default/device_hfsfusion_mav_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsfusion_mav_o.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: trunk/artwork/themes/default/device_hfsfusion_mav.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsfusion_mav.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream