Index: trunk/Chameleon.xcodeproj/project.pbxproj =================================================================== --- trunk/Chameleon.xcodeproj/project.pbxproj (revision 2455) +++ trunk/Chameleon.xcodeproj/project.pbxproj (revision 2456) @@ -113,6 +113,114 @@ 360A04CE1861F48F0091F464 /* xml.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = xml.h; sourceTree = ""; }; 361BC70214BD977700236488 /* Changes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Changes.txt; sourceTree = ""; }; 361BC70B14BD97C800236488 /* pkg.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; name = pkg.zip; path = Icons/pkg.zip; sourceTree = ""; }; + 364B195E1A029963009A30BA /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; + 364B195F1A029963009A30BA /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; + 364B19601A029963009A30BA /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; + 364B19611A029963009A30BA /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; + 364B19621A029963009A30BA /* device_fat16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat16.png; sourceTree = ""; }; + 364B19631A029963009A30BA /* device_fat32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat32.png; sourceTree = ""; }; + 364B19641A029963009A30BA /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; + 364B19651A029963009A30BA /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; + 364B19661A029963009A30BA /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; + 364B19671A029963009A30BA /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; + 364B19681A029963009A30BA /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; + 364B19691A029963009A30BA /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; + 364B196A1A029963009A30BA /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; + 364B196B1A029963009A30BA /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; + 364B196C1A029963009A30BA /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; + 364B196D1A029963009A30BA /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; + 364B196E1A029963009A30BA /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; + 364B196F1A029963009A30BA /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; + 364B19701A029963009A30BA /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; + 364B19711A029963009A30BA /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; + 364B19721A029963009A30BA /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; + 364B19731A029963009A30BA /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; + 364B19741A029963009A30BA /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; + 364B19751A029963009A30BA /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; + 364B19761A029963009A30BA /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; + 364B19771A029963009A30BA /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; + 364B19781A029963009A30BA /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; + 364B19791A029963009A30BA /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; + 364B197A1A029963009A30BA /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; + 364B197B1A029963009A30BA /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; + 364B197C1A029963009A30BA /* theme.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; + 364B197D1A02997C009A30BA /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; + 364B197E1A02997C009A30BA /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; + 364B197F1A02997C009A30BA /* device_befs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o.png; sourceTree = ""; }; + 364B19801A02997C009A30BA /* device_befs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs.png; sourceTree = ""; }; + 364B19811A02997C009A30BA /* device_cdrom_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom_o.png; sourceTree = ""; }; + 364B19821A02997C009A30BA /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; + 364B19831A02997C009A30BA /* device_ext3_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3_o.png; sourceTree = ""; }; + 364B19841A02997C009A30BA /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; + 364B19851A02997C009A30BA /* device_fat_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat_o.png; sourceTree = ""; }; + 364B19861A02997C009A30BA /* device_fat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat.png; sourceTree = ""; }; + 364B19871A02997C009A30BA /* device_freebsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_o.png; sourceTree = ""; }; + 364B19881A02997C009A30BA /* device_freebsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd.png; sourceTree = ""; }; + 364B19891A02997C009A30BA /* device_generic_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic_o.png; sourceTree = ""; }; + 364B198A1A02997C009A30BA /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; + 364B198B1A02997C009A30BA /* device_hfsfusion_mav_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsfusion_mav_o.png; sourceTree = ""; }; + 364B198C1A02997C009A30BA /* device_hfsfusion_mav.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsfusion_mav.png; sourceTree = ""; }; + 364B198D1A02997C009A30BA /* device_hfsplus_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo_o.png; sourceTree = ""; }; + 364B198E1A02997C009A30BA /* device_hfsplus_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo.png; sourceTree = ""; }; + 364B198F1A02997C009A30BA /* device_hfsplus_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_o.png; sourceTree = ""; }; + 364B19901A02997C009A30BA /* device_hfsplus_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion.png; sourceTree = ""; }; + 364B19911A02997C009A30BA /* device_hfsplus_mav_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mav_o.png; sourceTree = ""; }; + 364B19921A02997C009A30BA /* device_hfsplus_mav.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_mav.png; sourceTree = ""; }; + 364B19931A02997C009A30BA /* device_hfsplus_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml_o.png; sourceTree = ""; }; + 364B19941A02997C009A30BA /* device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml.png; sourceTree = ""; }; + 364B19951A02997C009A30BA /* device_hfsplus_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_o.png; sourceTree = ""; }; + 364B19961A02997C009A30BA /* device_hfsplus_recovery_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_recovery_o.png; sourceTree = ""; }; + 364B19971A02997C009A30BA /* device_hfsplus_recovery.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_recovery.png; sourceTree = ""; }; + 364B19981A02997C009A30BA /* device_hfsplus_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_o.png; sourceTree = ""; }; + 364B19991A02997C009A30BA /* device_hfsplus_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl.png; sourceTree = ""; }; + 364B199A1A02997C009A30BA /* device_hfsplus_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger_o.png; sourceTree = ""; }; + 364B199B1A02997C009A30BA /* device_hfsplus_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger.png; sourceTree = ""; }; + 364B199C1A02997C009A30BA /* device_hfsplus_yos_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_yos_o.png; sourceTree = ""; }; + 364B199D1A02997C009A30BA /* device_hfsplus_yos.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_yos.png; sourceTree = ""; }; + 364B199E1A02997C009A30BA /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; + 364B199F1A02997C009A30BA /* device_hfsraid_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_leo_o.png; sourceTree = ""; }; + 364B19A01A02997C009A30BA /* device_hfsraid_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_leo.png; sourceTree = ""; }; + 364B19A11A02997C009A30BA /* device_hfsraid_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion_o.png; sourceTree = ""; }; + 364B19A21A02997C009A30BA /* device_hfsraid_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion.png; sourceTree = ""; }; + 364B19A31A02997C009A30BA /* device_hfsraid_mav_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mav_o.png; sourceTree = ""; }; + 364B19A41A02997C009A30BA /* device_hfsraid_mav.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_mav.png; sourceTree = ""; }; + 364B19A51A02997C009A30BA /* device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_o.png; sourceTree = ""; }; + 364B19A61A02997C009A30BA /* device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml.png; sourceTree = ""; }; + 364B19A71A02997C009A30BA /* device_hfsraid_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_o.png; sourceTree = ""; }; + 364B19A81A02997C009A30BA /* device_hfsraid_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl_o.png; sourceTree = ""; }; + 364B19A91A02997C009A30BA /* device_hfsraid_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl.png; sourceTree = ""; }; + 364B19AA1A02997C009A30BA /* device_hfsraid_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_tiger_o.png; sourceTree = ""; }; + 364B19AB1A02997C009A30BA /* device_hfsraid_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_tiger.png; sourceTree = ""; }; + 364B19AC1A02997C009A30BA /* device_hfsraid_yos_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_yos_o.png; sourceTree = ""; }; + 364B19AD1A02997C009A30BA /* device_hfsraid_yos.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_yos.png; sourceTree = ""; }; + 364B19AE1A02997C009A30BA /* device_hfsraid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid.png; sourceTree = ""; }; + 364B19AF1A02997C009A30BA /* device_ntfs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs_o.png; sourceTree = ""; }; + 364B19B01A02997C009A30BA /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; + 364B19B11A02997C009A30BA /* device_openbsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o.png; sourceTree = ""; }; + 364B19B21A02997C009A30BA /* device_openbsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd.png; sourceTree = ""; }; + 364B19B31A02997C009A30BA /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; + 364B19B41A02997C009A30BA /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; + 364B19B51A02997C009A30BA /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; + 364B19B61A02997C009A30BA /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; + 364B19B71A02997C009A30BA /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; + 364B19B81A02997C009A30BA /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; + 364B19B91A02997C009A30BA /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; + 364B19BA1A02997C009A30BA /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; + 364B19BB1A02997C009A30BA /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; + 364B19BC1A02997C009A30BA /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; + 364B19BD1A02997C009A30BA /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; + 364B19BE1A02997C009A30BA /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; + 364B19BF1A02997C009A30BA /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; + 364B19C01A02997C009A30BA /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; + 364B19C11A02997C009A30BA /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; + 364B19C21A02997C009A30BA /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; + 364B19C31A02997C009A30BA /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; + 364B19C41A02997C009A30BA /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; + 364B19C51A02997C009A30BA /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; + 364B19C61A02997C009A30BA /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; + 364B19C71A02997C009A30BA /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; + 364B19C81A02997C009A30BA /* theme.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; + 364B19C91A02997C009A30BA /* thumb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb.png; sourceTree = ""; }; 36809A7019DA43B5007ACE3F /* lzvn.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = lzvn.c; sourceTree = ""; }; 36809A7219DA4563007ACE3F /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE; path = klibc/LICENSE; sourceTree = ""; }; 36809A7319DA4563007ACE3F /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Makefile; path = klibc/Makefile; sourceTree = ""; }; @@ -122,67 +230,6 @@ 369689D014BD0AF10013D77F /* BLOCKERS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BLOCKERS; sourceTree = ""; }; 369689D114BD0AF10013D77F /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; 369689D214BD0B470013D77F /* version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = version; sourceTree = ""; }; - 36AB75A114BD0866005B8045 /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; - 36AB75A214BD0866005B8045 /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; - 36AB75A314BD0866005B8045 /* device_befs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o.png; sourceTree = ""; }; - 36AB75A414BD0866005B8045 /* device_befs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs.png; sourceTree = ""; }; - 36AB75A514BD0866005B8045 /* device_cdrom_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom_o.png; sourceTree = ""; }; - 36AB75A614BD0866005B8045 /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; - 36AB75A714BD0866005B8045 /* device_ext3_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3_o.png; sourceTree = ""; }; - 36AB75A814BD0866005B8045 /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; - 36AB75A914BD0866005B8045 /* device_fat_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat_o.png; sourceTree = ""; }; - 36AB75AA14BD0866005B8045 /* device_fat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat.png; sourceTree = ""; }; - 36AB75AB14BD0866005B8045 /* device_freebsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_o.png; sourceTree = ""; }; - 36AB75AC14BD0866005B8045 /* device_freebsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd.png; sourceTree = ""; }; - 36AB75AD14BD0866005B8045 /* device_generic_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic_o.png; sourceTree = ""; }; - 36AB75AE14BD0866005B8045 /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; - 36AB75AF14BD0866005B8045 /* device_hfsplus_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo_o.png; sourceTree = ""; }; - 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo.png; sourceTree = ""; }; - 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_o.png; sourceTree = ""; }; - 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion.png; sourceTree = ""; }; - 36AB75B314BD0866005B8045 /* device_hfsplus_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_o.png; sourceTree = ""; }; - 36AB75B414BD0866005B8045 /* device_hfsplus_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_o.png; sourceTree = ""; }; - 36AB75B514BD0866005B8045 /* device_hfsplus_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl.png; sourceTree = ""; }; - 36AB75B614BD0866005B8045 /* device_hfsplus_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger_o.png; sourceTree = ""; }; - 36AB75B714BD0866005B8045 /* device_hfsplus_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger.png; sourceTree = ""; }; - 36AB75B814BD0866005B8045 /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; - 36AB75B914BD0866005B8045 /* device_hfsraid_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_leo_o.png; sourceTree = ""; }; - 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_leo.png; sourceTree = ""; }; - 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion_o.png; sourceTree = ""; }; - 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion.png; sourceTree = ""; }; - 36AB75BD14BD0866005B8045 /* device_hfsraid_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_o.png; sourceTree = ""; }; - 36AB75BE14BD0866005B8045 /* device_hfsraid_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl_o.png; sourceTree = ""; }; - 36AB75BF14BD0866005B8045 /* device_hfsraid_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl.png; sourceTree = ""; }; - 36AB75C014BD0866005B8045 /* device_hfsraid_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_tiger_o.png; sourceTree = ""; }; - 36AB75C114BD0866005B8045 /* device_hfsraid_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_tiger.png; sourceTree = ""; }; - 36AB75C214BD0866005B8045 /* device_hfsraid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid.png; sourceTree = ""; }; - 36AB75C314BD0866005B8045 /* device_ntfs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs_o.png; sourceTree = ""; }; - 36AB75C414BD0866005B8045 /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; - 36AB75C514BD0866005B8045 /* device_openbsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o.png; sourceTree = ""; }; - 36AB75C614BD0866005B8045 /* device_openbsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd.png; sourceTree = ""; }; - 36AB75C714BD0866005B8045 /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; - 36AB75C814BD0866005B8045 /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; - 36AB75C914BD0866005B8045 /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; - 36AB75CA14BD0866005B8045 /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; - 36AB75CB14BD0866005B8045 /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; - 36AB75CC14BD0866005B8045 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; - 36AB75CD14BD0866005B8045 /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; - 36AB75CE14BD0866005B8045 /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; - 36AB75CF14BD0866005B8045 /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; - 36AB75D014BD0866005B8045 /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; - 36AB75D114BD0866005B8045 /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; - 36AB75D214BD0866005B8045 /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; - 36AB75D314BD0866005B8045 /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; - 36AB75D414BD0866005B8045 /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; - 36AB75D514BD0866005B8045 /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; - 36AB75D614BD0866005B8045 /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; - 36AB75D714BD0866005B8045 /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; - 36AB75D814BD0866005B8045 /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; - 36AB75D914BD0866005B8045 /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; - 36AB75DA14BD0866005B8045 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; - 36AB75DB14BD0866005B8045 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; - 36AB75DC14BD0866005B8045 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; - 36AB75DD14BD0866005B8045 /* thumb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb.png; sourceTree = ""; }; 36AB75E114BD091C005B8045 /* InstallLog.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = InstallLog.sh; sourceTree = ""; }; 36AB75E314BD0925005B8045 /* postinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = postinstall; sourceTree = ""; }; 36AB75E414BD092D005B8045 /* preinstall */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = preinstall; sourceTree = ""; }; @@ -1183,37 +1230,6 @@ B0056D8211F3868000754B65 /* APPLE_LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = APPLE_LICENSE; sourceTree = ""; }; B0056D8511F3868000754B65 /* Distribution */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Distribution; sourceTree = ""; }; B0056DB911F3868000754B65 /* smbios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = smbios.plist; sourceTree = ""; }; - B0056DBD11F3868000754B65 /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; - B0056DBE11F3868000754B65 /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; - B0056DBF11F3868000754B65 /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; - B0056DC011F3868000754B65 /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; - B0056DC111F3868000754B65 /* device_fat16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat16.png; sourceTree = ""; }; - B0056DC211F3868000754B65 /* device_fat32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat32.png; sourceTree = ""; }; - B0056DC311F3868000754B65 /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; - B0056DC411F3868000754B65 /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; - B0056DC511F3868000754B65 /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; - B0056DC611F3868000754B65 /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; - B0056DC711F3868000754B65 /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; - B0056DC811F3868000754B65 /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; - B0056DC911F3868000754B65 /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; - B0056DCA11F3868000754B65 /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; - B0056DCB11F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; - B0056DCC11F3868000754B65 /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; - B0056DCD11F3868000754B65 /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; - B0056DCE11F3868000754B65 /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; - B0056DCF11F3868000754B65 /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; - B0056DD011F3868000754B65 /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; - B0056DD111F3868000754B65 /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; - B0056DD211F3868000754B65 /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; - B0056DD311F3868000754B65 /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; - B0056DD411F3868000754B65 /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; - B0056DD511F3868000754B65 /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; - B0056DD611F3868000754B65 /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; - B0056DD711F3868000754B65 /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; - B0056DD811F3868000754B65 /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; - B0056DD911F3868000754B65 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; - B0056DDA11F3868000754B65 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; - B0056DDB11F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; B0056DFD11F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; B0056DFE11F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; B0056E0011F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; @@ -1283,7 +1299,7 @@ B4118C90153EFF3300C8D926 /* bg.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bg.po; sourceTree = ""; }; B4118C91153EFF3300C8D926 /* bs.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bs.po; sourceTree = ""; }; B4118C92153EFF3300C8D926 /* ca.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ca.po; sourceTree = ""; }; - B4118C93153EFF3300C8D926 /* chameleon.pot */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = chameleon.pot; sourceTree = ""; }; + B4118C93153EFF3300C8D926 /* chameleon.pot */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = chameleon.pot; sourceTree = ""; }; B4118C94153EFF3300C8D926 /* cs.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cs.po; sourceTree = ""; }; B4118C95153EFF3300C8D926 /* de.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = de.po; sourceTree = ""; }; B4118C96153EFF3300C8D926 /* el.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = el.po; sourceTree = ""; }; @@ -3352,37 +3368,37 @@ B0056DBC11F3868000754B65 /* bullet */ = { isa = PBXGroup; children = ( - B0056DBD11F3868000754B65 /* background.png */, - B0056DBE11F3868000754B65 /* boot.png */, - B0056DBF11F3868000754B65 /* device_cdrom.png */, - B0056DC011F3868000754B65 /* device_ext3.png */, - B0056DC111F3868000754B65 /* device_fat16.png */, - B0056DC211F3868000754B65 /* device_fat32.png */, - B0056DC311F3868000754B65 /* device_generic.png */, - B0056DC411F3868000754B65 /* device_hfsplus.png */, - B0056DC511F3868000754B65 /* device_ntfs.png */, - B0056DC611F3868000754B65 /* device_scroll_next.png */, - B0056DC711F3868000754B65 /* device_scroll_prev.png */, - B0056DC811F3868000754B65 /* device_selection.png */, - B0056DC911F3868000754B65 /* font_console.png */, - B0056DCA11F3868000754B65 /* font_small.png */, - B0056DCB11F3868000754B65 /* logo.png */, - B0056DCC11F3868000754B65 /* menu_boot.png */, - B0056DCD11F3868000754B65 /* menu_help.png */, - B0056DCE11F3868000754B65 /* menu_ignore_caches.png */, - B0056DCF11F3868000754B65 /* menu_ignore_caches_disabled.png */, - B0056DD011F3868000754B65 /* menu_memory_info.png */, - B0056DD111F3868000754B65 /* menu_selection.png */, - B0056DD211F3868000754B65 /* menu_single_user.png */, - B0056DD311F3868000754B65 /* menu_single_user_disabled.png */, - B0056DD411F3868000754B65 /* menu_verbose.png */, - B0056DD511F3868000754B65 /* menu_verbose_disabled.png */, - B0056DD611F3868000754B65 /* menu_video_info.png */, - B0056DD711F3868000754B65 /* progress_bar.png */, - B0056DD811F3868000754B65 /* progress_bar_background.png */, - B0056DD911F3868000754B65 /* text_scroll_next.png */, - B0056DDA11F3868000754B65 /* text_scroll_prev.png */, - B0056DDB11F3868000754B65 /* theme.plist */, + 364B195E1A029963009A30BA /* background.png */, + 364B195F1A029963009A30BA /* boot.png */, + 364B19601A029963009A30BA /* device_cdrom.png */, + 364B19611A029963009A30BA /* device_ext3.png */, + 364B19621A029963009A30BA /* device_fat16.png */, + 364B19631A029963009A30BA /* device_fat32.png */, + 364B19641A029963009A30BA /* device_generic.png */, + 364B19651A029963009A30BA /* device_hfsplus.png */, + 364B19661A029963009A30BA /* device_ntfs.png */, + 364B19671A029963009A30BA /* device_scroll_next.png */, + 364B19681A029963009A30BA /* device_scroll_prev.png */, + 364B19691A029963009A30BA /* device_selection.png */, + 364B196A1A029963009A30BA /* font_console.png */, + 364B196B1A029963009A30BA /* font_small.png */, + 364B196C1A029963009A30BA /* logo.png */, + 364B196D1A029963009A30BA /* menu_boot.png */, + 364B196E1A029963009A30BA /* menu_help.png */, + 364B196F1A029963009A30BA /* menu_ignore_caches_disabled.png */, + 364B19701A029963009A30BA /* menu_ignore_caches.png */, + 364B19711A029963009A30BA /* menu_memory_info.png */, + 364B19721A029963009A30BA /* menu_selection.png */, + 364B19731A029963009A30BA /* menu_single_user_disabled.png */, + 364B19741A029963009A30BA /* menu_single_user.png */, + 364B19751A029963009A30BA /* menu_verbose_disabled.png */, + 364B19761A029963009A30BA /* menu_verbose.png */, + 364B19771A029963009A30BA /* menu_video_info.png */, + 364B19781A029963009A30BA /* progress_bar_background.png */, + 364B19791A029963009A30BA /* progress_bar.png */, + 364B197A1A029963009A30BA /* text_scroll_next.png */, + 364B197B1A029963009A30BA /* text_scroll_prev.png */, + 364B197C1A029963009A30BA /* theme.plist */, ); path = bullet; sourceTree = ""; @@ -3390,67 +3406,83 @@ B0056DDC11F3868000754B65 /* default */ = { isa = PBXGroup; children = ( - 36AB75A114BD0866005B8045 /* background.png */, - 36AB75A214BD0866005B8045 /* boot.png */, - 36AB75A314BD0866005B8045 /* device_befs_o.png */, - 36AB75A414BD0866005B8045 /* device_befs.png */, - 36AB75A514BD0866005B8045 /* device_cdrom_o.png */, - 36AB75A614BD0866005B8045 /* device_cdrom.png */, - 36AB75A714BD0866005B8045 /* device_ext3_o.png */, - 36AB75A814BD0866005B8045 /* device_ext3.png */, - 36AB75A914BD0866005B8045 /* device_fat_o.png */, - 36AB75AA14BD0866005B8045 /* device_fat.png */, - 36AB75AB14BD0866005B8045 /* device_freebsd_o.png */, - 36AB75AC14BD0866005B8045 /* device_freebsd.png */, - 36AB75AD14BD0866005B8045 /* device_generic_o.png */, - 36AB75AE14BD0866005B8045 /* device_generic.png */, - 36AB75AF14BD0866005B8045 /* device_hfsplus_leo_o.png */, - 36AB75B014BD0866005B8045 /* device_hfsplus_leo.png */, - 36AB75B114BD0866005B8045 /* device_hfsplus_lion_o.png */, - 36AB75B214BD0866005B8045 /* device_hfsplus_lion.png */, - 36AB75B314BD0866005B8045 /* device_hfsplus_o.png */, - 36AB75B414BD0866005B8045 /* device_hfsplus_sl_o.png */, - 36AB75B514BD0866005B8045 /* device_hfsplus_sl.png */, - 36AB75B614BD0866005B8045 /* device_hfsplus_tiger_o.png */, - 36AB75B714BD0866005B8045 /* device_hfsplus_tiger.png */, - 36AB75B814BD0866005B8045 /* device_hfsplus.png */, - 36AB75B914BD0866005B8045 /* device_hfsraid_leo_o.png */, - 36AB75BA14BD0866005B8045 /* device_hfsraid_leo.png */, - 36AB75BB14BD0866005B8045 /* device_hfsraid_lion_o.png */, - 36AB75BC14BD0866005B8045 /* device_hfsraid_lion.png */, - 36AB75BD14BD0866005B8045 /* device_hfsraid_o.png */, - 36AB75BE14BD0866005B8045 /* device_hfsraid_sl_o.png */, - 36AB75BF14BD0866005B8045 /* device_hfsraid_sl.png */, - 36AB75C014BD0866005B8045 /* device_hfsraid_tiger_o.png */, - 36AB75C114BD0866005B8045 /* device_hfsraid_tiger.png */, - 36AB75C214BD0866005B8045 /* device_hfsraid.png */, - 36AB75C314BD0866005B8045 /* device_ntfs_o.png */, - 36AB75C414BD0866005B8045 /* device_ntfs.png */, - 36AB75C514BD0866005B8045 /* device_openbsd_o.png */, - 36AB75C614BD0866005B8045 /* device_openbsd.png */, - 36AB75C714BD0866005B8045 /* device_scroll_next.png */, - 36AB75C814BD0866005B8045 /* device_scroll_prev.png */, - 36AB75C914BD0866005B8045 /* device_selection.png */, - 36AB75CA14BD0866005B8045 /* font_console.png */, - 36AB75CB14BD0866005B8045 /* font_small.png */, - 36AB75CC14BD0866005B8045 /* logo.png */, - 36AB75CD14BD0866005B8045 /* menu_boot.png */, - 36AB75CE14BD0866005B8045 /* menu_help.png */, - 36AB75CF14BD0866005B8045 /* menu_ignore_caches_disabled.png */, - 36AB75D014BD0866005B8045 /* menu_ignore_caches.png */, - 36AB75D114BD0866005B8045 /* menu_memory_info.png */, - 36AB75D214BD0866005B8045 /* menu_selection.png */, - 36AB75D314BD0866005B8045 /* menu_single_user_disabled.png */, - 36AB75D414BD0866005B8045 /* menu_single_user.png */, - 36AB75D514BD0866005B8045 /* menu_verbose_disabled.png */, - 36AB75D614BD0866005B8045 /* menu_verbose.png */, - 36AB75D714BD0866005B8045 /* menu_video_info.png */, - 36AB75D814BD0866005B8045 /* progress_bar_background.png */, - 36AB75D914BD0866005B8045 /* progress_bar.png */, - 36AB75DA14BD0866005B8045 /* text_scroll_next.png */, - 36AB75DB14BD0866005B8045 /* text_scroll_prev.png */, - 36AB75DC14BD0866005B8045 /* theme.plist */, - 36AB75DD14BD0866005B8045 /* thumb.png */, + 364B197D1A02997C009A30BA /* background.png */, + 364B197E1A02997C009A30BA /* boot.png */, + 364B197F1A02997C009A30BA /* device_befs_o.png */, + 364B19801A02997C009A30BA /* device_befs.png */, + 364B19811A02997C009A30BA /* device_cdrom_o.png */, + 364B19821A02997C009A30BA /* device_cdrom.png */, + 364B19831A02997C009A30BA /* device_ext3_o.png */, + 364B19841A02997C009A30BA /* device_ext3.png */, + 364B19851A02997C009A30BA /* device_fat_o.png */, + 364B19861A02997C009A30BA /* device_fat.png */, + 364B19871A02997C009A30BA /* device_freebsd_o.png */, + 364B19881A02997C009A30BA /* device_freebsd.png */, + 364B19891A02997C009A30BA /* device_generic_o.png */, + 364B198A1A02997C009A30BA /* device_generic.png */, + 364B198B1A02997C009A30BA /* device_hfsfusion_mav_o.png */, + 364B198C1A02997C009A30BA /* device_hfsfusion_mav.png */, + 364B198D1A02997C009A30BA /* device_hfsplus_leo_o.png */, + 364B198E1A02997C009A30BA /* device_hfsplus_leo.png */, + 364B198F1A02997C009A30BA /* device_hfsplus_lion_o.png */, + 364B19901A02997C009A30BA /* device_hfsplus_lion.png */, + 364B19911A02997C009A30BA /* device_hfsplus_mav_o.png */, + 364B19921A02997C009A30BA /* device_hfsplus_mav.png */, + 364B19931A02997C009A30BA /* device_hfsplus_ml_o.png */, + 364B19941A02997C009A30BA /* device_hfsplus_ml.png */, + 364B19951A02997C009A30BA /* device_hfsplus_o.png */, + 364B19961A02997C009A30BA /* device_hfsplus_recovery_o.png */, + 364B19971A02997C009A30BA /* device_hfsplus_recovery.png */, + 364B19981A02997C009A30BA /* device_hfsplus_sl_o.png */, + 364B19991A02997C009A30BA /* device_hfsplus_sl.png */, + 364B199A1A02997C009A30BA /* device_hfsplus_tiger_o.png */, + 364B199B1A02997C009A30BA /* device_hfsplus_tiger.png */, + 364B199C1A02997C009A30BA /* device_hfsplus_yos_o.png */, + 364B199D1A02997C009A30BA /* device_hfsplus_yos.png */, + 364B199E1A02997C009A30BA /* device_hfsplus.png */, + 364B199F1A02997C009A30BA /* device_hfsraid_leo_o.png */, + 364B19A01A02997C009A30BA /* device_hfsraid_leo.png */, + 364B19A11A02997C009A30BA /* device_hfsraid_lion_o.png */, + 364B19A21A02997C009A30BA /* device_hfsraid_lion.png */, + 364B19A31A02997C009A30BA /* device_hfsraid_mav_o.png */, + 364B19A41A02997C009A30BA /* device_hfsraid_mav.png */, + 364B19A51A02997C009A30BA /* device_hfsraid_ml_o.png */, + 364B19A61A02997C009A30BA /* device_hfsraid_ml.png */, + 364B19A71A02997C009A30BA /* device_hfsraid_o.png */, + 364B19A81A02997C009A30BA /* device_hfsraid_sl_o.png */, + 364B19A91A02997C009A30BA /* device_hfsraid_sl.png */, + 364B19AA1A02997C009A30BA /* device_hfsraid_tiger_o.png */, + 364B19AB1A02997C009A30BA /* device_hfsraid_tiger.png */, + 364B19AC1A02997C009A30BA /* device_hfsraid_yos_o.png */, + 364B19AD1A02997C009A30BA /* device_hfsraid_yos.png */, + 364B19AE1A02997C009A30BA /* device_hfsraid.png */, + 364B19AF1A02997C009A30BA /* device_ntfs_o.png */, + 364B19B01A02997C009A30BA /* device_ntfs.png */, + 364B19B11A02997C009A30BA /* device_openbsd_o.png */, + 364B19B21A02997C009A30BA /* device_openbsd.png */, + 364B19B31A02997C009A30BA /* device_scroll_next.png */, + 364B19B41A02997C009A30BA /* device_scroll_prev.png */, + 364B19B51A02997C009A30BA /* device_selection.png */, + 364B19B61A02997C009A30BA /* font_console.png */, + 364B19B71A02997C009A30BA /* font_small.png */, + 364B19B81A02997C009A30BA /* logo.png */, + 364B19B91A02997C009A30BA /* menu_boot.png */, + 364B19BA1A02997C009A30BA /* menu_help.png */, + 364B19BB1A02997C009A30BA /* menu_ignore_caches_disabled.png */, + 364B19BC1A02997C009A30BA /* menu_ignore_caches.png */, + 364B19BD1A02997C009A30BA /* menu_memory_info.png */, + 364B19BE1A02997C009A30BA /* menu_selection.png */, + 364B19BF1A02997C009A30BA /* menu_single_user_disabled.png */, + 364B19C01A02997C009A30BA /* menu_single_user.png */, + 364B19C11A02997C009A30BA /* menu_verbose_disabled.png */, + 364B19C21A02997C009A30BA /* menu_verbose.png */, + 364B19C31A02997C009A30BA /* menu_video_info.png */, + 364B19C41A02997C009A30BA /* progress_bar_background.png */, + 364B19C51A02997C009A30BA /* progress_bar.png */, + 364B19C61A02997C009A30BA /* text_scroll_next.png */, + 364B19C71A02997C009A30BA /* text_scroll_prev.png */, + 364B19C81A02997C009A30BA /* theme.plist */, + 364B19C91A02997C009A30BA /* thumb.png */, ); path = default; sourceTree = ""; @@ -3731,7 +3763,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0610; }; buildConfigurationList = 1DEB919308733D9F0010E9CD /* Build configuration list for PBXProject "Chameleon" */; compatibilityVersion = "Xcode 3.2"; @@ -3813,7 +3845,6 @@ 1DEB919408733D9F0010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; @@ -3824,7 +3855,6 @@ 1DEB919508733D9F0010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; SDKROOT = macosx; Index: trunk/i386/libsaio/vbe.c =================================================================== --- trunk/i386/libsaio/vbe.c (revision 2455) +++ trunk/i386/libsaio/vbe.c (revision 2456) @@ -33,6 +33,8 @@ static biosBuf_t bb; +#if UNUSED + //============================================================================== #if UNUSED static inline void @@ -69,6 +71,8 @@ #endif /* UNUSED */ //============================================================================== +#endif /* UNUSED */ + int getVBEInfo( void * infoBlock ) { bb.intno = 0x10; Index: trunk/i386/libsaio/hfs.c =================================================================== --- trunk/i386/libsaio/hfs.c (revision 2455) +++ trunk/i386/libsaio/hfs.c (revision 2456) @@ -423,8 +423,7 @@ } -long -HFSGetFileBlock(CICell ih, char *filePath, unsigned long long *firstBlock) +long HFSGetFileBlock(CICell ih, char *filePath, unsigned long long *firstBlock) { char entry[512]; long dirID, result, flags; @@ -909,7 +908,7 @@ // Find the extent for the offset. for (; ; nextExtent++) { if (nextExtent < extentDensity) { - if ((countedBlocks+GetExtentSize(extent, nextExtent)-1)ExtendedChecksum); } - if (version) { + if (version) + { /* XXX aserebln why uint32 cast if pointer is uint64 ? */ acpi20_p = (uint64_t)(uint32_t)rsdp_mod; addConfigurationTable(&gEfiAcpi20TableGuid, &acpi20_p, "ACPI_20"); - } else { + } + else + { /* XXX aserebln why uint32 cast if pointer is uint64 ? */ acpi10_p = (uint64_t)(uint32_t)rsdp_mod; addConfigurationTable(&gEfiAcpiTableGuid, &acpi10_p, "ACPI"); Index: trunk/i386/libsaio/bootargs.h =================================================================== --- trunk/i386/libsaio/bootargs.h (revision 2455) +++ trunk/i386/libsaio/bootargs.h (revision 2456) @@ -96,6 +96,18 @@ #define GRAPHICS_MODE 1 #define FB_TEXT_MODE 2 + +/* Struct describing an image passed in by the booter */ +struct boot_icon_element { + unsigned int width; + unsigned int height; + int y_offset_from_center; + unsigned int data_size; + unsigned int __reserved1[4]; + unsigned char data[0]; +}; +typedef struct boot_icon_element boot_icon_element; + /* Boot argument structure - passed into Mach kernel at boot time. * "Revision" can be incremented for compatible changes */ @@ -115,6 +127,11 @@ #define kBootArgsEfiMode32 32 #define kBootArgsEfiMode64 64 +/* Bitfields for boot_args->flags */ +#define kBootArgsFlagRebootOnPanic (1 << 0) +#define kBootArgsFlagHiDPI (1 << 1) +#define kBootArgsFlagBlack (1 << 2) + typedef struct boot_args { uint16_t Revision; /* Revision of boot_args structure */ uint16_t Version; /* Version of boot_args structure */ @@ -142,15 +159,15 @@ uint32_t efiRuntimeServicesPageCount; uint64_t efiRuntimeServicesVirtualPageStart; /* virtual address of defragmented runtime pages */ - uint32_t efiSystemTable; /* physical address of system table in runtime area */ - uint32_t kslide; // uint32_t __reserved2; + uint32_t efiSystemTable; /* physical address of system table in runtime area */ + uint32_t kslide; // uint32_t __reserved2; - uint32_t performanceDataStart; /* physical address of log */ + uint32_t performanceDataStart; /* physical address of log */ uint32_t performanceDataSize; - uint32_t keyStoreDataStart; /* physical address of key store data */ + uint32_t keyStoreDataStart; /* physical address of key store data */ uint32_t keyStoreDataSize; - uint64_t bootMemStart; + uint64_t bootMemStart; /* physical address of interpreter boot memory */ uint64_t bootMemSize; uint64_t PhysicalMemorySize; uint64_t FSBFrequency; Index: trunk/i386/libsaio/gma.c =================================================================== --- trunk/i386/libsaio/gma.c (revision 2455) +++ trunk/i386/libsaio/gma.c (revision 2456) @@ -549,66 +549,66 @@ case GMA_IVYBRIDGE_S_GT4: // 0172 case GMA_IVYBRIDGE_S_GT5: // 0176 - if (getValueForKey(kAAPLCustomIG, &value, &len, &bootInfo->chameleonConfig) && len == AAPL_LEN_IVY * 2) - { - uint8_t new_aapl0[AAPL_LEN_IVY]; - - if (hex2bin(value, new_aapl0, AAPL_LEN_IVY) == 0) - { - memcpy(default_aapl_ivy, new_aapl0, AAPL_LEN_IVY); - - verbose("Using user supplied AAPL,ig-platform-id\n"); - verbose("AAPL,ig-platform-id: %02x%02x%02x%02x\n", - default_aapl_ivy[0], default_aapl_ivy[1], default_aapl_ivy[2], default_aapl_ivy[3]); - } - devprop_add_value(device, "AAPL,ig-platform-id", default_aapl_ivy, AAPL_LEN_IVY); - } - else if (getIntForKey(kIntelCapriFB, &n_igs, &bootInfo->chameleonConfig)) - { - if ((n_igs >= 0) || (n_igs <= 11)) - { - verbose("AAPL,ig-platform-id was set in org.chameleon.Boot.plist with value %d\n", n_igs); - devprop_add_value(device, "AAPL,ig-platform-id", ivy_bridge_ig_vals[n_igs], 4); - } - else - { - verbose("AAPL,ig-platform-id was set in org.chameleon.Boot.plist with bad value please choose a number between 0 and 11.\n"); - } - } - else - { - uint32_t ig_platform_id; - uint32_t ram = (((getVBEVideoRam() + 512) / 1024) + 512) / 1024; - switch (ram) - { - case 96: - ig_platform_id = 0x01660000; // 96mb Mobile - break; + if (getValueForKey(kAAPLCustomIG, &value, &len, &bootInfo->chameleonConfig) && len == AAPL_LEN_IVY * 2) + { + uint8_t new_aapl0[AAPL_LEN_IVY]; - case 64: - ig_platform_id = 0x01660009; // 64mb Mobile - break; + if (hex2bin(value, new_aapl0, AAPL_LEN_IVY) == 0) + { + memcpy(default_aapl_ivy, new_aapl0, AAPL_LEN_IVY); - case 32: - ig_platform_id = 0x01620005; // 32mb Desktop - break; + verbose("Using user supplied AAPL,ig-platform-id\n"); + verbose("AAPL,ig-platform-id: %02x%02x%02x%02x\n", + default_aapl_ivy[0], default_aapl_ivy[1], default_aapl_ivy[2], default_aapl_ivy[3]); + } + devprop_add_value(device, "AAPL,ig-platform-id", default_aapl_ivy, AAPL_LEN_IVY); + } + else if (getIntForKey(kIntelCapriFB, &n_igs, &bootInfo->chameleonConfig)) + { + if ((n_igs >= 0) || (n_igs <= 11)) + { + verbose("AAPL,ig-platform-id was set in org.chameleon.Boot.plist with value %d\n", n_igs); + devprop_add_value(device, "AAPL,ig-platform-id", ivy_bridge_ig_vals[n_igs], 4); + } + else + { + verbose("AAPL,ig-platform-id was set in org.chameleon.Boot.plist with bad value please choose a number between 0 and 11.\n"); + } + } + else + { + uint32_t ig_platform_id; + uint32_t ram = (((getVBEVideoRam() + 512) / 1024) + 512) / 1024; + switch (ram) + { + case 96: + ig_platform_id = 0x01660000; // 96mb Mobile + break; - default: - printf("Please specify 96, 64, or 32MB RAM for the HD4000 in the bios.\n" - "The selected %dMB RAM configuration is not supported for the HD4000.\n", ram); - pause(); - return false; // Exit early before the AAPL,ig-platform-id property is set. - break; - } - devprop_add_value(device, "AAPL,ig-platform-id", (uint8_t *)&ig_platform_id, 4); - } + case 64: + ig_platform_id = 0x01660009; // 64mb Mobile + break; - devprop_add_value(device, "AAPL00,DualLink", HD4000_vals[10], 4); - devprop_add_value(device, "built-in", &BuiltIn, 1); - devprop_add_value(device, "class-code", ClassFix, 4); - devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10); - break; + case 32: + ig_platform_id = 0x01620005; // 32mb Desktop + break; + default: + printf("Please specify 96, 64, or 32MB RAM for the HD4000 in the bios.\n" + "The selected %dMB RAM configuration is not supported for the HD4000.\n", ram); + pause(); + return false; // Exit early before the AAPL,ig-platform-id property is set. + break; + } + devprop_add_value(device, "AAPL,ig-platform-id", (uint8_t *)&ig_platform_id, 4); + } + + devprop_add_value(device, "AAPL00,DualLink", HD4000_vals[10], 4); + devprop_add_value(device, "built-in", &BuiltIn, 1); + devprop_add_value(device, "class-code", ClassFix, 4); + devprop_add_value(device, "hda-gfx", (uint8_t *)"onboard-1", 10); + break; + /* Haswell */ /* HD Graphics 5000, HD Graphics 5000 Mobile, HD Graphics P5000, HD Graphics 4600, HD Graphics 4600 Mobile */ //case 0x80860090: Index: trunk/i386/libsaio/device_inject.c =================================================================== --- trunk/i386/libsaio/device_inject.c (revision 2455) +++ trunk/i386/libsaio/device_inject.c (revision 2456) @@ -271,11 +271,13 @@ while(i < string->numentries) { - if (!(i < DEV_PROP_DEVICE_MAX_ENTRIES)) { + if (!(i < DEV_PROP_DEVICE_MAX_ENTRIES)) + { break; } - if(!len) { + if(!len) + { break; } @@ -294,7 +296,8 @@ len -= 24; for(x = 0;x < string->entries[i]->num_pci_devpaths; x++) { - if(!len) { + if(!len) + { break; } snprintf(buffer, len, "%02x%02x%04x%02x%02x", string->entries[i]->pci_dev_path[x].type, @@ -306,7 +309,8 @@ len -= 12; } - if(!len) { + if(!len) + { break; } @@ -319,7 +323,8 @@ uint8_t *dataptr = string->entries[i]->data; for(x = 0; (uint32_t)x < (string->entries[i]->length) - (24 + (6 * string->entries[i]->num_pci_devpaths)) ; x++) { - if(!len) { + if(!len) + { break; } snprintf(buffer, len, "%02x", *dataptr++); Index: trunk/i386/libsaio/hda.c =================================================================== --- trunk/i386/libsaio/hda.c (revision 2455) +++ trunk/i386/libsaio/hda.c (revision 2456) @@ -92,30 +92,30 @@ static hda_controller_devices know_hda_controller[] = { //8086 Intel Corporation - { HDA_INTEL_HASWELL, "Haswell-ULT" }, - { HDA_INTEL_HASWELL2, "Haswell" }, - { HDA_INTEL_CRYSTAL, "Crystal Well" }, - { HDA_INTEL_CPT, "6 Series/C200 Series Chipset Family" }, - { HDA_INTEL_PATSBURG,"C600/X79 series chipset" }, - { HDA_INTEL_PPT1, "7 Series/C210 Series Chipset Family" }, - { HDA_INTEL_82801F, "82801FB/FBM/FR/FW/FRW (ICH6 Family)" }, - { HDA_INTEL_63XXESB, "631x/631xESB/632xESB" }, - { HDA_INTEL_82801G, "NM10/ICH7 Family" }, - { HDA_INTEL_82801H, "82801H (ICH8 Family)" }, - { HDA_INTEL_82801I, "82801I (ICH9 Family)" }, - { HDA_INTEL_82801JI, "82801JI (ICH10 Family)" }, - { HDA_INTEL_82801JD, "82801JD/DO (ICH10 Family) " }, - { HDA_INTEL_PCH, "5 Series/3400 Series" }, - { HDA_INTEL_PCH2, "5 Series/3400 Series" }, - { HDA_INTEL_SCH, "System Controller Hub (SCH Poulsbo)" }, - { HDA_INTEL_SCH2, "Wildcat Point" }, - { HDA_INTEL_LPT1, "Wellsburg" }, - { HDA_INTEL_LPT2, "Wellsburg" }, - { HDA_INTEL_LYNX, "Lynx Point" }, - { HDA_INTEL_LYNX2, "Lynx Point" }, + { HDA_INTEL_HASWELL, "Haswell-ULT" }, + { HDA_INTEL_HASWELL2, "Haswell" }, + { HDA_INTEL_CRYSTAL, "Crystal Well" }, + { HDA_INTEL_CPT, "6 Series/C200 Series Chipset Family" }, + { HDA_INTEL_PATSBURG, "C600/X79 series chipset" }, + { HDA_INTEL_PPT1, "7 Series/C210 Series Chipset Family" }, + { HDA_INTEL_82801F, "82801FB/FBM/FR/FW/FRW (ICH6 Family)" }, + { HDA_INTEL_63XXESB, "631x/631xESB/632xESB" }, + { HDA_INTEL_82801G, "NM10/ICH7 Family" }, + { HDA_INTEL_82801H, "82801H (ICH8 Family)" }, + { HDA_INTEL_82801I, "82801I (ICH9 Family)" }, + { HDA_INTEL_82801JI, "82801JI (ICH10 Family)" }, + { HDA_INTEL_82801JD, "82801JD/DO (ICH10 Family) " }, + { HDA_INTEL_PCH, "5 Series/3400 Series" }, + { HDA_INTEL_PCH2, "5 Series/3400 Series" }, + { HDA_INTEL_SCH, "System Controller Hub (SCH Poulsbo)" }, + { HDA_INTEL_SCH2, "Wildcat Point" }, + { HDA_INTEL_LPT1, "Wellsburg" }, + { HDA_INTEL_LPT2, "Wellsburg" }, + { HDA_INTEL_LYNX, "Lynx Point" }, + { HDA_INTEL_LYNX2, "Lynx Point" }, //10de NVIDIA Corporation - { HDA_NVIDIA_MCP51, "MCP51" }, - { HDA_NVIDIA_MCP55, "MCP55" }, + { HDA_NVIDIA_MCP51, "MCP51" }, + { HDA_NVIDIA_MCP55, "MCP55" }, { HDA_NVIDIA_MCP61_1, "MCP61" }, { HDA_NVIDIA_MCP61_2, "MCP61" }, { HDA_NVIDIA_MCP65_1, "MCP65" }, @@ -487,7 +487,8 @@ int i; /* Get format for vendor ID */ - switch (controller_vendor_id) { + switch (controller_vendor_id) + { case ATI_VENDORID: name_format = "ATI %s HDA Controller (HDMi)"; break; @@ -513,8 +514,10 @@ break; } - for (i = 0; i < HDAC_DEVICES_LEN; i++) { - if (know_hda_controller[i].model == controller_model) { + for (i = 0; i < HDAC_DEVICES_LEN; i++) + { + if (know_hda_controller[i].model == controller_model) + { snprintf(desc, sizeof(desc), name_format, know_hda_controller[i].desc); return desc; } @@ -577,7 +580,8 @@ verbose("- AUDIO DEVICE INFO -\n"); verbose("--------------------------------\n"); - switch ((controller_device_id << 16) | controller_vendor_id) { + switch ((controller_device_id << 16) | controller_vendor_id) + { /*********************************************************************** * The above case are intended as for HDEF device at address 0x001B0000 @@ -607,7 +611,8 @@ if (getValueForKey(kHDEFLayoutID, &value, &len, &bootInfo->chameleonConfig) && len == HDEF_LEN * 2) { uint8_t new_HDEF_layout_id[HDEF_LEN]; - if (hex2bin(value, new_HDEF_layout_id, HDEF_LEN) == 0) { + if (hex2bin(value, new_HDEF_layout_id, HDEF_LEN) == 0) + { memcpy(default_HDEF_layout_id, new_HDEF_layout_id, HDEF_LEN); verbose("Using user supplied HDEF layout-id: 0x%02x, 0x%02x, 0x%02x, 0x%02x\n", default_HDEF_layout_id[0], default_HDEF_layout_id[1], default_HDEF_layout_id[2], default_HDEF_layout_id[3]); Index: trunk/i386/libsaio/nvidia.c =================================================================== --- trunk/i386/libsaio/nvidia.c (revision 2455) +++ trunk/i386/libsaio/nvidia.c (revision 2456) @@ -1566,7 +1566,13 @@ static int patch_nvidia_rom(uint8_t *rom) { - if (!rom || (rom[0] != 0x55 && rom[1] != 0xaa)) { + if (!rom) + { + printf("ROM not found\n"); + return PATCH_ROM_FAILED; + } + if (rom[0] != 0x55 && rom[1] != 0xaa) + { printf("False ROM signature: 0x%02x%02x\n", rom[0], rom[1]); return PATCH_ROM_FAILED; } @@ -1793,7 +1799,6 @@ for (i = 0; i < (sizeof(nvidia_card_exceptions) / sizeof(nvidia_card_exceptions[0])); i++) { if ((nvidia_card_exceptions[i].device == device_id) && (nvidia_card_exceptions[i].subdev == subsys_id)) { return nvidia_card_exceptions[i].name; - break; } } } @@ -1968,7 +1973,6 @@ option_rom_pci_header_t *rom_pci_header; volatile uint8_t *regs; uint8_t *rom = NULL; - uint8_t *nvRom; uint8_t nvCardType = 0; unsigned long long videoRam = 0; uint32_t nvBiosOveride; @@ -2013,6 +2017,7 @@ return false; } } else { + uint8_t *nvRom; rom = malloc(NVIDIA_ROM_SIZE); // Otherwise read bios from card nvBiosOveride = 0; @@ -2020,6 +2025,7 @@ // PROM first // Enable PROM access (REG32(NV_PBUS_PCI_NV_20)) = NV_PBUS_PCI_NV_20_ROM_SHADOW_DISABLED; + nvRom = (uint8_t*)®s[NV_PROM_OFFSET]; // Valid Signature ? @@ -2055,7 +2061,7 @@ if ((nvPatch = patch_nvidia_rom(rom)) == PATCH_ROM_FAILED) { printf("ERROR: nVidia ROM Patching Failed!\n"); free(rom); - //return false; + return false; } rom_pci_header = (option_rom_pci_header_t*)(rom + *(uint16_t *)&rom[24]); Index: trunk/i386/libsaio/cpu.c =================================================================== --- trunk/i386/libsaio/cpu.c (revision 2455) +++ trunk/i386/libsaio/cpu.c (revision 2456) @@ -299,11 +299,11 @@ p->CPU.Vendor = p->CPU.CPUID[CPUID_0][1]; p->CPU.Signature = p->CPU.CPUID[CPUID_1][0]; - p->CPU.Stepping = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 3, 0); // stepping = cpu_feat_eax & 0xF; - p->CPU.Model = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 7, 4); // model = (cpu_feat_eax >> 4) & 0xF; - p->CPU.Family = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 11, 8); // family = (cpu_feat_eax >> 8) & 0xF; + p->CPU.Stepping = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 3, 0); // stepping = cpu_feat_eax & 0xF; + p->CPU.Model = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 7, 4); // model = (cpu_feat_eax >> 4) & 0xF; + p->CPU.Family = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 11, 8); // family = (cpu_feat_eax >> 8) & 0xF; //p->CPU.Type = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 13, 12); // type = (cpu_feat_eax >> 12) & 0x3; - p->CPU.ExtModel = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 19, 16); // ext_model = (cpu_feat_eax >> 16) & 0xF; + p->CPU.ExtModel = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 19, 16); // ext_model = (cpu_feat_eax >> 16) & 0xF; p->CPU.ExtFamily = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][0], 27, 20); // ext_family = (cpu_feat_eax >> 20) & 0xFF; p->CPU.Model += (p->CPU.ExtModel << 4); @@ -347,14 +347,16 @@ } // end switch } - if (p->CPU.NoCores == 0) { + if (p->CPU.NoCores == 0) + { p->CPU.NoCores = (uint8_t)(p->CPU.CoresPerPackage & 0xff); p->CPU.NoThreads = (uint8_t)(p->CPU.LogicalPerPackage & 0xff); } /* get BrandString (if supported) */ /* Copyright: from Apple's XNU cpuid.c */ - if (p->CPU.CPUID[CPUID_80][0] > 0x80000004) { + if (p->CPU.CPUID[CPUID_80][0] > 0x80000004) + { char *s; bzero(str, 128); /* @@ -367,14 +369,17 @@ memcpy(&str[16], (char *)reg, 16); do_cpuid(0x80000004, reg); memcpy(&str[32], (char *)reg, 16); - for (s = str; *s != '\0'; s++) { - if (*s != ' ') { break; } + for (s = str; *s != '\0'; s++) + { + if (*s != ' ') + { + break; + } } strlcpy(p->CPU.BrandString, s, 48); - if (!strncmp(p->CPU.BrandString, CPU_STRING_UNKNOWN, - MIN(sizeof(p->CPU.BrandString), - strlen(CPU_STRING_UNKNOWN) + 1))) { + if (!strncmp(p->CPU.BrandString, CPU_STRING_UNKNOWN, MIN(sizeof(p->CPU.BrandString), strlen(CPU_STRING_UNKNOWN) + 1))) + { /* * This string means we have a firmware-programmable brand string, * and the firmware couldn't figure out what sort of CPU we have. @@ -387,55 +392,77 @@ //workaround for N270. I don't know why it detected wrong // MSR is *NOT* available on the Intel Atom CPU - if ((p->CPU.Model == CPU_MODEL_ATOM) && (strstr(p->CPU.BrandString, "270"))) { + if ((p->CPU.Model == CPU_MODEL_ATOM) && (strstr(p->CPU.BrandString, "270"))) + { p->CPU.NoCores = 1; p->CPU.NoThreads = 2; } - if (p->CPU.Vendor == CPUID_VENDOR_AMD) { + if (p->CPU.Vendor == CPUID_VENDOR_AMD) + { p->CPU.NoThreads = (uint8_t)bitfield(p->CPU.CPUID[CPUID_1][1], 23, 16); p->CPU.NoCores = (uint8_t)bitfield(p->CPU.CPUID[CPUID_88][2], 7, 0) + 1; } /* setup features */ - if ((bit(23) & p->CPU.CPUID[CPUID_1][3]) != 0) { + if ((bit(23) & p->CPU.CPUID[CPUID_1][3]) != 0) + { p->CPU.Features |= CPU_FEATURE_MMX; } - if ((bit(25) & p->CPU.CPUID[CPUID_1][3]) != 0) { + + if ((bit(25) & p->CPU.CPUID[CPUID_1][3]) != 0) + { p->CPU.Features |= CPU_FEATURE_SSE; } - if ((bit(26) & p->CPU.CPUID[CPUID_1][3]) != 0) { + + if ((bit(26) & p->CPU.CPUID[CPUID_1][3]) != 0) + { p->CPU.Features |= CPU_FEATURE_SSE2; } - if ((bit(0) & p->CPU.CPUID[CPUID_1][2]) != 0) { + + if ((bit(0) & p->CPU.CPUID[CPUID_1][2]) != 0) + { p->CPU.Features |= CPU_FEATURE_SSE3; } - if ((bit(19) & p->CPU.CPUID[CPUID_1][2]) != 0) { + + if ((bit(19) & p->CPU.CPUID[CPUID_1][2]) != 0) + { p->CPU.Features |= CPU_FEATURE_SSE41; } - if ((bit(20) & p->CPU.CPUID[CPUID_1][2]) != 0) { + + if ((bit(20) & p->CPU.CPUID[CPUID_1][2]) != 0) + { p->CPU.Features |= CPU_FEATURE_SSE42; } - if ((bit(29) & p->CPU.CPUID[CPUID_81][3]) != 0) { + + if ((bit(29) & p->CPU.CPUID[CPUID_81][3]) != 0) + { p->CPU.Features |= CPU_FEATURE_EM64T; } - if ((bit(5) & p->CPU.CPUID[CPUID_1][3]) != 0) { + + if ((bit(5) & p->CPU.CPUID[CPUID_1][3]) != 0) + { p->CPU.Features |= CPU_FEATURE_MSR; } + //if ((bit(28) & p->CPU.CPUID[CPUID_1][3]) != 0) { - if (p->CPU.NoThreads > p->CPU.NoCores) { + + if (p->CPU.NoThreads > p->CPU.NoCores) + { p->CPU.Features |= CPU_FEATURE_HTT; } tscFrequency = measure_tsc_frequency(); DBG("cpu freq classic = 0x%016llx\n", tscFrequency); /* if usual method failed */ - if ( tscFrequency < 1000 ) { //TEST + if ( tscFrequency < 1000 ) //TEST + { tscFrequency = timeRDTSC() * 20;//measure_tsc_frequency(); // DBG("cpu freq timeRDTSC = 0x%016llx\n", tscFrequency); } else { // DBG("cpu freq timeRDTSC = 0x%016llxn", timeRDTSC() * 20); } + fsbFrequency = 0; cpuFrequency = 0; @@ -468,7 +495,8 @@ bus_ratio_min = bitfield(msr, 47, 40); //valv: not sure about this one (Remarq.1) msr = rdmsr64(MSR_FLEX_RATIO); DBG("msr(%d): flex_ratio %08x\n", __LINE__, bitfield(msr, 31, 0)); - if (bitfield(msr, 16, 16)) { + if (bitfield(msr, 16, 16)) + { flex_ratio = bitfield(msr, 15, 8); /* bcc9: at least on the gigabyte h67ma-ud2h, where the cpu multipler can't be changed to @@ -478,48 +506,65 @@ causing the system to crash since tscGranularity is inadvertently set to 0. */ - if (flex_ratio == 0) { + if (flex_ratio == 0) + { /* Clear bit 16 (evidently the presence bit) */ wrmsr64(MSR_FLEX_RATIO, (msr & 0xFFFFFFFFFFFEFFFFULL)); msr = rdmsr64(MSR_FLEX_RATIO); DBG("Unusable flex ratio detected. Patched MSR now %08x\n", bitfield(msr, 31, 0)); - } else { - if (bus_ratio_max > flex_ratio) { + } + else + { + if (bus_ratio_max > flex_ratio) + { bus_ratio_max = flex_ratio; } } } - if (bus_ratio_max) { + if (bus_ratio_max) + { fsbFrequency = (tscFrequency / bus_ratio_max); } + //valv: Turbo Ratio Limit - if ((intelCPU != 0x2e) && (intelCPU != 0x2f)) { + if ((intelCPU != 0x2e) && (intelCPU != 0x2f)) + { msr = rdmsr64(MSR_TURBO_RATIO_LIMIT); cpuFrequency = bus_ratio_max * fsbFrequency; max_ratio = bus_ratio_max * 10; - } else { + } + else + { cpuFrequency = tscFrequency; } - if ((getValueForKey(kbusratio, &newratio, &len, &bootInfo->chameleonConfig)) && (len <= 4)) { + if ((getValueForKey(kbusratio, &newratio, &len, &bootInfo->chameleonConfig)) && (len <= 4)) + { max_ratio = atoi(newratio); max_ratio = (max_ratio * 10); - if (len >= 3) { + if (len >= 3) + { max_ratio = (max_ratio + 5); } verbose("Bus-Ratio: min=%d, max=%s\n", bus_ratio_min, newratio); // extreme overclockers may love 320 ;) - if ((max_ratio >= min_ratio) && (max_ratio <= 320)) { + if ((max_ratio >= min_ratio) && (max_ratio <= 320)) + { cpuFrequency = (fsbFrequency * max_ratio) / 10; - if (len >= 3) { + if (len >= 3) + { maxdiv = 1; - } else { + } + else + { maxdiv = 0; } - } else { + } + else + { max_ratio = (bus_ratio_max * 10); } } @@ -544,37 +589,53 @@ currdiv = bitfield(msr, 14, 14); // This will always be model >= 3 - if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0e) || (p->CPU.Family == 0x0f)) { + if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0e) || (p->CPU.Family == 0x0f)) + { /* On these models, maxcoef defines TSC freq */ maxcoef = bitfield(msr, 44, 40); - } else { + } + else + { /* On lower models, currcoef defines TSC freq */ /* XXX */ maxcoef = currcoef; } - if (maxcoef) { - if (maxdiv) { + if (maxcoef) + { + if (maxdiv) + { fsbFrequency = ((tscFrequency * 2) / ((maxcoef * 2) + 1)); - } else { + } + else + { fsbFrequency = (tscFrequency / maxcoef); } - if (currdiv) { + + if (currdiv) + { cpuFrequency = (fsbFrequency * ((currcoef * 2) + 1) / 2); - } else { + } + else + { cpuFrequency = (fsbFrequency * currcoef); } + DBG("max: %d%s current: %d%s\n", maxcoef, maxdiv ? ".5" : "",currcoef, currdiv ? ".5" : ""); } break; } } /* Mobile CPU */ - if (rdmsr64(MSR_IA32_PLATFORM_ID) & (1<<28)) { + if (rdmsr64(MSR_IA32_PLATFORM_ID) & (1<<28)) + { p->CPU.Features |= CPU_FEATURE_MOBILE; } - } else if ((p->CPU.Vendor == CPUID_VENDOR_AMD) && (p->CPU.Family == 0x0f)) { - switch(p->CPU.ExtFamily) { + } + else if ((p->CPU.Vendor == CPUID_VENDOR_AMD) && (p->CPU.Family == 0x0f)) + { + switch(p->CPU.ExtFamily) + { case 0x00: /* K8 */ msr = rdmsr64(K8_FIDVID_STATUS); maxcoef = bitfield(msr, 21, 16) / 2 + 4; @@ -585,7 +646,8 @@ msr = rdmsr64(K10_COFVID_STATUS); do_cpuid2(0x00000006, 0, p->CPU.CPUID[CPUID_6]); // EffFreq: effective frequency interface - if (bitfield(p->CPU.CPUID[CPUID_6][2], 0, 0) == 1) { + if (bitfield(p->CPU.CPUID[CPUID_6][2], 0, 0) == 1) + { //uint64_t mperf = measure_mperf_frequency(); uint64_t aperf = measure_aperf_frequency(); cpuFrequency = aperf; @@ -611,31 +673,47 @@ break; } - if (maxcoef) { - if (currdiv) { - if (!currcoef) { + if (maxcoef) + { + if (currdiv) + { + if (!currcoef) + { currcoef = maxcoef; } - if (!cpuFrequency) { + if (!cpuFrequency) + { fsbFrequency = ((tscFrequency * currdiv) / currcoef); - } else { + } + else + { fsbFrequency = ((cpuFrequency * currdiv) / currcoef); } DBG("%d.%d\n", currcoef / currdiv, ((currcoef % currdiv) * 100) / currdiv); - } else { - if (!cpuFrequency) { + } + else + { + if (!cpuFrequency) + { fsbFrequency = (tscFrequency / maxcoef); - } else { + } + else + { fsbFrequency = (cpuFrequency / maxcoef); } DBG("%d\n", currcoef); } - } else if (currcoef) { - if (currdiv) { + } + else if (currcoef) + { + if (currdiv) + { fsbFrequency = ((tscFrequency * currdiv) / currcoef); DBG("%d.%d\n", currcoef / currdiv, ((currcoef % currdiv) * 100) / currdiv); - } else { + } + else + { fsbFrequency = (tscFrequency / currcoef); DBG("%d\n", currcoef); } @@ -665,7 +743,7 @@ // keep formatted with spaces instead of tabs DBG("\n---------------------------------------------\n"); - DBG("--------------- CPU INFO ---------------\n"); + DBG("------------------ CPU INFO -----------------\n"); DBG("---------------------------------------------\n"); DBG("Brand String: %s\n", p->CPU.BrandString); // Processor name (BIOS) DBG("Vendor: 0x%x\n", p->CPU.Vendor); // Vendor ex: GenuineIntel Index: trunk/i386/libsaio/disk.c =================================================================== --- trunk/i386/libsaio/disk.c (revision 2455) +++ trunk/i386/libsaio/disk.c (revision 2456) @@ -747,10 +747,12 @@ // Probe the filesystem. - if ( initFunc ) { + if ( initFunc ) + { bvr->flags |= kBVFlagNativeBoot; - if ( probe && initFunc( bvr ) != 0 ) { + if ( probe && initFunc( bvr ) != 0 ) + { // filesystem probe failed. DEBUG_DISK(("%s: failed probe on dev %x part %d\n", __FUNCTION__, biosdev, partno)); @@ -758,17 +760,23 @@ (*bvr->bv_free)(bvr); bvr = NULL; } - if ( readBootSector( biosdev, blkoff, (void *)0x7e00 ) == 0 ) { + if ( readBootSector( biosdev, blkoff, (void *)0x7e00 ) == 0 ) + { bvr->flags |= kBVFlagBootable; } - } else if ( readBootSector( biosdev, blkoff, (void *)0x7e00 ) == 0 ) { + } + else if ( readBootSector( biosdev, blkoff, (void *)0x7e00 ) == 0 ) + { bvr->flags |= kBVFlagForeignBoot; - } else { + } + else + { (*bvr->bv_free)(bvr); bvr = NULL; } } - if (bvr) { + if (bvr) + { bvr->flags |= bvrFlags; } return bvr; @@ -1565,23 +1573,27 @@ { bool valid = false; config_file_t systemVersion; - char dirSpec[512]; + char dirSpec[512]; sprintf(dirSpec, "hd(%d,%d)/System/Library/CoreServices/SystemVersion.plist", BIOS_DEV_UNIT(bvr), bvr->part_no); - - if (!loadConfigFile(dirSpec, &systemVersion)) { + + if (!loadConfigFile(dirSpec, &systemVersion)) + { valid = true; - } else { + } + else + { sprintf(dirSpec, "hd(%d,%d)/System/Library/CoreServices/ServerVersion.plist", BIOS_DEV_UNIT(bvr), bvr->part_no); if (!loadConfigFile(dirSpec, &systemVersion)) - { + { bvr->OSisServer = true; valid = true; } } - - if (valid) { + + if (valid) + { const char *val; int len; @@ -1591,12 +1603,17 @@ // so copy it and trim *str = '\0'; // crazybirdy - if (len > 4 && (val[3] == '1')) { + if (len > 4 && (val[3] == '1')) + { strncat(str, val, MIN(len, 5)); - } else { + } + else + { strncat(str, val, MIN(len, 4)); } - } else { + } + else + { valid = false; } } @@ -1613,7 +1630,9 @@ bvr->OSisInstaller = true; strcpy(bvr->OSVersion, "10.7"); // 10.7 + close(fh); - } else { + } + else + { close(fh); } } @@ -1655,7 +1674,8 @@ close(fh); - if (!error) { + if (!error) + { label[fileSize] = '\0'; strcpy(bvr->altlabel, label); } @@ -1664,8 +1684,10 @@ // Check for SystemVersion.plist or ServerVersion.plist to determine if a volume hosts an installed system. - if (bvr->flags & kBVFlagNativeBoot) { - if (getOSVersion(bvr,bvr->OSVersion) == true) { + if (bvr->flags & kBVFlagNativeBoot) + { + if (getOSVersion(bvr,bvr->OSVersion) == true) + { bvr->flags |= kBVFlagSystemVolume; } } Index: trunk/i386/libsaio/smbios.c =================================================================== --- trunk/i386/libsaio/smbios.c (revision 2455) +++ trunk/i386/libsaio/smbios.c (revision 2456) @@ -705,7 +705,6 @@ case CPU_MODEL_SANDYBRIDGE: // Intel Core i3, i5, i7 LGA1155 (32nm) case CPU_MODEL_IVYBRIDGE: // Intel Core i3, i5, i7 LGA1155 (22nm) - case CPU_MODEL_IVYBRIDGE_XEON: defaultBIOSInfo.version = kDefaultiMacSandyBIOSVersion; defaultBIOSInfo.releaseDate = kDefaultiMacSandyBIOSReleaseDate; defaultSystemInfo.productName = kDefaultiMacSandy; @@ -730,6 +729,7 @@ case CPU_MODEL_WESTMERE: // Intel Core i7, Xeon X56xx, Xeon E56xx, Xeon W36xx LGA1366 (32nm) 6 Core case CPU_MODEL_WESTMERE_EX: // Intel Xeon E7 case CPU_MODEL_JAKETOWN: // Intel Core i7, Xeon E5 LGA2011 (32nm) + case CPU_MODEL_IVYBRIDGE_XEON: // Intel Core i7, Xeon E5 v2 LGA2011 (22nm) defaultBIOSInfo.version = kDefaultMacProWestmereBIOSVersion; defaultBIOSInfo.releaseDate = kDefaultMacProWestmereBIOSReleaseDate; defaultSystemInfo.productName = kDefaultMacProWestmere; Index: trunk/i386/libsaio/stringTable.c =================================================================== --- trunk/i386/libsaio/stringTable.c (revision 2455) +++ trunk/i386/libsaio/stringTable.c (revision 2456) @@ -592,7 +592,8 @@ { int fd, count; - if ((fd = open_bvdev("bt(0,0)", configFile, 0)) < 0) { + if ((fd = open_bvdev("bt(0,0)", configFile, 0)) < 0) + { return -1; } // read file @@ -619,8 +620,10 @@ int i, fd, count, ret=-1; - for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) { - if ((fd = open(dirspec[i], 0)) >= 0) { + for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) + { + if ((fd = open(dirspec[i], 0)) >= 0) + { // read file count = read(fd, config->plist, IO_CONFIG_DATA_SIZE); close(fd); @@ -656,22 +659,30 @@ int i; - for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) { - if ( loadChameleonConfigForDevice(config, "rd(0,0)", dirspec[i]) == 0 ) { + for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) + { + if ( loadChameleonConfigForDevice(config, "rd(0,0)", dirspec[i]) == 0 ) + { return 0; } - if ( loadChameleonConfigForDevice(config, "", dirspec[i]) == 0 ) { + + if ( loadChameleonConfigForDevice(config, "", dirspec[i]) == 0 ) + { return 0; } - if ( loadChameleonConfigForDevice(config, "bt(0,0)", dirspec[i]) == 0 ) { + + if ( loadChameleonConfigForDevice(config, "bt(0,0)", dirspec[i]) == 0 ) + { return 0; } BVRef bvr; - for ( bvr = chain; bvr; bvr = bvr->next ) { /* C99 Error */ + for ( bvr = chain; bvr; bvr = bvr->next ) /* C99 Error */ + { char device[256]; getDeviceDescription(bvr, device); - if ( loadChameleonConfigForDevice(config, device, dirspec[i]) == 0 ) { + if ( loadChameleonConfigForDevice(config, device, dirspec[i]) == 0 ) + { return 0; } } @@ -691,7 +702,8 @@ snprintf(full_path, sizeof(full_path), "%s%s", device, path); - if ((fd = open(full_path, 0)) >= 0) { + if ((fd = open(full_path, 0)) >= 0) + { // Check for depreciated file names and annoy the user about it. if(strstr(full_path, "com.apple.Boot.plist")) { printf("%s is depreciated.\n", full_path); @@ -726,8 +738,10 @@ int i, fd, count, ret=-1; - for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) { - if ((fd = open(dirspec[i], 0)) >= 0) { + for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) + { + if ((fd = open(dirspec[i], 0)) >= 0) + { // read file count = read(fd, config->plist, IO_CONFIG_DATA_SIZE); close(fd); @@ -744,9 +758,12 @@ char * newString(const char * oldString) { - if ( oldString ) { + if ( oldString ) + { return strcpy(malloc(strlen(oldString)+1), oldString); - } else { + } + else + { return NULL; } } @@ -764,14 +781,16 @@ *val = '\0'; // Scan for the next non-whitespace character. - while ( *ptr && (*ptr == ' ' || *ptr == '=') ) { + while ( *ptr && (*ptr == ' ' || *ptr == '=') ) + { ptr++; } strStart = ptr; // Skip the leading double quote character. - if (*ptr == '\"') { + if (*ptr == '\"') + { isQuoted = true; ptr++; strStart++; Index: trunk/i386/libsaio/smbios_getters.c =================================================================== --- trunk/i386/libsaio/smbios_getters.c (revision 2455) +++ trunk/i386/libsaio/smbios_getters.c (revision 2456) @@ -64,8 +64,10 @@ bool getSMBOemProcessorBusSpeed(returnType *value) { - if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) { // Intel - switch (Platform.CPU.Family) { + if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel + { + switch (Platform.CPU.Family) + { case 0x06: { switch (Platform.CPU.Model) { Index: trunk/i386/boot2/picopng.c =================================================================== --- trunk/i386/boot2/picopng.c (revision 2455) +++ trunk/i386/boot2/picopng.c (revision 2456) @@ -935,12 +935,14 @@ vector8_resize(out, numpixels * 4); uint8_t *out_data = out->size ? out->data : 0; if (bitDepth == 8 && colorType == 0) // greyscale - for (i = 0; i < numpixels; i++) { + for (i = 0; i < numpixels; i++) + { out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[i]; out_data[4 * i + 3] = (info->key_defined && (in[i] == info->key_r)) ? 0 : 255; } else if (bitDepth == 8 && colorType == 2) // RGB color - for (i = 0; i < numpixels; i++) { + for (i = 0; i < numpixels; i++) + { for (c = 0; c < 3; c++) out_data[4 * i + c] = in[3 * i + c]; out_data[4 * i + 3] = (info->key_defined && (in[3 * i + 0] == info->key_r) && Index: trunk/i386/boot2/drivers.c =================================================================== --- trunk/i386/boot2/drivers.c (revision 2455) +++ trunk/i386/boot2/drivers.c (revision 2456) @@ -74,14 +74,14 @@ #define kDriverPackageSignature2 'MOSX' struct DriversPackage { - unsigned long signature1; - unsigned long signature2; - unsigned long length; - unsigned long adler32; - unsigned long version; - unsigned long numDrivers; - unsigned long reserved1; - unsigned long reserved2; + unsigned long signature1; + unsigned long signature2; + unsigned long length; + unsigned long adler32; + unsigned long version; + unsigned long numDrivers; + unsigned long reserved1; + unsigned long reserved2; }; typedef struct DriversPackage DriversPackage; @@ -103,8 +103,8 @@ static long MatchPersonalities(void); static long MatchLibraries(void); #ifdef NOTDEF -static ModulePtr FindModule(char *name); -static void ThinFatFile(void **loadAddrP, unsigned long *lengthP); + static ModulePtr FindModule(char *name); + static void ThinFatFile(void **loadAddrP, unsigned long *lengthP); #endif static long ParseXML(char *buffer, ModulePtr *module, TagPtr *personalities); static long InitDriverSupport(void); @@ -146,12 +146,10 @@ return result; } - //========================================================================== // InitDriverSupport -static long -InitDriverSupport( void ) +static long InitDriverSupport( void ) { gExtensionsSpec = malloc( 4096 ); gDriverSpec = malloc( 4096 ); @@ -173,7 +171,8 @@ { char dirSpecExtra[1024]; - if ( InitDriverSupport() != 0 ) { + if ( InitDriverSupport() != 0 ) + { return 0; } @@ -202,11 +201,13 @@ // Next try to load Extra extensions from the selected root partition. strcpy(dirSpecExtra, "/Extra/"); - if (FileLoadDrivers(dirSpecExtra, 0) != 0) { + if (FileLoadDrivers(dirSpecExtra, 0) != 0) + { // If failed, then try to load Extra extensions from the boot partition // in case we have a separate booter partition or a bt(0,0) aliased ramdisk. if ( !(gBIOSBootVolume->biosdev == gBootVolume->biosdev && gBIOSBootVolume->part_no == gBootVolume->part_no) - || (gRAMDiskVolume && gRAMDiskBTAliased) ) { + || (gRAMDiskVolume && gRAMDiskBTAliased) ) + { // Next try a specfic OS version folder ie 10.5 sprintf(dirSpecExtra, "bt(0,0)/Extra/%s/", &gMacOSVersion); if (FileLoadDrivers(dirSpecExtra, 0) != 0) { @@ -216,7 +217,8 @@ } } } - if(!gHaveKernelCache) { + if(!gHaveKernelCache) + { // Don't load main driver (from /System/Library/Extentions) if gHaveKernelCache is set. // since these drivers will already be in the kernel cache. // NOTE: when gHaveKernelCache, xnu cannot (by default) load *any* extra kexts from the bootloader. @@ -234,9 +236,11 @@ } } - if (gMKextName[0] != '\0') { + if (gMKextName[0] != '\0') + { verbose("LoadDrivers: Loading from [%s]\n", gMKextName); - if ( LoadDriverMKext(gMKextName) != 0 ) { + if ( LoadDriverMKext(gMKextName) != 0 ) + { error("Could not load %s\n", gMKextName); return -1; } @@ -255,7 +259,9 @@ } } - } else { + } + else + { return 0; } @@ -271,8 +277,7 @@ //========================================================================== // FileLoadMKext -static long -FileLoadMKext( const char * dirSpec, const char * extDirSpec ) +static long FileLoadMKext( const char * dirSpec, const char * extDirSpec ) { long ret, flags, time, time2; char altDirSpec[512]; @@ -291,7 +296,8 @@ snprintf(gDriverSpec, sizeof(altDirSpec) + 18, "%sExtensions.mkext", altDirSpec); verbose("LoadDrivers: Loading from [%s]\n", gDriverSpec); - if (LoadDriverMKext(gDriverSpec) == 0) { + if (LoadDriverMKext(gDriverSpec) == 0) + { return 0; } } @@ -302,8 +308,7 @@ //========================================================================== // FileLoadDrivers -long -FileLoadDrivers( char * dirSpec, long plugin ) +long FileLoadDrivers( char * dirSpec, long plugin ) { long ret, length, flags, time, bundleType; long long index; @@ -318,7 +323,8 @@ } // Next try the legacy path. - else if (FileLoadMKext(dirSpec, "") == 0) { + else if (FileLoadMKext(dirSpec, "") == 0) + { return 0; } @@ -334,13 +340,15 @@ } // Make sure this is a directory. - if ((flags & kFileTypeMask) != kFileTypeDirectory) { + if ((flags & kFileTypeMask) != kFileTypeDirectory) + { continue; } // Make sure this is a kext. length = strlen(name); - if (strcmp(name + length - 5, ".kext")) { + if (strcmp(name + length - 5, ".kext")) + { continue; } @@ -350,23 +358,29 @@ // Determine the bundle type. snprintf(gTempSpec, 4096, "%s/%s", dirSpec, gFileName); ret = GetFileInfo(gTempSpec, "Contents", &flags, &time); - if (ret == 0) { + if (ret == 0) + { bundleType = kCFBundleType2; - } else { + } + else + { bundleType = kCFBundleType3; } - if (!plugin) { + if (!plugin) + { snprintf(gDriverSpec, 4096, "%s/%s/%sPlugIns", dirSpec, gFileName, (bundleType == kCFBundleType2) ? "Contents/" : ""); } ret = LoadDriverPList(dirSpec, gFileName, bundleType); - if (result != 0) { + if (result != 0) + { result = ret; } - if (!plugin) { + if (!plugin) + { FileLoadDrivers(gDriverSpec, 1); } } @@ -378,8 +392,7 @@ //========================================================================== // -long -NetLoadDrivers( char * dirSpec ) +long NetLoadDrivers( char * dirSpec ) { long tries; @@ -389,7 +402,8 @@ // Get the name of the kernel cnt = strlen(gBootFile); while (cnt--) { - if ((gBootFile[cnt] == '\\') || (gBootFile[cnt] == ',')) { + if ((gBootFile[cnt] == '\\') || (gBootFile[cnt] == ',')) + { cnt++; break; } @@ -404,11 +418,13 @@ tries = 3; while (tries--) { - if (LoadDriverMKext(gDriverSpec) == 0) { + if (LoadDriverMKext(gDriverSpec) == 0) + { break; } } - if (tries == -1) { + if (tries == -1) + { return -1; } @@ -418,8 +434,7 @@ //========================================================================== // loadDriverMKext -long -LoadDriverMKext( char * fileSpec ) +long LoadDriverMKext( char * fileSpec ) { unsigned long driversAddr, driversLength; long length; @@ -430,7 +445,8 @@ // Load the MKext. length = LoadThinFatFile(fileSpec, (void **)&package); - if (length < sizeof (DriversPackage)) { + if (length < sizeof (DriversPackage)) + { return -1; } Index: trunk/i386/boot2/boot.c =================================================================== --- trunk/i386/boot2/boot.c (revision 2455) +++ trunk/i386/boot2/boot.c (revision 2456) @@ -148,7 +148,9 @@ (int *)&bootArgs->ksize ); if ( ret != 0 ) + { return ret; + } // Reserve space for boot args reserveKernBootStruct(); @@ -160,7 +162,9 @@ // Load boot drivers from the specifed root path. //if (!gHaveKernelCache) - LoadDrivers("/"); + { + LoadDrivers("/"); + } execute_hook("DriversLoaded", (void*)binary, NULL, NULL, NULL); @@ -249,7 +253,8 @@ long flags, time, cachetime, kerneltime, exttime, ret=-1; unsigned long adler32; - if((gBootMode & kBootModeSafe) != 0) { + if((gBootMode & kBootModeSafe) != 0) + { DBG("Kernel Cache ignored.\n"); return -1; } @@ -259,7 +264,9 @@ { strlcpy(kernelCacheFile, cacheFile, sizeof(kernelCacheFile)); verbose("Specified kernel cache file path = %s\n", cacheFile); - } else { + } + else + { // Leopard prelink kernel cache file if (TIGER || LEOPARD) { @@ -271,7 +278,8 @@ verbose("Reseted kernel cache file path = %s\n", kernelCacheFile); } // Snow Leopard prelink kernel cache file - else if ( SNOW_LEOPARD ) { + else if ( SNOW_LEOPARD ) + { snprintf(kernelCacheFile, sizeof(kernelCacheFile), "kernelcache_%s", (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64"); @@ -282,10 +290,13 @@ struct dirstuff* cacheDir = opendir(kDefaultCachePathSnow); /* TODO: handle error? */ - if (cacheDir) { - while(readdir(cacheDir, (const char**)&name, &flags, &time) >= 0) { + if (cacheDir) + { + while(readdir(cacheDir, (const char**)&name, &flags, &time) >= 0) + { if (((flags & kFileTypeMask) != kFileTypeDirectory) && time > prev_time - && strstr(name, kernelCacheFile) && (name[lnam] != '.')) { + && strstr(name, kernelCacheFile) && (name[lnam] != '.')) + { snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%s%s", kDefaultCachePathSnow, name); prev_time = time; } @@ -572,20 +583,26 @@ updateVRAM(); } - if (platformCPUFeature(CPU_FEATURE_EM64T)) { + if (platformCPUFeature(CPU_FEATURE_EM64T)) + { archCpuType = CPU_TYPE_X86_64; - } else { + } + else + { archCpuType = CPU_TYPE_I386; } - if (getValueForKey(karch, &val, &len, &bootInfo->chameleonConfig)) { - if (strncmp(val, "i386", 4) == 0) { + if (getValueForKey(karch, &val, &len, &bootInfo->chameleonConfig)) + { + if (strncmp(val, "i386", 4) == 0) + { archCpuType = CPU_TYPE_I386; } } if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) { - if (strncmp(val, "i386", 4) == 0) { + if (strncmp(val, "i386", 4) == 0) + { archCpuType = CPU_TYPE_I386; } } @@ -593,10 +610,13 @@ // Notify modules that we are attempting to boot execute_hook("PreBoot", NULL, NULL, NULL, NULL); - if (!getBoolForKey (kWake, &tryresume, &bootInfo->chameleonConfig)) { + if (!getBoolForKey (kWake, &tryresume, &bootInfo->chameleonConfig)) + { tryresume = true; tryresumedefault = true; - } else { + } + else + { tryresumedefault = false; } @@ -604,12 +624,14 @@ forceresume = false; } - if (forceresume) { + if (forceresume) + { tryresume = true; tryresumedefault = false; } - while (tryresume) { + while (tryresume) + { const char *tmp; BVRef bvr; if (!getValueForKey(kWakeImage, &val, &len, &bootInfo->chameleonConfig)) @@ -628,7 +650,8 @@ if ((ret != 0) || ((flags & kFileTypeMask) != kFileTypeFlat)) break; - if (!forceresume && ((sleeptime+3)modTime)) { + if (!forceresume && ((sleeptime+3)modTime)) + { #if DEBUG printf ("Hibernate image is too old by %d seconds. Use ForceWake=y to override\n", bvr->modTime-sleeptime); @@ -652,16 +675,20 @@ } /* FIXME: check len vs sizeof(kernelCacheFile) */ strlcpy(kernelCacheFile, val, len + 1); - } else { + } + else + { kernelCacheFile[0] = 0; // Use default kernel cache file } - if (gOverrideKernel && kernelCacheFile[0] == 0) { + if (gOverrideKernel && kernelCacheFile[0] == 0) + { DBG("Using a non default kernel (%s) without specifying 'Kernel Cache' path, KernelCache will not be used\n", bootInfo->bootFile); useKernelCache = false; break; } - if (gMKextName[0] != 0) { + if (gMKextName[0] != 0) + { DBG("Using a specific MKext Cache (%s), KernelCache will not be used\n", gMKextName); useKernelCache = false; @@ -673,10 +700,13 @@ } while(0); do { - if (useKernelCache) { + if (useKernelCache) + { ret = LoadKernelCache(kernelCacheFile, &binary); if (ret >= 0) + { break; + } } bool bootFileWithDevice = false; @@ -694,19 +724,24 @@ //printf(HEADER " (%s).\n", bootInfo->bootFile); snprintf(bootFile, sizeof(bootFile), "/%s", bootInfo->bootFile); // append a leading / //sleep(1); - } else { + } + else + { //printf(HEADER " (%s).\n", bootInfo->bootFile); snprintf(bootFile, sizeof(bootFile), kDefaultKernelPathForYos"%s", bootInfo->bootFile); // Yosemite //sleep(1); } - } else { + } + else + { strlcpy(bootFile, bootInfo->bootFile, sizeof(bootFile)); } // Try to load kernel image from alternate locations on boot helper partitions. ret = -1; - if ((gBootVolume->flags & kBVFlagBooter) && !bootFileWithDevice) { + if ((gBootVolume->flags & kBVFlagBooter) && !bootFileWithDevice) + { snprintf(bootFilePath, sizeof(bootFilePath), "com.apple.boot.P%s", bootFile); ret = GetFileInfo(NULL, bootFilePath, &flags, &time); if (ret == -1) @@ -720,7 +755,8 @@ } } } - if (ret == -1) { + if (ret == -1) + { // No alternate location found, using the original kernel image path. strlcpy(bootFilePath, bootFile, sizeof(bootFilePath)); } @@ -754,21 +790,26 @@ } pause(); - } else { + } + else + { /* Won't return if successful. */ ret = ExecKernel(binary); } } // chainboot - if (status == 1) { + if (status == 1) + { // if we are already in graphics-mode, - if (getVideoMode() == GRAPHICS_MODE) { + if (getVideoMode() == GRAPHICS_MODE) + { setVideoMode(VGA_TEXT_MODE, 0); // switch back to text mode. } } - if ((gBootFileType == kNetworkDeviceType) && gUnloadPXEOnExit) { + if ((gBootFileType == kNetworkDeviceType) && gUnloadPXEOnExit) + { nbpUnloadBaseCode(); } } @@ -800,7 +841,9 @@ return ((gMacOSVersion[0] == version[0]) && (gMacOSVersion[1] == version[1]) && (gMacOSVersion[2] == version[2]) && (gMacOSVersion[3] == version[3]) && (gMacOSVersion[4] == version[4])); - } else { + } + else + { return ((gMacOSVersion[0] == version[0]) && (gMacOSVersion[1] == version[1]) && (gMacOSVersion[2] == version[2]) && (gMacOSVersion[3] == version[3])); } Index: trunk/i386/boot2/gui.c =================================================================== --- trunk/i386/boot2/gui.c (revision 2455) +++ trunk/i386/boot2/gui.c (revision 2456) @@ -75,6 +75,10 @@ iDeviceHFSRAID_Leo_o, iDeviceHFSRAID_Tiger, iDeviceHFSRAID_Tiger_o, + + iDeviceHFSRECOVERY, + iDeviceHFSRECOVERY_o, + iDeviceEXT3, iDeviceEXT3_o, iDeviceFreeBSD, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ @@ -161,6 +165,10 @@ {.name = "device_hfsraid_leo_o", .image = NULL}, {.name = "device_hfsraid_tiger", .image = NULL}, {.name = "device_hfsraid_tiger_o", .image = NULL}, + + {.name = "device_hfsplus_recovery", .image = NULL}, + {.name = "device_hfsplus_recovery_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 */ @@ -397,6 +405,10 @@ LOADPNG(device_hfsraid_leo_o, iDeviceHFSRAID_Leo); LOADPNG(device_hfsraid_tiger, iDeviceHFSRAID); LOADPNG(device_hfsraid_tiger_o, iDeviceHFSRAID_Tiger); + + LOADPNG(device_hfsplus_recovery, iDeviceHFS); + LOADPNG(device_hfsplus_recovery_o, iDeviceHFSRECOVERY); + LOADPNG(device_ext3, iDeviceGeneric); LOADPNG(device_ext3_o, iDeviceEXT3); LOADPNG(device_freebsd, iDeviceGeneric); /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ @@ -976,39 +988,51 @@ { case kPartitionTypeHFS: { - // 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; - case '7': - devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_Lion : iDeviceHFS_Lion); - break; - case '6': - devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_SL : iDeviceHFS_SL); - break; - case '5': - devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_Leo : iDeviceHFS_Leo); - break; - case '4': - devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_Tiger : iDeviceHFS_Tiger); - break; - case '1': - if (device->OSVersion[4] == '0') { // 10.10 - devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_yos : iDeviceHFS_yos); + + // ErmaC : TODO test needed for recovery icon + + // Use HFSRECOVERY icon. +// if (device->flags & kBVFlagBooter) +// { +// devicetype = iDeviceHFSRECOVERY; +// } +// else +// { + + // 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; - } - //if (device->OSVersion[4] == '1') { // 10.11 - // devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_??? : iDeviceHFS_???); - // break; - //} - default: - devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS); - break; - } + case '8': + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_ML : iDeviceHFS_ML); + break; + case '7': + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_Lion : iDeviceHFS_Lion); + break; + case '6': + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_SL : iDeviceHFS_SL); + break; + case '5': + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_Leo : iDeviceHFS_Leo); + break; + case '4': + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_Tiger : iDeviceHFS_Tiger); + break; + case '1': + if (device->OSVersion[4] == '0') { // 10.10 + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_yos : iDeviceHFS_yos); + break; + } + //if (device->OSVersion[4] == '1') { // 10.11 + // devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_??? : iDeviceHFS_???); + // break; + //} + default: + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS); + break; + } +// } break; Index: trunk/i386/modules/MakeInc.dir =================================================================== --- trunk/i386/modules/MakeInc.dir (revision 2455) +++ trunk/i386/modules/MakeInc.dir (revision 2456) @@ -126,7 +126,7 @@ @ld -arch i386 \ -alias _$(MODULE_START) start \ -dylib -read_only_relocs suppress \ - -S -x -Z -dead_strip_dylibs \ + -S -Z -dead_strip_dylibs \ -no_uuid \ -current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \ -final_output $(MODULE_NAME) \ Index: trunk/i386/modules/klibc/strndup.c =================================================================== --- trunk/i386/modules/klibc/strndup.c (revision 2455) +++ trunk/i386/modules/klibc/strndup.c (revision 2456) @@ -10,7 +10,9 @@ char *d = malloc(l); if (d) + { memcpy(d, s, l); - d[n] = '\0'; + d[n] = '\0'; + } return d; } Index: trunk/i386/modules/klibc/Cconfig =================================================================== --- trunk/i386/modules/klibc/Cconfig (revision 2455) +++ trunk/i386/modules/klibc/Cconfig (revision 2456) @@ -4,7 +4,7 @@ config KLIBC_MODULE tristate "klibc Module" - default n + default m ---help--- Say Y here if you want to enable the use of this module. Index: trunk/i386/util/bdmesg.c =================================================================== --- trunk/i386/util/bdmesg.c (revision 2455) +++ trunk/i386/util/bdmesg.c (revision 2456) @@ -20,7 +20,9 @@ root = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/"); if (root) + { bootLog = IORegistryEntryCreateCFProperty(root, CFSTR("boot-log"), kCFAllocatorDefault, 0); + } if (!bootLog) { @@ -28,7 +30,9 @@ root = IORegistryEntryFromPath(kIOMasterPortDefault, "IODeviceTree:/efi/platform"); if (root) + { bootLog = IORegistryEntryCreateCFProperty(root, CFSTR("boot-log"), kCFAllocatorDefault, 0); + } } if (!bootLog) @@ -40,7 +44,11 @@ const UInt8 *msglog = CFDataGetBytePtr((CFDataRef)bootLog); if (msglog) + { printf("%s\n", msglog); + } + CFRelease(bootLog); + return 0; } Index: trunk/package/OptionalSettings/PowerManagement.txt =================================================================== --- trunk/package/OptionalSettings/PowerManagement.txt (revision 2455) +++ trunk/package/OptionalSettings/PowerManagement.txt (revision 2456) @@ -30,5 +30,7 @@ Bool@EnableC2State:EnableC2State=Yes Bool@EnableC3State:EnableC3State=Yes Bool@EnableC4State:EnableC4State=Yes +#Bool@EnableC6State:EnableC6State=Yes +#Bool@EnableC7State:EnableC7State=Yes Bool@GenerateCStates:GenerateCStates=Yes Bool@GeneratePStates:GeneratePStates=Yes Index: trunk/package/Resources/templates/Localizable.strings =================================================================== --- trunk/package/Resources/templates/Localizable.strings (revision 2455) +++ trunk/package/Resources/templates/Localizable.strings (revision 2456) @@ -194,6 +194,9 @@ "EnableC6State_title" = "EnableC6State=Yes"; "EnableC6State_description" = "Enable specific Processor power state, C6."; +"EnableC7State_title" = "EnableC7State=Yes"; +"EnableC7State_description" = "Enable specific Processor power state, C7."; + "GenerateCStates_title" = "GenerateCStates=Yes"; "GenerateCStates_description" = "Enable auto generation of processor idle sleep states (C-States)."; Index: trunk/CHANGES =================================================================== --- trunk/CHANGES (revision 2455) +++ trunk/CHANGES (revision 2456) @@ -1,3 +1,11 @@ +- bitshoveler : Remove "-x" option from "ld" command which breaks build under newer Xcode versions (/i386/modules/MakeInc.dir) +- bitshoveler : Comment out some unused functions by expanding "#if UNUSED" conditional (stringTable.c) +- bitshoveler : Comment out unused static functions, which cause build to fail in "release" mode (vbe.c) +- bitshoveler : Fix null pointer handling (nvidia.c) +- bitshoveler : Only write terminating null char if malloc succeeded (strndup.c) +- bitshoveler : Fix memory leak (bdmesg.c) +- ErmaC : (re)enable klibc module +- ErmaC : Merge Recovery Icons(png) courtesy of blackosx - ErmaC : Merge Yosemite patch (ready from June 2014) Thanks all involved in the test and develop; Special thanks: Alex J, viv xix, zenith432 from http://forge.voodooprojects.org/p/chameleon/issues/375/ Testing and improvements: Pike R. Alpha, ErmaC, Bungo, blackosx, Micky1979, crazybirdy, oldnapalm, janek202, MinusZwei and Andy Vandijck. @@ -22,7 +30,7 @@ - meklort : Make compile on gcc w/ errors enabled. - bitshoveler : Remove the '-x' option from the offending 'ld' command - Jief : Makefile dependency missing for boot0 and boot1h -- ErmaC :Temp disable klibc module +- ErmaC : Temp disable klibc module - meklort : Silence output. - meklort : Add --no-print-directory. - meklort : Replace \t with tab.