Index: branches/cparm/TODO =================================================================== --- branches/cparm/TODO (revision 1898) +++ branches/cparm/TODO (revision 1899) @@ -6,7 +6,7 @@ - Implement a pool allocator, so each module will run and allocate memory in there own pool, de-alloc all allocated memory by the module, will be done simply by destroying the pool -- (re-)Implement a watchdog library set (clear the watchdog , can avoid infinite loop made for unknow reasons by the compiler or cpu reset) +- Try to sync our prf() with the apple/mach __doprnt() (in Xnu/osfmk/kern/printf.c) to normalize the formating in our printf, sprintf, etc ..., and facilitate bug fixes - Implement a Host like in bits to avoid some return issues Index: branches/cparm/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/cparm/Chameleon.xcodeproj/project.pbxproj (revision 1898) +++ branches/cparm/Chameleon.xcodeproj/project.pbxproj (revision 1899) @@ -8,6 +8,170 @@ /* Begin PBXFileReference section */ AB0E930C14C6223500F798D7 /* cpu_intel_amd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cpu_intel_amd.c; sourceTree = ""; }; + AB42D02115187F2C0078E84A /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; + AB42D02215187F2C0078E84A /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; + AB42D02315187F2C0078E84A /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; + AB42D02415187F2C0078E84A /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; + AB42D02515187F2C0078E84A /* device_fat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat.png; sourceTree = ""; }; + AB42D02615187F2C0078E84A /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; + AB42D02715187F2C0078E84A /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; + AB42D02815187F2C0078E84A /* device_hfsraid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid.png; sourceTree = ""; }; + AB42D02915187F2C0078E84A /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; + AB42D02A15187F2C0078E84A /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; + AB42D02B15187F2C0078E84A /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; + AB42D02C15187F2C0078E84A /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; + AB42D02D15187F2C0078E84A /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; + AB42D02E15187F2C0078E84A /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; + AB42D02F15187F2C0078E84A /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; + AB42D03015187F2C0078E84A /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; + AB42D03115187F2C0078E84A /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; + AB42D03215187F2C0078E84A /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; + AB42D03315187F2C0078E84A /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; + AB42D03415187F2C0078E84A /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; + AB42D03515187F2C0078E84A /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; + AB42D03615187F2C0078E84A /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; + AB42D03715187F2C0078E84A /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; + AB42D03815187F2C0078E84A /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; + AB42D03915187F2C0078E84A /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; + AB42D03A15187F2C0078E84A /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; + AB42D03B15187F2C0078E84A /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; + AB42D03C15187F2C0078E84A /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; + AB42D03D15187F2C0078E84A /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; + AB42D03E15187F2C0078E84A /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; + AB42D03F15187F2C0078E84A /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; + AB42D04115187F2C0078E84A /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; + AB42D04215187F2C0078E84A /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; + AB42D04315187F2C0078E84A /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; + AB42D04415187F2C0078E84A /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; + AB42D04515187F2C0078E84A /* device_fat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat.png; sourceTree = ""; }; + AB42D04615187F2C0078E84A /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; + AB42D04715187F2C0078E84A /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; + AB42D04815187F2C0078E84A /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; + AB42D04915187F2C0078E84A /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; + AB42D04A15187F2C0078E84A /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; + AB42D04B15187F2C0078E84A /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; + AB42D04C15187F2C0078E84A /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; + AB42D04D15187F2C0078E84A /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; + AB42D04E15187F2C0078E84A /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; + AB42D04F15187F2C0078E84A /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; + AB42D05015187F2C0078E84A /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; + AB42D05115187F2C0078E84A /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; + AB42D05215187F2C0078E84A /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; + AB42D05315187F2C0078E84A /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; + AB42D05415187F2C0078E84A /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; + AB42D05515187F2C0078E84A /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; + AB42D05615187F2C0078E84A /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; + AB42D05715187F2C0078E84A /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; + AB42D05815187F2C0078E84A /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; + AB42D05915187F2C0078E84A /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; + AB42D05A15187F2C0078E84A /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; + AB42D05B15187F2C0078E84A /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; + AB42D05C15187F2C0078E84A /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; + AB42D05D15187F2C0078E84A /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; + AB42D05E15187F2C0078E84A /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; + AB42D06115187F2C0078E84A /* device_befs_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_alt.png; sourceTree = ""; }; + AB42D06215187F2C0078E84A /* device_befs_o_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o_alt.png; sourceTree = ""; }; + AB42D06415187F2C0078E84A /* device_openbsd_ALT1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_ALT1.png; sourceTree = ""; }; + AB42D06515187F2C0078E84A /* device_openbsd_o_ALT1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o_ALT1.png; sourceTree = ""; }; + AB42D06715187F2C0078E84A /* device_befs_ALT1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_ALT1.png; sourceTree = ""; }; + AB42D06815187F2C0078E84A /* device_befs_ALT2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_ALT2.png; sourceTree = ""; }; + AB42D06915187F2C0078E84A /* device_befs_o_ALT1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o_ALT1.png; sourceTree = ""; }; + AB42D06A15187F2C0078E84A /* device_befs_o_ALT2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o_ALT2.png; sourceTree = ""; }; + AB42D06B15187F2C0078E84A /* device_freebsd_ALT1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_ALT1.png; sourceTree = ""; }; + AB42D06C15187F2C0078E84A /* device_freebsd_ALT2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_ALT2.png; sourceTree = ""; }; + AB42D06D15187F2C0078E84A /* device_freebsd_o_ALT1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_o_ALT1.png; sourceTree = ""; }; + AB42D06E15187F2C0078E84A /* device_freebsd_o_ALT2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_o_ALT2.png; sourceTree = ""; }; + AB42D06F15187F2C0078E84A /* device_openbsd_ALT1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_ALT1.png; sourceTree = ""; }; + AB42D07015187F2C0078E84A /* device_openbsd_ALT2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_ALT2.png; sourceTree = ""; }; + AB42D07115187F2C0078E84A /* device_openbsd_o_ALT1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o_ALT1.png; sourceTree = ""; }; + AB42D07215187F2C0078E84A /* device_openbsd_o_ALT2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o_ALT2.png; sourceTree = ""; }; + AB42D07415187F2C0078E84A /* device_hfsplus_lion_o_VLADSTUDIOS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_o_VLADSTUDIOS.png; sourceTree = ""; }; + AB42D07515187F2C0078E84A /* device_hfsplus_lion_VLADSTUDIOS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_VLADSTUDIOS.png; sourceTree = ""; }; + AB42D07615187F2C0078E84A /* device_hfsplus_sl_o_VLADSTUDIOS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_o_VLADSTUDIOS.png; sourceTree = ""; }; + AB42D07715187F2C0078E84A /* device_hfsplus_sl_VLADSTUDIOS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_VLADSTUDIOS.png; sourceTree = ""; }; + AB42D07815187F2C0078E84A /* device_hfsraid_lion_o_VLADSTUDIOS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion_o_VLADSTUDIOS.png; sourceTree = ""; }; + AB42D07915187F2C0078E84A /* device_hfsraid_lion_VLADSTUDIOS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion_VLADSTUDIOS.png; sourceTree = ""; }; + AB42D07A15187F2C0078E84A /* device_hfsraid_sl_o_VLADSTUDIOS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl_o_VLADSTUDIOS.png; sourceTree = ""; }; + AB42D07B15187F2C0078E84A /* device_hfsraid_sl_VLADSTUDIOS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl_VLADSTUDIOS.png; sourceTree = ""; }; + AB42D07D15187F2C0078E84A /* device_ext3_o_WALL_UBUNTU.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3_o_WALL_UBUNTU.png; sourceTree = ""; }; + AB42D07E15187F2C0078E84A /* device_ext3_WALL_UBUNTU.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3_WALL_UBUNTU.png; sourceTree = ""; }; + AB42D07F15187F2C0078E84A /* device_hfsplus_lion_o_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_o_WALL.png; sourceTree = ""; }; + AB42D08015187F2C0078E84A /* device_hfsplus_lion_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_WALL.png; sourceTree = ""; }; + AB42D08115187F2C0078E84A /* device_hfsplus_ml_o_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml_o_WALL.png; sourceTree = ""; }; + AB42D08215187F2C0078E84A /* device_hfsplus_ml_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml_WALL.png; sourceTree = ""; }; + AB42D08315187F2C0078E84A /* device_hfsplus_sl_o_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_o_WALL.png; sourceTree = ""; }; + AB42D08415187F2C0078E84A /* device_hfsplus_sl_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_WALL.png; sourceTree = ""; }; + AB42D08515187F2C0078E84A /* device_hfsraid_lion_o_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion_o_WALL.png; sourceTree = ""; }; + AB42D08615187F2C0078E84A /* device_hfsraid_lion_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_lion_WALL.png; sourceTree = ""; }; + AB42D08715187F2C0078E84A /* device_hfsraid_ml_o_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_o_WALL.png; sourceTree = ""; }; + AB42D08815187F2C0078E84A /* device_hfsraid_ml_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_WALL.png; sourceTree = ""; }; + AB42D08915187F2C0078E84A /* device_hfsraid_sl_o_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl_o_WALL.png; sourceTree = ""; }; + AB42D08A15187F2C0078E84A /* device_hfsraid_sl_WALL.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_sl_WALL.png; sourceTree = ""; }; + AB42D08B15187F2C0078E84A /* device_ntfs_o_WALL_WINDOWS7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs_o_WALL_WINDOWS7.png; sourceTree = ""; }; + AB42D08C15187F2C0078E84A /* device_ntfs_WALL_WINDOWS7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs_WALL_WINDOWS7.png; sourceTree = ""; }; + AB42D08D15187F2C0078E84A /* font_console_MONOSPACED.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console_MONOSPACED.png; sourceTree = ""; }; + AB42D08E15187F2C0078E84A /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; + AB42D08F15187F2C0078E84A /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; + AB42D09015187F2C0078E84A /* device_befs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs.png; sourceTree = ""; }; + AB42D09115187F2C0078E84A /* device_befs_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_alt.png; sourceTree = ""; }; + AB42D09215187F2C0078E84A /* device_befs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o.png; sourceTree = ""; }; + AB42D09315187F2C0078E84A /* device_befs_o_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_befs_o_alt.png; sourceTree = ""; }; + AB42D09415187F2C0078E84A /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; + AB42D09515187F2C0078E84A /* device_cdrom_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom_o.png; sourceTree = ""; }; + AB42D09615187F2C0078E84A /* device_ext3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3.png; sourceTree = ""; }; + AB42D09715187F2C0078E84A /* device_ext3_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ext3_o.png; sourceTree = ""; }; + AB42D09815187F2C0078E84A /* device_fat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat.png; sourceTree = ""; }; + AB42D09915187F2C0078E84A /* device_fat_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_fat_o.png; sourceTree = ""; }; + AB42D09A15187F2C0078E84A /* device_freebsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd.png; sourceTree = ""; }; + AB42D09B15187F2C0078E84A /* device_freebsd_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_alt.png; sourceTree = ""; }; + AB42D09C15187F2C0078E84A /* device_freebsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_o.png; sourceTree = ""; }; + AB42D09D15187F2C0078E84A /* device_freebsd_o_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_freebsd_o_alt.png; sourceTree = ""; }; + AB42D09E15187F2C0078E84A /* device_generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic.png; sourceTree = ""; }; + AB42D09F15187F2C0078E84A /* device_generic_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_generic_o.png; sourceTree = ""; }; + AB42D0A015187F2C0078E84A /* device_hfsplus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus.png; sourceTree = ""; }; + AB42D0A115187F2C0078E84A /* device_hfsplus_leo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo.png; sourceTree = ""; }; + AB42D0A215187F2C0078E84A /* device_hfsplus_leo_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_leo_o.png; sourceTree = ""; }; + AB42D0A315187F2C0078E84A /* device_hfsplus_lion.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion.png; sourceTree = ""; }; + AB42D0A415187F2C0078E84A /* device_hfsplus_lion_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_lion_o.png; sourceTree = ""; }; + AB42D0A515187F2C0078E84A /* device_hfsplus_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml.png; sourceTree = ""; }; + AB42D0A615187F2C0078E84A /* device_hfsplus_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_ml_o.png; sourceTree = ""; }; + AB42D0A715187F2C0078E84A /* device_hfsplus_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_o.png; sourceTree = ""; }; + AB42D0A815187F2C0078E84A /* device_hfsplus_sl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl.png; sourceTree = ""; }; + AB42D0A915187F2C0078E84A /* device_hfsplus_sl_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_sl_o.png; sourceTree = ""; }; + AB42D0AA15187F2C0078E84A /* device_hfsplus_tiger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger.png; sourceTree = ""; }; + AB42D0AB15187F2C0078E84A /* device_hfsplus_tiger_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsplus_tiger_o.png; sourceTree = ""; }; + AB42D0AC15187F2C0078E84A /* device_hfsraid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid.png; sourceTree = ""; }; + AB42D0AD15187F2C0078E84A /* device_hfsraid_ml.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml.png; sourceTree = ""; }; + AB42D0AE15187F2C0078E84A /* device_hfsraid_ml_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_ml_o.png; sourceTree = ""; }; + AB42D0AF15187F2C0078E84A /* device_hfsraid_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_hfsraid_o.png; sourceTree = ""; }; + AB42D0B015187F2C0078E84A /* device_ntfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs.png; sourceTree = ""; }; + AB42D0B115187F2C0078E84A /* device_ntfs_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_ntfs_o.png; sourceTree = ""; }; + AB42D0B215187F2C0078E84A /* device_openbsd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd.png; sourceTree = ""; }; + AB42D0B315187F2C0078E84A /* device_openbsd_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_alt.png; sourceTree = ""; }; + AB42D0B415187F2C0078E84A /* device_openbsd_o.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o.png; sourceTree = ""; }; + AB42D0B515187F2C0078E84A /* device_openbsd_o_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_openbsd_o_alt.png; sourceTree = ""; }; + AB42D0B615187F2C0078E84A /* device_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_next.png; sourceTree = ""; }; + AB42D0B715187F2C0078E84A /* device_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_scroll_prev.png; sourceTree = ""; }; + AB42D0B815187F2C0078E84A /* device_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_selection.png; sourceTree = ""; }; + AB42D0B915187F2C0078E84A /* font_console.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_console.png; sourceTree = ""; }; + AB42D0BA15187F2C0078E84A /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; + AB42D0BB15187F2C0078E84A /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; + AB42D0BC15187F2C0078E84A /* menu_boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_boot.png; sourceTree = ""; }; + AB42D0BD15187F2C0078E84A /* menu_help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_help.png; sourceTree = ""; }; + AB42D0BE15187F2C0078E84A /* menu_ignore_caches.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches.png; sourceTree = ""; }; + AB42D0BF15187F2C0078E84A /* menu_ignore_caches_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_ignore_caches_disabled.png; sourceTree = ""; }; + AB42D0C015187F2C0078E84A /* menu_memory_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_memory_info.png; sourceTree = ""; }; + AB42D0C115187F2C0078E84A /* menu_selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_selection.png; sourceTree = ""; }; + AB42D0C215187F2C0078E84A /* menu_single_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user.png; sourceTree = ""; }; + AB42D0C315187F2C0078E84A /* menu_single_user_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_single_user_disabled.png; sourceTree = ""; }; + AB42D0C415187F2C0078E84A /* menu_verbose.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose.png; sourceTree = ""; }; + AB42D0C515187F2C0078E84A /* menu_verbose_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_verbose_disabled.png; sourceTree = ""; }; + AB42D0C615187F2C0078E84A /* menu_video_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_video_info.png; sourceTree = ""; }; + AB42D0C715187F2C0078E84A /* progress_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar.png; sourceTree = ""; }; + AB42D0C815187F2C0078E84A /* progress_bar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = progress_bar_background.png; sourceTree = ""; }; + AB42D0C915187F2C0078E84A /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; + AB42D0CA15187F2C0078E84A /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; + AB42D0CB15187F2C0078E84A /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; AB43B2B714C37E520018D529 /* boot0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0.s; sourceTree = ""; }; AB43B2B814C37E520018D529 /* boot0md.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0md.s; sourceTree = ""; }; AB43B2B914C37E520018D529 /* chain0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = chain0.s; sourceTree = ""; }; @@ -417,13 +581,6 @@ B0056DF911F3868000754B65 /* text_scroll_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_next.png; sourceTree = ""; }; B0056DFA11F3868000754B65 /* text_scroll_prev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text_scroll_prev.png; sourceTree = ""; }; B0056DFB11F3868000754B65 /* 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 = ""; }; - B0056E0111F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; - B0056E0311F3868000754B65 /* font_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = font_small.png; sourceTree = ""; }; - B0056E0411F3868000754B65 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; - B0056E0511F3868000754B65 /* theme.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = theme.plist; sourceTree = ""; }; B0056E0811F3868000754B65 /* Users_Guide0.4.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Users_Guide0.4.pdf; sourceTree = ""; }; B0056E0911F3868000754B65 /* Users_Guide_v0.3.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Users_Guide_v0.3.pdf; sourceTree = ""; }; B0056E0A11F3868000754B65 /* UsersGuide-v0.2.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "UsersGuide-v0.2.pdf"; sourceTree = ""; }; @@ -465,6 +622,231 @@ name = Chameleon; sourceTree = ""; }; + AB42D02015187F2C0078E84A /* embed */ = { + isa = PBXGroup; + children = ( + AB42D02115187F2C0078E84A /* background.png */, + AB42D02215187F2C0078E84A /* boot.png */, + AB42D02315187F2C0078E84A /* device_cdrom.png */, + AB42D02415187F2C0078E84A /* device_ext3.png */, + AB42D02515187F2C0078E84A /* device_fat.png */, + AB42D02615187F2C0078E84A /* device_generic.png */, + AB42D02715187F2C0078E84A /* device_hfsplus.png */, + AB42D02815187F2C0078E84A /* device_hfsraid.png */, + AB42D02915187F2C0078E84A /* device_ntfs.png */, + AB42D02A15187F2C0078E84A /* device_scroll_next.png */, + AB42D02B15187F2C0078E84A /* device_scroll_prev.png */, + AB42D02C15187F2C0078E84A /* device_selection.png */, + AB42D02D15187F2C0078E84A /* font_console.png */, + AB42D02E15187F2C0078E84A /* font_small.png */, + AB42D02F15187F2C0078E84A /* logo.png */, + AB42D03015187F2C0078E84A /* menu_boot.png */, + AB42D03115187F2C0078E84A /* menu_help.png */, + AB42D03215187F2C0078E84A /* menu_ignore_caches.png */, + AB42D03315187F2C0078E84A /* menu_ignore_caches_disabled.png */, + AB42D03415187F2C0078E84A /* menu_memory_info.png */, + AB42D03515187F2C0078E84A /* menu_selection.png */, + AB42D03615187F2C0078E84A /* menu_single_user.png */, + AB42D03715187F2C0078E84A /* menu_single_user_disabled.png */, + AB42D03815187F2C0078E84A /* menu_verbose.png */, + AB42D03915187F2C0078E84A /* menu_verbose_disabled.png */, + AB42D03A15187F2C0078E84A /* menu_video_info.png */, + AB42D03B15187F2C0078E84A /* progress_bar.png */, + AB42D03C15187F2C0078E84A /* progress_bar_background.png */, + AB42D03D15187F2C0078E84A /* text_scroll_next.png */, + AB42D03E15187F2C0078E84A /* text_scroll_prev.png */, + AB42D03F15187F2C0078E84A /* theme.plist */, + ); + path = embed; + sourceTree = ""; + }; + AB42D04015187F2C0078E84A /* legacy */ = { + isa = PBXGroup; + children = ( + AB42D04115187F2C0078E84A /* background.png */, + AB42D04215187F2C0078E84A /* boot.png */, + AB42D04315187F2C0078E84A /* device_cdrom.png */, + AB42D04415187F2C0078E84A /* device_ext3.png */, + AB42D04515187F2C0078E84A /* device_fat.png */, + AB42D04615187F2C0078E84A /* device_generic.png */, + AB42D04715187F2C0078E84A /* device_hfsplus.png */, + AB42D04815187F2C0078E84A /* device_ntfs.png */, + AB42D04915187F2C0078E84A /* device_scroll_next.png */, + AB42D04A15187F2C0078E84A /* device_scroll_prev.png */, + AB42D04B15187F2C0078E84A /* device_selection.png */, + AB42D04C15187F2C0078E84A /* font_console.png */, + AB42D04D15187F2C0078E84A /* font_small.png */, + AB42D04E15187F2C0078E84A /* logo.png */, + AB42D04F15187F2C0078E84A /* menu_boot.png */, + AB42D05015187F2C0078E84A /* menu_help.png */, + AB42D05115187F2C0078E84A /* menu_ignore_caches.png */, + AB42D05215187F2C0078E84A /* menu_ignore_caches_disabled.png */, + AB42D05315187F2C0078E84A /* menu_memory_info.png */, + AB42D05415187F2C0078E84A /* menu_selection.png */, + AB42D05515187F2C0078E84A /* menu_single_user.png */, + AB42D05615187F2C0078E84A /* menu_single_user_disabled.png */, + AB42D05715187F2C0078E84A /* menu_verbose.png */, + AB42D05815187F2C0078E84A /* menu_verbose_disabled.png */, + AB42D05915187F2C0078E84A /* menu_video_info.png */, + AB42D05A15187F2C0078E84A /* progress_bar.png */, + AB42D05B15187F2C0078E84A /* progress_bar_background.png */, + AB42D05C15187F2C0078E84A /* text_scroll_next.png */, + AB42D05D15187F2C0078E84A /* text_scroll_prev.png */, + AB42D05E15187F2C0078E84A /* theme.plist */, + ); + path = legacy; + sourceTree = ""; + }; + AB42D05F15187F2C0078E84A /* LoginToLion */ = { + isa = PBXGroup; + children = ( + AB42D06015187F2C0078E84A /* ALTERNATES */, + AB42D08E15187F2C0078E84A /* background.png */, + AB42D08F15187F2C0078E84A /* boot.png */, + AB42D09015187F2C0078E84A /* device_befs.png */, + AB42D09115187F2C0078E84A /* device_befs_alt.png */, + AB42D09215187F2C0078E84A /* device_befs_o.png */, + AB42D09315187F2C0078E84A /* device_befs_o_alt.png */, + AB42D09415187F2C0078E84A /* device_cdrom.png */, + AB42D09515187F2C0078E84A /* device_cdrom_o.png */, + AB42D09615187F2C0078E84A /* device_ext3.png */, + AB42D09715187F2C0078E84A /* device_ext3_o.png */, + AB42D09815187F2C0078E84A /* device_fat.png */, + AB42D09915187F2C0078E84A /* device_fat_o.png */, + AB42D09A15187F2C0078E84A /* device_freebsd.png */, + AB42D09B15187F2C0078E84A /* device_freebsd_alt.png */, + AB42D09C15187F2C0078E84A /* device_freebsd_o.png */, + AB42D09D15187F2C0078E84A /* device_freebsd_o_alt.png */, + AB42D09E15187F2C0078E84A /* device_generic.png */, + AB42D09F15187F2C0078E84A /* device_generic_o.png */, + AB42D0A015187F2C0078E84A /* device_hfsplus.png */, + AB42D0A115187F2C0078E84A /* device_hfsplus_leo.png */, + AB42D0A215187F2C0078E84A /* device_hfsplus_leo_o.png */, + AB42D0A315187F2C0078E84A /* device_hfsplus_lion.png */, + AB42D0A415187F2C0078E84A /* device_hfsplus_lion_o.png */, + AB42D0A515187F2C0078E84A /* device_hfsplus_ml.png */, + AB42D0A615187F2C0078E84A /* device_hfsplus_ml_o.png */, + AB42D0A715187F2C0078E84A /* device_hfsplus_o.png */, + AB42D0A815187F2C0078E84A /* device_hfsplus_sl.png */, + AB42D0A915187F2C0078E84A /* device_hfsplus_sl_o.png */, + AB42D0AA15187F2C0078E84A /* device_hfsplus_tiger.png */, + AB42D0AB15187F2C0078E84A /* device_hfsplus_tiger_o.png */, + AB42D0AC15187F2C0078E84A /* device_hfsraid.png */, + AB42D0AD15187F2C0078E84A /* device_hfsraid_ml.png */, + AB42D0AE15187F2C0078E84A /* device_hfsraid_ml_o.png */, + AB42D0AF15187F2C0078E84A /* device_hfsraid_o.png */, + AB42D0B015187F2C0078E84A /* device_ntfs.png */, + AB42D0B115187F2C0078E84A /* device_ntfs_o.png */, + AB42D0B215187F2C0078E84A /* device_openbsd.png */, + AB42D0B315187F2C0078E84A /* device_openbsd_alt.png */, + AB42D0B415187F2C0078E84A /* device_openbsd_o.png */, + AB42D0B515187F2C0078E84A /* device_openbsd_o_alt.png */, + AB42D0B615187F2C0078E84A /* device_scroll_next.png */, + AB42D0B715187F2C0078E84A /* device_scroll_prev.png */, + AB42D0B815187F2C0078E84A /* device_selection.png */, + AB42D0B915187F2C0078E84A /* font_console.png */, + AB42D0BA15187F2C0078E84A /* font_small.png */, + AB42D0BB15187F2C0078E84A /* logo.png */, + AB42D0BC15187F2C0078E84A /* menu_boot.png */, + AB42D0BD15187F2C0078E84A /* menu_help.png */, + AB42D0BE15187F2C0078E84A /* menu_ignore_caches.png */, + AB42D0BF15187F2C0078E84A /* menu_ignore_caches_disabled.png */, + AB42D0C015187F2C0078E84A /* menu_memory_info.png */, + AB42D0C115187F2C0078E84A /* menu_selection.png */, + AB42D0C215187F2C0078E84A /* menu_single_user.png */, + AB42D0C315187F2C0078E84A /* menu_single_user_disabled.png */, + AB42D0C415187F2C0078E84A /* menu_verbose.png */, + AB42D0C515187F2C0078E84A /* menu_verbose_disabled.png */, + AB42D0C615187F2C0078E84A /* menu_video_info.png */, + AB42D0C715187F2C0078E84A /* progress_bar.png */, + AB42D0C815187F2C0078E84A /* progress_bar_background.png */, + AB42D0C915187F2C0078E84A /* text_scroll_next.png */, + AB42D0CA15187F2C0078E84A /* text_scroll_prev.png */, + AB42D0CB15187F2C0078E84A /* theme.plist */, + ); + path = LoginToLion; + sourceTree = ""; + }; + AB42D06015187F2C0078E84A /* ALTERNATES */ = { + isa = PBXGroup; + children = ( + AB42D06115187F2C0078E84A /* device_befs_alt.png */, + AB42D06215187F2C0078E84A /* device_befs_o_alt.png */, + AB42D06315187F2C0078E84A /* Devices - Animals */, + AB42D06615187F2C0078E84A /* Devices - Logos */, + AB42D07315187F2C0078E84A /* Devices - Silly */, + AB42D07C15187F2C0078E84A /* Devices - WallpaperStyle */, + AB42D08D15187F2C0078E84A /* font_console_MONOSPACED.png */, + ); + path = ALTERNATES; + sourceTree = ""; + }; + AB42D06315187F2C0078E84A /* Devices - Animals */ = { + isa = PBXGroup; + children = ( + AB42D06415187F2C0078E84A /* device_openbsd_ALT1.png */, + AB42D06515187F2C0078E84A /* device_openbsd_o_ALT1.png */, + ); + path = "Devices - Animals"; + sourceTree = ""; + }; + AB42D06615187F2C0078E84A /* Devices - Logos */ = { + isa = PBXGroup; + children = ( + AB42D06715187F2C0078E84A /* device_befs_ALT1.png */, + AB42D06815187F2C0078E84A /* device_befs_ALT2.png */, + AB42D06915187F2C0078E84A /* device_befs_o_ALT1.png */, + AB42D06A15187F2C0078E84A /* device_befs_o_ALT2.png */, + AB42D06B15187F2C0078E84A /* device_freebsd_ALT1.png */, + AB42D06C15187F2C0078E84A /* device_freebsd_ALT2.png */, + AB42D06D15187F2C0078E84A /* device_freebsd_o_ALT1.png */, + AB42D06E15187F2C0078E84A /* device_freebsd_o_ALT2.png */, + AB42D06F15187F2C0078E84A /* device_openbsd_ALT1.png */, + AB42D07015187F2C0078E84A /* device_openbsd_ALT2.png */, + AB42D07115187F2C0078E84A /* device_openbsd_o_ALT1.png */, + AB42D07215187F2C0078E84A /* device_openbsd_o_ALT2.png */, + ); + path = "Devices - Logos"; + sourceTree = ""; + }; + AB42D07315187F2C0078E84A /* Devices - Silly */ = { + isa = PBXGroup; + children = ( + AB42D07415187F2C0078E84A /* device_hfsplus_lion_o_VLADSTUDIOS.png */, + AB42D07515187F2C0078E84A /* device_hfsplus_lion_VLADSTUDIOS.png */, + AB42D07615187F2C0078E84A /* device_hfsplus_sl_o_VLADSTUDIOS.png */, + AB42D07715187F2C0078E84A /* device_hfsplus_sl_VLADSTUDIOS.png */, + AB42D07815187F2C0078E84A /* device_hfsraid_lion_o_VLADSTUDIOS.png */, + AB42D07915187F2C0078E84A /* device_hfsraid_lion_VLADSTUDIOS.png */, + AB42D07A15187F2C0078E84A /* device_hfsraid_sl_o_VLADSTUDIOS.png */, + AB42D07B15187F2C0078E84A /* device_hfsraid_sl_VLADSTUDIOS.png */, + ); + path = "Devices - Silly"; + sourceTree = ""; + }; + AB42D07C15187F2C0078E84A /* Devices - WallpaperStyle */ = { + isa = PBXGroup; + children = ( + AB42D07D15187F2C0078E84A /* device_ext3_o_WALL_UBUNTU.png */, + AB42D07E15187F2C0078E84A /* device_ext3_WALL_UBUNTU.png */, + AB42D07F15187F2C0078E84A /* device_hfsplus_lion_o_WALL.png */, + AB42D08015187F2C0078E84A /* device_hfsplus_lion_WALL.png */, + AB42D08115187F2C0078E84A /* device_hfsplus_ml_o_WALL.png */, + AB42D08215187F2C0078E84A /* device_hfsplus_ml_WALL.png */, + AB42D08315187F2C0078E84A /* device_hfsplus_sl_o_WALL.png */, + AB42D08415187F2C0078E84A /* device_hfsplus_sl_WALL.png */, + AB42D08515187F2C0078E84A /* device_hfsraid_lion_o_WALL.png */, + AB42D08615187F2C0078E84A /* device_hfsraid_lion_WALL.png */, + AB42D08715187F2C0078E84A /* device_hfsraid_ml_o_WALL.png */, + AB42D08815187F2C0078E84A /* device_hfsraid_ml_WALL.png */, + AB42D08915187F2C0078E84A /* device_hfsraid_sl_o_WALL.png */, + AB42D08A15187F2C0078E84A /* device_hfsraid_sl_WALL.png */, + AB42D08B15187F2C0078E84A /* device_ntfs_o_WALL_WINDOWS7.png */, + AB42D08C15187F2C0078E84A /* device_ntfs_WALL_WINDOWS7.png */, + ); + path = "Devices - WallpaperStyle"; + sourceTree = ""; + }; AB43B2B514C37E520018D529 /* i386 */ = { isa = PBXGroup; children = ( @@ -1196,11 +1578,11 @@ B0056DBB11F3868000754B65 /* themes */ = { isa = PBXGroup; children = ( + AB42D02015187F2C0078E84A /* embed */, + AB42D04015187F2C0078E84A /* legacy */, + AB42D05F15187F2C0078E84A /* LoginToLion */, B0056DBC11F3868000754B65 /* bullet */, B0056DDC11F3868000754B65 /* default */, - B0056DFC11F3868000754B65 /* msi_netbook */, - B0056DFF11F3868000754B65 /* pinktink */, - B0056E0211F3868000754B65 /* twilight */, ); path = themes; sourceTree = ""; @@ -1281,34 +1663,6 @@ path = default; sourceTree = ""; }; - B0056DFC11F3868000754B65 /* msi_netbook */ = { - isa = PBXGroup; - children = ( - B0056DFD11F3868000754B65 /* logo.png */, - B0056DFE11F3868000754B65 /* theme.plist */, - ); - path = msi_netbook; - sourceTree = ""; - }; - B0056DFF11F3868000754B65 /* pinktink */ = { - isa = PBXGroup; - children = ( - B0056E0011F3868000754B65 /* logo.png */, - B0056E0111F3868000754B65 /* theme.plist */, - ); - path = pinktink; - sourceTree = ""; - }; - B0056E0211F3868000754B65 /* twilight */ = { - isa = PBXGroup; - children = ( - B0056E0311F3868000754B65 /* font_small.png */, - B0056E0411F3868000754B65 /* logo.png */, - B0056E0511F3868000754B65 /* theme.plist */, - ); - path = twilight; - sourceTree = ""; - }; B0056E0611F3868000754B65 /* doc */ = { isa = PBXGroup; children = ( Index: branches/cparm/CHANGES =================================================================== --- branches/cparm/CHANGES (revision 1898) +++ branches/cparm/CHANGES (revision 1899) @@ -1,3 +1,8 @@ +- Sync'd LoginToLion with the last Enzo's update (want more about LoginToLion ? please follow or participate to this thread : http://forum.voodooprojects.org/index.php/topic,2125.0.html) +- fixed some bugs +- Added an option to change the acpi detection method (only for acpi 64 users) +- Updated amlsgn with more cocoa + - Many security and bug fixes and improvements - Added a workaround for some machines that was unable to enter to the startup options during the countdown - Implemented a new environment platform Index: branches/cparm/artwork/themes/LoginToLion/device_befs.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_befs_alt.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_freebsd_o_alt.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/device_freebsd_o_alt.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_freebsd_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_openbsd_alt.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/device_openbsd_alt.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_openbsd.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/device_befs_o_alt.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/device_befs_o_alt.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/device_befs_alt.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/device_befs_alt.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_o_ALT1.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_o_ALT1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_o_ALT2.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_o_ALT2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_ALT1.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_ALT1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_ALT2.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_ALT2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_o_ALT1.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_o_ALT1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_o_ALT1.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_o_ALT1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_o_ALT2.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_o_ALT2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_o_ALT2.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_o_ALT2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_ALT1.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_ALT1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_ALT1.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_ALT1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_ALT2.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_ALT2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_ALT2.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_ALT2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/font_console_MONOSPACED.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/font_console_MONOSPACED.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Animals/device_openbsd_o_ALT1.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Animals/device_openbsd_o_ALT1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Animals/device_openbsd_ALT1.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Animals/device_openbsd_ALT1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_sl_o_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_sl_o_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_lion_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_lion_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ext3_o_WALL_UBUNTU.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ext3_o_WALL_UBUNTU.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_lion_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_lion_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_ml_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_ml_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ntfs_WALL_WINDOWS7.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ntfs_WALL_WINDOWS7.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_ml_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_ml_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_sl_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_sl_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_lion_o_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_lion_o_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_sl_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_sl_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_lion_o_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_lion_o_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ext3_WALL_UBUNTU.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ext3_WALL_UBUNTU.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_ml_o_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_ml_o_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ntfs_o_WALL_WINDOWS7.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ntfs_o_WALL_WINDOWS7.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_ml_o_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_ml_o_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_sl_o_WALL.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_sl_o_WALL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_sl_o_VLADSTUDIOS.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_sl_o_VLADSTUDIOS.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_sl_VLADSTUDIOS.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_sl_VLADSTUDIOS.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_lion_o_VLADSTUDIOS.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_lion_o_VLADSTUDIOS.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_sl_o_VLADSTUDIOS.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_sl_o_VLADSTUDIOS.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_lion_VLADSTUDIOS.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_lion_VLADSTUDIOS.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_sl_VLADSTUDIOS.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_sl_VLADSTUDIOS.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_lion_o_VLADSTUDIOS.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_lion_o_VLADSTUDIOS.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_lion_VLADSTUDIOS.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_lion_VLADSTUDIOS.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_freebsd_alt.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/device_freebsd_alt.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_freebsd.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_befs_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_befs_o_alt.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_openbsd_o.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/cparm/artwork/themes/LoginToLion/device_openbsd_o_alt.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/cparm/artwork/themes/LoginToLion/device_openbsd_o_alt.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: branches/cparm/i386/libsaio/bootstruct.c =================================================================== --- branches/cparm/i386/libsaio/bootstruct.c (revision 1898) +++ branches/cparm/i386/libsaio/bootstruct.c (revision 1899) @@ -46,6 +46,7 @@ Node *gMemoryMapNode = NULL; static char platformName[64]; +static MemoryRange memoryMap[kMemoryMapCountMax]; void initKernBootStruct( void ) { @@ -53,6 +54,11 @@ if ( !init_done ) { + int convmem; // conventional memory + int extmem; // extended memory + + unsigned long memoryMapCount = 0; + bootArgs = (boot_args_common *)malloc(sizeof(boot_args_common)); bootInfo = (PrivateBootInfo_t *)malloc(sizeof(PrivateBootInfo_t)); if (bootArgs == NULL || bootInfo == NULL) @@ -66,26 +72,24 @@ // conventional/extended memory for backwards compatibility. - bootInfo->memoryMapCount = - getMemoryMap( bootInfo->memoryMap, kMemoryMapCountMax, - (unsigned long *) &bootInfo->convmem, - (unsigned long *) &bootInfo->extmem ); + memoryMapCount = + getMemoryMap( memoryMap, kMemoryMapCountMax, + (unsigned long *) &convmem, + (unsigned long *) &extmem ); - if ( bootInfo->memoryMapCount == 0 ) + if ( memoryMapCount == 0 ) { // BIOS did not provide a memory map, systems with // discontiguous memory or unusual memory hole locations // may have problems. - bootInfo->convmem = getConventionalMemorySize(); - bootInfo->extmem = getExtendedMemorySize(); + convmem = getConventionalMemorySize(); + extmem = getExtendedMemorySize(); } -#if 0 - bootInfo->configEnd = bootInfo->config; -#endif + bootArgs->Video.v_display = VGA_TEXT_MODE; DT__Initialize(); @@ -108,10 +112,10 @@ gMemoryMapNode = DT__FindNode("/chosen/memory-map", true); - safe_set_env(envConvMem, bootInfo->convmem); - safe_set_env(envExtMem, bootInfo->convmem); - safe_set_env(envMemoryMap, (uint32_t)bootInfo->memoryMap); - safe_set_env(envMemoryMapCnt, bootInfo->memoryMapCount); + set_env(envConvMem, convmem); + set_env(envExtMem, extmem); + set_env(envMemoryMap, (uint32_t)memoryMap); + set_env(envMemoryMapCnt, memoryMapCount); init_done = 1; @@ -131,11 +135,6 @@ { return bootArgs->Video.v_display; } -uint32_t getBootArgsVideoPtrAtOffset(uint32_t offset) -{ - char *vid = (char *)&bootArgs->Video ; - return (uint32_t)vid[offset]; -} void setBootArgsVideoStruct(Boot_Video *Video) { bootArgs->Video.v_display = Video->v_display; @@ -146,6 +145,10 @@ bootArgs->Video.v_baseAddr = Video->v_baseAddr; return; } +boot_args_common * getBootArgs(void) +{ + return bootArgs; +} #define AllocateKernelMemoryForBootArgs(Ver) \ { \ @@ -232,11 +235,12 @@ { { int i; - EfiMemoryRange *memoryMap = NULL; + EfiMemoryRange *kMemoryMap = NULL; MemoryRange *range = NULL; + uint64_t sane_size = 0; /* Memory size to use for defaults calculations */ - int memoryMapCount = bootInfo->memoryMapCount; + int memoryMapCount = (int)get_env(envMemoryMapCnt); if (memoryMapCount == 0) { @@ -247,44 +251,44 @@ // convert memory map to boot_args memory map - memoryMap = (EfiMemoryRange *)AllocateKernelMemory(sizeof(EfiMemoryRange) * memoryMapCount); - if (memoryMap == NULL) { + kMemoryMap = (EfiMemoryRange *)AllocateKernelMemory(sizeof(EfiMemoryRange) * memoryMapCount); + if (kMemoryMap == NULL) { stop("Unable to allocate kernel space for the memory map\n"); return; } - bootArgs->MemoryMap = (uint32_t)memoryMap; + bootArgs->MemoryMap = (uint32_t)kMemoryMap; bootArgs->MemoryMapSize = sizeof(EfiMemoryRange) * memoryMapCount; bootArgs->MemoryMapDescriptorSize = sizeof(EfiMemoryRange); bootArgs->MemoryMapDescriptorVersion = 0; - for (i=0; imemoryMap[i]; - if (!range || !memoryMap) { + for (i=0; itype) { case kMemoryRangeACPI: - memoryMap->Type = kEfiACPIReclaimMemory; + kMemoryMap->Type = kEfiACPIReclaimMemory; break; case kMemoryRangeNVS: - memoryMap->Type = kEfiACPIMemoryNVS; + kMemoryMap->Type = kEfiACPIMemoryNVS; break; case kMemoryRangeUsable: - memoryMap->Type = kEfiConventionalMemory; + kMemoryMap->Type = kEfiConventionalMemory; break; case kMemoryRangeReserved: default: - memoryMap->Type = kEfiReservedMemoryType; + kMemoryMap->Type = kEfiReservedMemoryType; break; } - memoryMap->PhysicalStart = range->base; - memoryMap->VirtualStart = range->base; - memoryMap->NumberOfPages = range->length >> I386_PGSHIFT; - memoryMap->Attribute = 0; + kMemoryMap->PhysicalStart = range->base; + kMemoryMap->VirtualStart = range->base; + kMemoryMap->NumberOfPages = range->length >> I386_PGSHIFT; + kMemoryMap->Attribute = 0; - switch (memoryMap->Type) { + switch (kMemoryMap->Type) { case kEfiLoaderCode: case kEfiLoaderData: case kEfiBootServicesCode: @@ -293,7 +297,7 @@ /* * Consolidate usable memory types into one. */ - sane_size += (uint64_t)(memoryMap->NumberOfPages << I386_PGSHIFT); + sane_size += (uint64_t)(kMemoryMap->NumberOfPages << I386_PGSHIFT); break; case kEfiRuntimeServicesCode: @@ -306,7 +310,7 @@ * in the system, not just the amount that is available for * the OS to use */ - sane_size += (uint64_t)(memoryMap->NumberOfPages << I386_PGSHIFT); + sane_size += (uint64_t)(kMemoryMap->NumberOfPages << I386_PGSHIFT); break; default: break; Index: branches/cparm/i386/libsaio/bootstruct.h =================================================================== --- branches/cparm/i386/libsaio/bootstruct.h (revision 1898) +++ branches/cparm/i386/libsaio/bootstruct.h (revision 1899) @@ -113,23 +113,9 @@ to the kernel and are thus located in bootArgs although with different field names. */ typedef struct PrivateBootInfo { - int convmem; // conventional memory - int extmem; // extended memory -#if 0 - int numBootDrivers; // number of drivers loaded -#endif - char bootFile[128]; // kernel file name - - unsigned long memoryMapCount; - MemoryRange memoryMap[kMemoryMapCountMax]; - -#if 0 - PCI_bus_info_t pciInfo; - driver_config_t driverConfig[NDRIVERS]; - char * configEnd; // pointer to end of config files - char config[CONFIG_SIZE]; -#endif + char bootFile[128]; // kernel file name + config_file_t bootConfig; // the booter boot.plist config_file_t overrideConfig; // additional boot.plist which can override bootConfig keys @@ -137,10 +123,8 @@ config_file_t smbiosConfig; // smbios.plist - config_file_t helperConfig; // boot helper partition's boot.plist + config_file_t helperConfig; // boot helper partition's boot.plist - unsigned long adler32; - char uuidStr[64+1]; //boot device uuid } PrivateBootInfo_t; Index: branches/cparm/i386/libsaio/platform.h =================================================================== --- branches/cparm/i386/libsaio/platform.h (revision 1898) +++ branches/cparm/i386/libsaio/platform.h (revision 1899) @@ -112,6 +112,7 @@ #define envCPUFreq "CPUFreq" #define envIsServer "isServer" +#define envAdler32 "adler32" #define envCurrCoef "CurrCoef" #define envCurrDiv "CurrDiv" Index: branches/cparm/i386/libsaio/acpi_tools.c =================================================================== --- branches/cparm/i386/libsaio/acpi_tools.c (revision 1898) +++ branches/cparm/i386/libsaio/acpi_tools.c (revision 1899) @@ -25,7 +25,8 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - +#include "libsaio.h" +#include "bootstruct.h" #include "datatype.h" #include "intel_acpi.h" #include "ppm.h" @@ -88,7 +89,7 @@ // Init memory address as F000 segment and scan 64KB region if (!success) success = GetRsdtPointer((void *)0x0F0000, 0x10000, acpi_tables); - + if (!success) return (0ul); @@ -129,7 +130,7 @@ if (*(U32*) (FacsPointer64->Signature) == NAMESEG("FACS")) acpi_tables->FacsPointer64 = (ACPI_TABLE_FACS *) FacsPointer64; } - + // Find the MADT table which is one of the table pointers in the RSDT acpi_tables->MadtPointer = (ACPI_TABLE_MADT *) GetTablePtr(acpi_tables->RsdtPointer, NAMESEG("APIC")); if (acpi_tables->MadtPointer == 0ul) @@ -137,7 +138,7 @@ // Find the MADT(64) table which is one of the table pointers in the XSDT acpi_tables->MadtPointer64 = (ACPI_TABLE_MADT *) GetTablePtr64(acpi_tables->XsdtPointer, NAMESEG("APIC")); - + return (1ul); } @@ -191,48 +192,50 @@ // Procedure: GetTablePtr64 - Find ACPI table in XSDT with input signature. // //------------------------------------------------------------------------------- -#if 0 static ACPI_TABLE_HEADER *GetTablePtr64(ACPI_TABLE_XSDT * xsdt, U32 signature) { U32 index; U32 num_tables; - ACPI_TABLE_HEADER *table = (ACPI_TABLE_HEADER *) xsdt->TableOffsetEntry; - // Compute number of table pointers included in XSDT + int method; + + // Compute number of table pointers included in XSDT num_tables = get_num_tables64(xsdt); - for (index = 0; index < num_tables; index++) { - if (((U32) (table->Signature) == signature) && - (GetChecksum(table, table->Length) == 0)) { - return (table); - } - // Move array pointer to next 64-bit pointer - table = (ACPI_TABLE_HEADER *) ((U32) table + sizeof(U64)); - } - return (0); -} -#else -static ACPI_TABLE_HEADER *GetTablePtr64(ACPI_TABLE_XSDT * xsdt, U32 signature) -{ - U32 index; - U32 num_tables; + getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG); + switch (method) { + case 0x2000: + { + for (index = 0; index < num_tables; index++) { + U64 ptr = xsdt->TableOffsetEntry[index]; + + if ((*(U32 *) ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Signature == signature) && + (GetChecksum(((ACPI_TABLE_HEADER *) (unsigned long)ptr), ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Length) == 0)) { + return (((ACPI_TABLE_HEADER *) (unsigned long)ptr)); + } + } + break; + } + case 0x1000: + default: + { + ACPI_TABLE_HEADER *table = (ACPI_TABLE_HEADER *) xsdt->TableOffsetEntry; + + for (index = 0; index < num_tables; index++) { + if (((U32) (table->Signature) == signature) && + (GetChecksum(table, table->Length) == 0)) { + return (table); + } + // Move array pointer to next 64-bit pointer + table = (ACPI_TABLE_HEADER *) ((U32) table + sizeof(U64)); + } + break; + } + } - // Compute number of table pointers included in XSDT - num_tables = get_num_tables64(xsdt); - - for (index = 0; index < num_tables; index++) { - U64 ptr = xsdt->TableOffsetEntry[index]; - - if ((*(U32 *) ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Signature == signature) && - (GetChecksum(((ACPI_TABLE_HEADER *) (unsigned long)ptr), ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Length) == 0)) { - return (((ACPI_TABLE_HEADER *) (unsigned long)ptr)); - } - } return (0); } -#endif - //------------------------------------------------------------------------------- // // Procedure: GetChecksum - Performs byte checksum Index: branches/cparm/i386/libsaio/saio_types.h =================================================================== --- branches/cparm/i386/libsaio/saio_types.h (revision 1898) +++ branches/cparm/i386/libsaio/saio_types.h (revision 1899) @@ -79,6 +79,7 @@ #define kSystemType "SystemType" /* fake_efi.c */ #define kPCIRootUID "PCIRootUID" /* pci_root.c */ #define kDefaultPartition "Default Partition" /* sys.c */ +#define kAcpiMethod "nacpi" // 0x2000 (= method 2) for some machines that may hang on acpi 2 (aka acpi 64 bit) detection (replace the old kUnsafeACPI "UnsafeACPI") #define PLATFORM_NAME_LEN 64 #define ROOT_PATH_LEN 256 Index: branches/cparm/i386/libsaio/fake_efi.c =================================================================== --- branches/cparm/i386/libsaio/fake_efi.c (revision 1898) +++ branches/cparm/i386/libsaio/fake_efi.c (revision 1899) @@ -448,6 +448,7 @@ static uint64_t kFSBFrequency; static uint32_t kHardware_signature; static uint8_t kType; +static uint32_t kAdler32; EFI_STATUS Register_Acpi_Efi(void* rsd_p, unsigned char rev ) { @@ -509,7 +510,7 @@ } ret = setupAcpiNoMod(); - + } while (0); return ret; @@ -547,9 +548,9 @@ { if (!GetgPlatformName() && strcmp(key, "SMproductname") == 0) readSMBIOS(thePlatformName); - + const char *PlatformName = GetgPlatformName() ; - + const char *src = (strcmp(key, "SMproductname") == 0) ? PlatformName : getStringForKey(key, DEFAULT_SMBIOS_CONFIG); EFI_CHAR16* dst = 0; @@ -576,7 +577,7 @@ static EFI_CHAR8 uuid[UUID_LEN]; int i, isZero, isOnes; SMBByte *p; - + p = (SMBByte*)(uint32_t)get_env(envUUID); if ( p == NULL ) @@ -738,30 +739,30 @@ // additionally this value can be used by third-party apps or osx components (ex: pre-10.7 kextcache, ...) if (bootInfo->uuidStr[0]) DT__AddProperty(chosenNode, kBootUUIDKey, strlen(bootInfo->uuidStr)+1, bootInfo->uuidStr); - - if (GetgRootDevice()) + + if (GetgRootDevice()) + { + + DT__AddProperty(chosenNode, "boot-device-path", strlen(GetgRootDevice())+1, GetgRootDevice()); + + } +#ifdef rootpath + else + if (gRootPath[0]) { - DT__AddProperty(chosenNode, "boot-device-path", strlen(GetgRootDevice())+1, GetgRootDevice()); + DT__AddProperty(chosenNode, "rootpath", strlen(gRootPath)+1, gRootPath); - } -#ifdef rootpath - else - if (gRootPath[0]) - { - - DT__AddProperty(chosenNode, "rootpath", strlen(gRootPath)+1, gRootPath); - - } + } #endif // "boot-file" is not used by kextcache if there is no "boot-device-path" or if there is a valid "rootpath" , // but i let it by default since it may be used by another service - DT__AddProperty(chosenNode, "boot-file", strlen(bootInfo->bootFile)+1, (EFI_CHAR16*)bootInfo->bootFile); + DT__AddProperty(chosenNode, "boot-file", strlen(bootInfo->bootFile)+1, (EFI_CHAR16*)bootInfo->bootFile); - if (bootInfo->adler32) - DT__AddProperty(chosenNode, "boot-kernelcache-adler32", sizeof(unsigned long), &bootInfo->adler32); + if ((kAdler32 = (uint32_t)get_env(envAdler32))) + DT__AddProperty(chosenNode, "boot-kernelcache-adler32", sizeof(unsigned long), &kAdler32); } } @@ -837,7 +838,7 @@ // NOTE WELL: If you do add FSB Frequency detection, make sure to store // the value in the fsbFrequency global and not an malloc'd pointer // because the DT_AddProperty function does not copy its args. - + kFSBFrequency = get_env(envFSBFreq); if (kFSBFrequency != 0) DT__AddProperty(efiPlatformNode, FSB_Frequency_prop, sizeof(uint64_t), &kFSBFrequency); @@ -1048,5 +1049,4 @@ // Add configuration table entries to both the services table and the device tree setupEfiConfigurationTable(); -} - +} \ No newline at end of file Index: branches/cparm/i386/libsaio/saio_internal.h =================================================================== --- branches/cparm/i386/libsaio/saio_internal.h (revision 1898) +++ branches/cparm/i386/libsaio/saio_internal.h (revision 1899) @@ -92,8 +92,8 @@ extern void reserveKern108BootStruct(void); extern void setBootArgsVideoMode(int mode); extern void setBootArgsVideoStruct(Boot_Video *Video); -extern uint32_t getBootArgsVideoPtrAtOffset(uint32_t offset); extern uint32_t getVideoMode(void); +extern boot_args_common * getBootArgs(void); /* cache.c */ Index: branches/cparm/i386/boot2/boot.c =================================================================== --- branches/cparm/i386/boot2/boot.c (revision 1898) +++ branches/cparm/i386/boot2/boot.c (revision 1899) @@ -695,7 +695,7 @@ if ((ret != 0) || ((flags & kFileTypeMask) != kFileTypeFlat)) { trycache = 0; - bootInfo->adler32 = 0; + safe_set_env(envAdler32, 0); DBG("No kernel found, kernelcache disabled !!!\n"); break; } @@ -711,7 +711,7 @@ || (cachetime < kerneltime)) { trycache = 0; - bootInfo->adler32 = 0; + safe_set_env(envAdler32, 0); DBG("Warning: No kernelcache found or kernelcache too old (timestamp of the kernel > timestamp of the cache), kernelcache disabled !!!\n"); break; @@ -721,7 +721,7 @@ && (cachetime < exttime)) { trycache = 0; - bootInfo->adler32 = 0; + safe_set_env(envAdler32, 0); DBG("Warning: kernelcache too old, timestamp of S/L/E > timestamp of the cache, kernelcache disabled !!! \n"); break; @@ -733,7 +733,7 @@ if (cachetime != (exttime + 1)) { trycache = 0; - bootInfo->adler32 = 0; + safe_set_env(envAdler32, 0); DBG("Warning: invalid timestamp, kernelcache disabled !!!\n"); break; @@ -767,7 +767,7 @@ } } - bootInfo->adler32 = 0; + safe_set_env(envAdler32, 0); bootFile = bootInfo->bootFile; #ifdef BOOT_HELPER_SUPPORT @@ -878,6 +878,7 @@ { const char *val; int len; + unsigned long Adler32 = 0; if (getValueForKey(kKernelCacheKey, &val, &len, DEFAULT_BOOT_CONFIG)) { @@ -949,7 +950,8 @@ SetgRootPath(platformInfo->rootPath); #endif - bootInfo->adler32 = OSSwapHostToBigInt32(adler32((unsigned char *)platformInfo, sizeof(*platformInfo))); + Adler32 = OSSwapHostToBigInt32(adler32((unsigned char *)platformInfo, sizeof(*platformInfo))); + safe_set_env(envAdler32, Adler32); free(platformInfo); } @@ -960,16 +962,20 @@ { long flags, cachetime; int ret = -1; - sprintf(gBootKernelCacheFile, "%s.%08lX", "/System/Library/Caches/com.apple.kernelcaches/kernelcache",bootInfo->adler32); - ret = GetFileInfo(NULL, gBootKernelCacheFile, &flags, &cachetime); + + if (Adler32) { + sprintf(gBootKernelCacheFile, "%s.%08lX", "/System/Library/Caches/com.apple.kernelcaches/kernelcache",Adler32); + ret = GetFileInfo(NULL, gBootKernelCacheFile, &flags, &cachetime); + } + if ((ret != 0) || ((flags & kFileTypeMask) != kFileTypeFlat)) { - bootInfo->adler32 = 0; + safe_set_env(envAdler32, 0); sprintf(gBootKernelCacheFile, "%s", "/System/Library/Caches/com.apple.kernelcaches/kernelcache"); } - } else - sprintf(gBootKernelCacheFile, "%s_%s.%08lX", kDefaultCachePath, (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64", bootInfo->adler32); //Snow Leopard + } else if (Adler32) + sprintf(gBootKernelCacheFile, "%s_%s.%08lX", kDefaultCachePath, (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64", Adler32); //Snow Leopard } } Index: branches/cparm/i386/boot2/drivers.c =================================================================== --- branches/cparm/i386/boot2/drivers.c (revision 1898) +++ branches/cparm/i386/boot2/drivers.c (revision 1899) @@ -818,7 +818,7 @@ } char* BootKernelCacheFile = (char*)(uint32_t)get_env(envkCache); if (((get_env(envgBootMode) & kBootModeSafe) == 0) && (BootKernelCacheFile[0] != '\0') && gBootVolume->OSVersion[3] > '6') - bootInfo->adler32 = kernel_header->adler32; + safe_set_env(envAdler32, kernel_header->adler32); } { Index: branches/cparm/i386/boot2/options.c =================================================================== --- branches/cparm/i386/boot2/options.c (revision 1898) +++ branches/cparm/i386/boot2/options.c (revision 1899) @@ -127,11 +127,11 @@ moveCursor( 0, row ); printf("%s",msg); - + for ( time = time18(), timeout++; timeout > 0; ) { if ((ch = readKeyboardStatus())){ - *optionKey = ch; + *optionKey = ch; break; } // Count can be interrupted by holding down shift, @@ -139,7 +139,7 @@ if ( ( readKeyboardShiftFlags() & 0x0F ) != 0 ) { ch = 1; - + break; } @@ -155,7 +155,7 @@ #endif } } - + flushKeyboardBuffer(); return ch; @@ -173,7 +173,7 @@ { gBootArgsPtr = gBootArgs; memset(gBootArgs, '\0', BOOT_STRING_LEN); - + } void addBootArg(const char * argStr) @@ -192,7 +192,7 @@ { char * bootPrompt = (char*)(uint32_t)get_env(envBootPrompt); char * bootRescanPrompt = (char*)(uint32_t)get_env(envBootRescanPrompt); - + changeCursor( 0, row, kCursorTypeUnderline, 0 ); clearScreenRows( row, kScreenLastRow ); @@ -343,7 +343,7 @@ int MenuBottom = (int)get_env(envgMenuBottom); int MenuStart = (int)get_env(envgMenuStart); int MenuEnd = (int)get_env(envgMenuEnd); - + union { struct { unsigned int @@ -397,12 +397,12 @@ MenuStart--; MenuEnd--; draw.f.selectionUp = 1; } - + if ( draw.f.selectionUp || draw.f.selectionDown ) { CursorState cursorState; - + // Set cursor at current position, and clear inverse video. changeCursor( 0, MenuRow + MenuSelection - MenuTop, kCursorTypeHidden, &cursorState ); printMenuItem( &gMenuItems[MenuSelection], 0 ); @@ -434,7 +434,7 @@ *paramPtr = gMenuItems[MenuSelection].param; moved = 1; } - + safe_set_env(envgMenuSelection,MenuSelection); safe_set_env(envgMenuTop,MenuTop ); safe_set_env(envgMenuRow,MenuRow); @@ -442,7 +442,7 @@ safe_set_env(envgMenuBottom,MenuBottom); safe_set_env(envgMenuStart,MenuStart); safe_set_env(envgMenuEnd,MenuEnd); - + return moved; } @@ -496,7 +496,7 @@ { int line; unsigned long i; - MemoryRange *mp = bootInfo->memoryMap; + MemoryRange *mp = (MemoryRange*)(uint32_t)get_env(envMemoryMap); // Activate and clear page 1 setActiveDisplayPage(1); @@ -505,7 +505,9 @@ printf("BIOS reported memory ranges:\n"); line = 1; - for (i=0; imemoryMapCount; i++) { + + int memoryMapCount = (int)get_env(envMemoryMapCnt); + for (i=0; ibase >> 32), (unsigned long)(mp->base)); @@ -529,13 +531,15 @@ char *getMemoryInfoString(void) { unsigned long i; - MemoryRange *mp = bootInfo->memoryMap; + MemoryRange *mp = (MemoryRange*)(uint32_t)get_env(envMemoryMap); char *buff = malloc(sizeof(char)*1024); if(!buff) return 0; char info[] = "BIOS reported memory ranges:\n"; sprintf(buff, "%s", info); - for (i=0; imemoryMapCount; i++) { + int memoryMapCount = (int)get_env(envMemoryMapCnt); + + for (i=0; ibase >> 32), (unsigned long)(mp->base)); @@ -582,7 +586,7 @@ BVRef menuBVR; bool showPrompt, newShowPrompt, isCDROM; int optionKey; - + // Initialize default menu selection entry. gBootVolume = menuBVR = selectBootVolume(getBvChain()); @@ -623,7 +627,7 @@ if (timeout < 0) { gBootMode |= kBootModeQuiet; safe_set_env(envgBootMode,gBootMode); - + } // If the user is holding down a modifier key, enter safe mode. @@ -631,7 +635,7 @@ gBootMode |= kBootModeSafe; safe_set_env(envgBootMode,gBootMode); - + } // Checking user pressed keys @@ -646,7 +650,7 @@ if (f8press) { gBootMode &= ~kBootModeQuiet; safe_set_env(envgBootMode,gBootMode); - + timeout = 0; } // If user typed 'v' or 'V', boot in verbose mode. @@ -664,7 +668,7 @@ // Display banner and show hardware info. char * bootBanner = (char*)(uint32_t)get_env(envBootBanner); - printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024); + printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024); } changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0); msglog("Scanning device %x...", (uint32_t)get_env(envgBIOSDev)); @@ -713,7 +717,7 @@ do { // Hit the option key ? if (key == optionKey) { - + if (key != 0x1C0D) { gBootMode &= ~kBootModeQuiet; safe_set_env(envgBootMode,gBootMode); @@ -753,7 +757,7 @@ if (key == 0x1C0D) { goto done; - + } else if (key == 0) { @@ -921,7 +925,7 @@ changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0); } safe_set_env(envShouldboot, false); - + if (menuItems) { free(menuItems); menuItems = NULL; @@ -969,7 +973,7 @@ bzero(gBootArgs,sizeof(gBootArgs)); strlcpy(gBootArgs, cp_cache,sizeof(gBootArgs)); } - + const char * cp = gBootArgs; const char * val = 0; const char * kernel; @@ -978,7 +982,7 @@ char * argP; char * configKernelFlags; int ArgCntRemaining; - + skipblanks( &cp ); // Update the unit and partition number. @@ -1044,7 +1048,7 @@ if (( kernel = extractKernelName((char **)&cp) )) { strlcpy( bootInfo->bootFile, kernel, sizeof(bootInfo->bootFile) ); safe_set_env(envgOverrideKernel,true); - + } else { if ( getValueForKey( kKernelNameKey, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) { strlcpy( bootInfo->bootFile, val, sizeof(bootInfo->bootFile) ); @@ -1118,12 +1122,12 @@ long gBootMode = ( getValueForKey( kSafeModeFlag, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) ? kBootModeSafe : kBootModeNormal; safe_set_env(envgBootMode,gBootMode); - + if ( getValueForKey( kIgnoreCachesFlag, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) { gBootMode = kBootModeSafe; safe_set_env(envgBootMode,gBootMode); - + } } Index: branches/cparm/i386/modules/GUI/gui.c =================================================================== --- branches/cparm/i386/modules/GUI/gui.c (revision 1898) +++ branches/cparm/i386/modules/GUI/gui.c (revision 1899) @@ -128,7 +128,7 @@ #define MAX(x, y) ((x) > (y) ? (x) : (y)) #endif -#define VIDEO(x) (bootArgs->Video.v_ ## x) +#define VIDEO(x) (((boot_args_common*)getBootArgs())->Video.v_ ## x) #define vram VIDEO(baseAddr) @@ -2566,7 +2566,7 @@ getGraphicModeParams(screen_params); // Set graphics mode if the booter was in text mode or the screen resolution has changed. - if (bootArgs->Video.v_display == VGA_TEXT_MODE + if (getVideoMode() == VGA_TEXT_MODE || (screen_params[0] != (uint32_t)oldScreenWidth && screen_params[1] != (uint32_t)oldScreenHeight) ) { #if UNUSED @@ -2654,7 +2654,7 @@ flushKeyboardBuffer(); - if( bootArgs->Video.v_display == VGA_TEXT_MODE ) + if( getVideoMode() == VGA_TEXT_MODE ) { moveCursor( 0, row ); printf(msg); @@ -2705,14 +2705,14 @@ time += 18; timeout--; - if( bootArgs->Video.v_display == VGA_TEXT_MODE ) + if( getVideoMode() == VGA_TEXT_MODE ) { moveCursor( col, row ); printf("(%d) ", timeout); } } - if( bootArgs->Video.v_display == GRAPHICS_MODE ) + if( getVideoMode() == GRAPHICS_MODE ) { drawProgressBar( gui.screen.pixmap, 100, gui.progressbar.pos , ( multi * 100 / multi_buff ) ); gui.redraw = true; Index: branches/cparm/i386/modules/GUI/GUI_module.c =================================================================== --- branches/cparm/i386/modules/GUI/GUI_module.c (revision 1898) +++ branches/cparm/i386/modules/GUI/GUI_module.c (revision 1899) @@ -196,7 +196,7 @@ void GUI_PreBoot_hook(void* arg1, void* arg2, void* arg3, void* arg4, void* arg5, void* arg6) { // Turn off any GUI elements - if( bootArgs->Video.v_display == GRAPHICS_MODE ) + if( getVideoMode() == GRAPHICS_MODE ) { gui.devicelist.draw = false; gui.bootprompt.draw = false; @@ -307,7 +307,7 @@ if ( gMenuItems == NULL ) return 0; - if( bootArgs->Video.v_display == GRAPHICS_MODE ) + if( getVideoMode() == GRAPHICS_MODE ) { int res; @@ -450,7 +450,7 @@ // Set cursor at current position, and clear inverse video. - if( bootArgs->Video.v_display == VGA_TEXT_MODE ) + if( getVideoMode() == VGA_TEXT_MODE ) { changeCursor( 0, (MenuRow + MenuSelection - MenuTop), kCursorTypeHidden, &cursorState ); printMenuItem( &gMenuItems[MenuSelection], 0 ); @@ -474,7 +474,7 @@ } } - if( bootArgs->Video.v_display == VGA_TEXT_MODE ) + if( getVideoMode() == VGA_TEXT_MODE ) { moveCursor( 0, MenuRow + MenuSelection - MenuTop ); printMenuItem( &gMenuItems[MenuSelection], 1 ); @@ -540,7 +540,7 @@ // Draw the visible items. - if( bootArgs->Video.v_display == GRAPHICS_MODE ) + if( getVideoMode() == GRAPHICS_MODE ) { drawDeviceList(MenuStart, MenuEnd, MenuSelection, menuItems); } @@ -585,7 +585,7 @@ } if (x) x--; - if( bootArgs->Video.v_display == VGA_TEXT_MODE ) + if( getVideoMode() == VGA_TEXT_MODE ) { setCursorPosition( x, y, 0 ); putca(' ', 0x07, 1); @@ -602,7 +602,7 @@ default: if ( key >= ' ' && gBootArgsPtr < gBootArgsEnd) { - if( bootArgs->Video.v_display == VGA_TEXT_MODE ) + if( getVideoMode() == VGA_TEXT_MODE ) { putchar(key); // echo to screen } @@ -622,7 +622,7 @@ { char * bootPrompt = (char*)(uint32_t)get_env(envBootPrompt); - if( bootArgs->Video.v_display == VGA_TEXT_MODE ) + if( getVideoMode() == VGA_TEXT_MODE ) { changeCursor( 0, row, kCursorTypeUnderline, 0 ); clearScreenRows( row, kScreenLastRow ); @@ -632,7 +632,7 @@ if (visible) { - if (bootArgs->Video.v_display == VGA_TEXT_MODE) + if (getVideoMode() == VGA_TEXT_MODE) { if (get_env(envgEnableCDROMRescan)) { @@ -646,7 +646,7 @@ } else { - if (bootArgs->Video.v_display == GRAPHICS_MODE) + if (getVideoMode() == GRAPHICS_MODE) { clearGraphicBootPrompt(); } @@ -662,7 +662,7 @@ gBootArgsPtr = gBootArgs; memset(gBootArgs, '\0', BOOT_STRING_LEN); - if (bootArgs->Video.v_display == GRAPHICS_MODE) + if (getVideoMode() == GRAPHICS_MODE) { clearGraphicBootPrompt(); } @@ -706,7 +706,7 @@ } // ensure we're in graphics mode if gui is setup - if (gui.initialised && bootArgs->Video.v_display == VGA_TEXT_MODE) + if (gui.initialised && (getVideoMode() == VGA_TEXT_MODE)) { #if UNUSED setVideoMode(GRAPHICS_MODE, 0); @@ -786,7 +786,7 @@ GUI_addBootArg(kSingleUserModeFlag); } - if (bootArgs->Video.v_display == VGA_TEXT_MODE) + if (getVideoMode() == VGA_TEXT_MODE) { setCursorPosition(0, 0, 0); clearScreenRows(0, kScreenLastRow); @@ -794,7 +794,7 @@ { char * bootBanner = (char*)(uint32_t)get_env(envBootBanner); // Display banner and show hardware info. - printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024); + printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024); printf(getVBEInfoString()); } changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0); @@ -935,7 +935,7 @@ } } - if (bootArgs->Video.v_display == GRAPHICS_MODE) + if (getVideoMode() == GRAPHICS_MODE) { // redraw the background buffer gui.logo.draw = true; @@ -953,7 +953,8 @@ char * bootBanner = (char*)(uint32_t)get_env(envBootBanner); // Display banner and show hardware info. - gprintf(&gui.screen, bootBanner + 1, (bootInfo->convmem + bootInfo->extmem) / 1024); + gprintf(&gui.screen, bootBanner + 1, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024); + } // redraw background @@ -972,7 +973,7 @@ if (devcnt) { - if( bootArgs->Video.v_display == VGA_TEXT_MODE ) + if( getVideoMode() == VGA_TEXT_MODE ) { printf("Use \30\31 keys to select the startup volume."); } @@ -985,7 +986,7 @@ GUI_showBootPrompt( nextRow, showPrompt ); do { - if (bootArgs->Video.v_display == GRAPHICS_MODE) + if (getVideoMode() == GRAPHICS_MODE) { // redraw background memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 ); @@ -1029,7 +1030,7 @@ */ if (strcmp( booterCommand, "video" ) == 0) { - if (bootArgs->Video.v_display == GRAPHICS_MODE) + if (getVideoMode() == GRAPHICS_MODE) { showInfoBox(getVBEInfoString(), getVBEModeInfoString()); } @@ -1040,7 +1041,7 @@ } else if ( strcmp( booterCommand, "memory" ) == 0) { - if (bootArgs->Video.v_display == GRAPHICS_MODE ) + if (getVideoMode() == GRAPHICS_MODE ) { showInfoBox("Memory Map", getMemoryInfoString()); } @@ -1115,7 +1116,7 @@ // Only Permitted if started in graphics interface if (useGUI) { - if (bootArgs->Video.v_display == GRAPHICS_MODE) + if (getVideoMode() == GRAPHICS_MODE) { #if UNUSED setVideoMode(VGA_TEXT_MODE, 0); @@ -1128,7 +1129,7 @@ char * bootBanner = (char*)(uint32_t)get_env(envBootBanner); // Display banner and show hardware info. - printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024); + printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024); printf(getVBEInfoString()); clearScreenRows(kMenuTopRow, kMenuTopRow + 2); @@ -1169,7 +1170,7 @@ } while (0 == key); done: - if (bootArgs->Video.v_display == VGA_TEXT_MODE) + if (getVideoMode() == VGA_TEXT_MODE) { clearScreenRows(kMenuTopRow, kScreenLastRow); changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0); @@ -1192,7 +1193,7 @@ gErrors = true; va_start(ap, fmt); - if (bootArgs->Video.v_display == VGA_TEXT_MODE) + if (getVideoMode() == VGA_TEXT_MODE) { prf(fmt, ap, putchar, 0); } @@ -1213,7 +1214,7 @@ if (gVerboseMode && (KernelStart == false)) { - if (bootArgs->Video.v_display == VGA_TEXT_MODE) + if (getVideoMode() == VGA_TEXT_MODE) { prf(fmt, ap, putchar, 0); } @@ -1248,7 +1249,7 @@ if (KernelStart == false) { - if (bootArgs->Video.v_display == VGA_TEXT_MODE) + if (getVideoMode() == VGA_TEXT_MODE) { prf(fmt, ap, putchar, 0); } @@ -1281,7 +1282,7 @@ printf("\n"); va_start(ap, fmt); - if (bootArgs->Video.v_display == VGA_TEXT_MODE) + if (getVideoMode() == VGA_TEXT_MODE) { prf(fmt, ap, putchar, 0); } @@ -1298,7 +1299,7 @@ void GUI_showHelp(void) { - if (bootArgs->Video.v_display == GRAPHICS_MODE) { + if (getVideoMode() == GRAPHICS_MODE) { showInfoBox("Help. Press q to quit.\n", (char *)BootHelp_txt); } else { showTextBuffer((char *)BootHelp_txt, BootHelp_txt_len); @@ -1307,7 +1308,7 @@ void GUI_showMessage(char *message) { - if (bootArgs->Video.v_display == GRAPHICS_MODE) { + if (getVideoMode() == GRAPHICS_MODE) { showInfoBox("Help. Press q to quit.\n", message); } else { showTextBuffer(message, strlen(message)); Index: branches/cparm/i386/modules/GUI/graphic_utils.c =================================================================== --- branches/cparm/i386/modules/GUI/graphic_utils.c (revision 1898) +++ branches/cparm/i386/modules/GUI/graphic_utils.c (revision 1899) @@ -10,7 +10,7 @@ #include "vbe.h" #include "gui.h" -#define VIDEO(x) (bootArgs->Video.v_ ## x) +#define VIDEO(x) (((boot_args_common*)getBootArgs())->Video.v_ ## x) #define MIN(x, y) ((x) < (y) ? (x) : (y)) static unsigned long lookUpCLUTIndex( unsigned char index, @@ -640,12 +640,17 @@ // Update KernBootStruct using info provided by the selected // VESA mode. - bootArgs->Video.v_display = VGA_TEXT_MODE; - bootArgs->Video.v_baseAddr = 0xb8000; - bootArgs->Video.v_width = minfo.XResolution; - bootArgs->Video.v_height = minfo.YResolution; - bootArgs->Video.v_depth = 8; - bootArgs->Video.v_rowBytes = 0x8000; + Boot_Video Video; /* Video Information */ + + + Video.v_display = VGA_TEXT_MODE; + Video.v_width = 0xb8000; + Video.v_height = minfo.XResolution; + Video.v_depth = minfo.YResolution; + Video.v_rowBytes = 8; + Video.v_baseAddr = 0x8000; + + setBootArgsVideoStruct(&Video); return errSuccess; // always return success } @@ -808,13 +813,18 @@ // Update KernBootStruct using info provided by the selected // VESA mode. - setBootArgsVideoMode(GRAPHICS_MODE); + Boot_Video Video; /* Video Information */ + - bootArgs->Video.v_width = minfo.XResolution; - bootArgs->Video.v_height = minfo.YResolution; - bootArgs->Video.v_depth = minfo.BitsPerPixel; - bootArgs->Video.v_rowBytes = minfo.BytesPerScanline; - bootArgs->Video.v_baseAddr = VBEMakeUInt32(minfo.PhysBasePtr); + Video.v_display = GRAPHICS_MODE; + Video.v_width = minfo.XResolution; + Video.v_height = minfo.YResolution; + Video.v_depth = minfo.BitsPerPixel; + Video.v_rowBytes = minfo.BytesPerScanline; + Video.v_baseAddr = VBEMakeUInt32(minfo.PhysBasePtr); + + + setBootArgsVideoStruct(&Video); } while ( 0 ); Index: branches/cparm/i386/modules/HibernateEnabler/graphic_utils.c =================================================================== --- branches/cparm/i386/modules/HibernateEnabler/graphic_utils.c (revision 1898) +++ branches/cparm/i386/modules/HibernateEnabler/graphic_utils.c (revision 1899) @@ -17,7 +17,7 @@ ((size_t) ( (char *)&((st *)(0))->m - (char *)0 )) #endif -#define VIDEO(x) (getBootArgsVideoPtrAtOffset(offsetof(Boot_Video,v_##x))) +#define VIDEO(x) (((boot_args_common*)getBootArgs())->Video.v_ ## x) #define MIN(x, y) ((x) < (y) ? (x) : (y)) Index: branches/cparm/i386/modules/ACPICodec/acpi_codec.h =================================================================== --- branches/cparm/i386/modules/ACPICodec/acpi_codec.h (revision 1898) +++ branches/cparm/i386/modules/ACPICodec/acpi_codec.h (revision 1899) @@ -47,7 +47,7 @@ #define kCoreTurbo "EnableTurbo" /* acpi_codec.c */ #define kUpdateACPI "UpdateACPI" /* acpi_codec.c */ -#define kUnsafeACPI "UnsafeACPI" /* acpi_codec.c */ //desactive some safe checks that may stop the boot process on some configurations( temporary option ) +//#define kUnsafeACPI "UnsafeACPI" /* acpi_codec.c */ // DEPRECATED, replaced by nacpi=0x2000 #define kOnlySignedAml "LoadSignedAmlOnly" /* acpi_codec.c */ Index: branches/cparm/i386/modules/ACPICodec/acpi_codec.c =================================================================== --- branches/cparm/i386/modules/ACPICodec/acpi_codec.c (revision 1898) +++ branches/cparm/i386/modules/ACPICodec/acpi_codec.c (revision 1899) @@ -367,10 +367,11 @@ print_nameseg(*(U32 *) ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Signature); printf("\n"); #endif - bool unsafe = false; - getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG); + int method = 0; + getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG); - if (!unsafe) + + if (method != 0x2000) { if (GetChecksum(((ACPI_TABLE_HEADER *) (unsigned long)ptr), ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Length) != 0) @@ -473,10 +474,11 @@ print_nameseg(*(U32*) (table_array[index]->Signature)); printf("\n"); #endif - bool unsafe = false; - getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG); - - if (!unsafe) + int method = 0; + getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG); + + + if (method != 0x2000) { if (GetChecksum(table_array[index], table_array[index]->Length) != 0) { @@ -1424,7 +1426,7 @@ maximum.Control = rdmsr64(MSR_IA32_PERF_STATUS) & 0xff; // Seems it always contains maximum multiplier value (with turbo, that's we need)... minimum.Control = (rdmsr64(MSR_PLATFORM_INFO) >> 40) & 0xff; - verbose("P-States: min 0x%x, max 0x%x\n", minimum.Control, maximum.Control); + DBG("P-States: min 0x%x, max 0x%x\n", minimum.Control, maximum.Control); // Sanity check if (maximum.Control < minimum.Control) @@ -4296,10 +4298,11 @@ continue; } - bool unsafe = false; - getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG); + int method = 0; + getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG); - if (!unsafe) + + if (method != 0x2000) { if (GetChecksum(((ACPI_TABLE_HEADER *) (unsigned long)ptr), ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Length) != 0) @@ -4314,7 +4317,7 @@ } xsdt_mod->TableOffsetEntry[index-dropoffset]=ptr; - + char * tableSig = newStringWithLength((char*)((U32)ptr), 4); DBG("** Processing %s,", tableSig ); @@ -4463,12 +4466,13 @@ for (index = 0; index < num_tables; index++) { - { + { - bool unsafe = false; - getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG); + int method = 0; + getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG); - if (!unsafe) + + if (method != 0x2000) { if (GetChecksum(table_array[index], table_array[index]->Length) != 0) { @@ -4618,7 +4622,7 @@ bool gen_ssdt=false; // will force to generate ssdt even if gen_csta and gen_psta = false bool gen_tsta=false; bool oem_dsdt=false, oem_fadt=false; - + // Find original rsdp if (!FindAcpiTables(&acpi_tables)) { Index: branches/cparm/i386/util/amlsgn.m =================================================================== --- branches/cparm/i386/util/amlsgn.m (revision 1898) +++ branches/cparm/i386/util/amlsgn.m (revision 1899) @@ -138,7 +138,7 @@ int main (int argc, const char * argv[]) { NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - + mach_port_t masterPort; io_registry_entry_t entry,entry2; @@ -151,19 +151,13 @@ const UInt8* rawdata = NULL; - UInt32 uuid32 = 0; - UInt32 Model32 = 0; - const char *cfilename ; + unsigned long uuid32 = 0,Model32 = 0 ; NSString *filename, *fullfilename ; NSArray *namechunks; NSMutableArray *chunks; - char * input, *output, dirspec[512]; NSString *outStr, *inStr; - - if (argc > 3 || argc < 2) { - printf("Usage: amlsgn input(as a file) output(as a directory)\n"); - return 1; - } else if (argc == 2) { + + if (argc == 2) { /* Creating output string */ inStr = [NSString stringWithUTF8String:argv[1]]; @@ -173,40 +167,48 @@ fullfilename = [chunks lastObject]; namechunks = [fullfilename componentsSeparatedByString: @"."]; filename = [namechunks objectAtIndex:0]; - cfilename = [filename UTF8String]; [chunks removeLastObject]; outStr = [chunks componentsJoinedByString: @"/"]; - - } else { + + } else if (argc == 3 ){ inStr = [NSString stringWithUTF8String:argv[1]]; BOOL isDirectory= FALSE; - if ([[NSFileManager defaultManager] fileExistsAtPath:outStr isDirectory:&isDirectory]) { - - if (isDirectory == FALSE) { - chunks = [[NSMutableArray alloc] init]; - [chunks addObjectsFromArray:[inStr componentsSeparatedByString: @"/"]]; - - [chunks removeLastObject]; - outStr = [chunks componentsJoinedByString: @"/"]; - } else { - outStr = [NSString stringWithUTF8String:argv[2]]; - - } + + chunks = [[NSMutableArray alloc] init]; + [chunks addObjectsFromArray:[inStr componentsSeparatedByString: @"/"]]; + fullfilename = [chunks lastObject]; + namechunks = [fullfilename componentsSeparatedByString: @"."]; + filename = [namechunks objectAtIndex:0]; + + if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithUTF8String:argv[2]] isDirectory:&isDirectory] && isDirectory) { + + outStr = [NSString stringWithUTF8String:argv[2]]; + } - + else + { + [chunks removeLastObject]; + outStr = [chunks componentsJoinedByString: @"/"]; + } + } + else + { + printf("Usage: amlsgn input(as a file) output(as a directory)\n"); + goto out; + } do { BOOL isDirectory= FALSE; if ([[NSFileManager defaultManager] fileExistsAtPath:outStr isDirectory:&isDirectory] && isDirectory) { - + if ([[NSFileManager defaultManager] isWritableFileAtPath:outStr]) break; } outStr = [NSHomeDirectory() stringByAppendingPathComponent: @"Desktop"]; - + } while (0); @@ -215,7 +217,7 @@ if (err == KERN_SUCCESS){ entry2=IORegistryEntryFromPath(masterPort, [@"IODeviceTree:/efi" UTF8String]); - + if (entry2!=MACH_PORT_NULL) { data = IORegistryEntrySearchCFProperty( entry2, kIOServicePlane, CFSTR("motherboard-name"), allocator, kIORegistryIterateRecursively); @@ -231,62 +233,39 @@ { Model32 = OSSwapHostToBigInt32(adler32( (unsigned char *) ModelStr, len )); - printf("uuid32 0x%lu uuidStr %s\n",(unsigned long)Model32,ModelStr); + printf("Model32 0x%lx ModelStr %s\n",Model32,ModelStr); - UInt8 mem[1024*1024]; + NSMutableData * mem = [[NSMutableData alloc] initWithContentsOfFile : inStr ]; + if (!mem) { + NSLog(@"Error while opening the file : %@ \n",inStr); + goto out; + } + ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)[mem mutableBytes]; - bzero(mem, sizeof(mem)); - - int fdIn = open([inStr UTF8String], O_RDONLY, 0666); - - if (-1 == fdIn) { - printf("Error while opening the file \n"); - return 1; - } - - size_t nbRead = read(fdIn, (void*)mem, sizeof(mem)); - if (nbRead <= 0) { - printf("Error: Unable to read the file\n"); - close(fdIn); - return 1; - } - - ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)mem; - - close(fdIn); - head->OemRevision = Model32; SetChecksum(head); - { - char dir[1024]; - - sprintf(dir,"%s/%s.%s.aml",[outStr UTF8String],cfilename,ModelStr); - - int fdOut = open(dir, O_WRONLY | O_CREAT, 0666); - - if (-1 == fdOut) { - printf("Error: Can't save the file\n"); - return 1; - } - write(fdOut, mem, head->Length); - - close(fdOut); - } + if ([mem writeToFile : [NSString stringWithFormat:@"%@/%@.%@.aml", + outStr, filename, [NSString stringWithUTF8String:ModelStr]] atomically: YES] == NO) { + + NSLog(@"Error: Can't save the file to %@\n",[NSString stringWithFormat:@"%@/%@.%@.aml", + outStr, filename, [NSString stringWithUTF8String:ModelStr]]); + + } + + [mem release]; } - IOObjectRelease(entry2); - goto out; } } - printf("No Model entry \n"); - + NSLog(@"No Model entry \n"); + entry=IORegistryEntryFromPath(masterPort, [@"IODeviceTree:/efi/platform" UTF8String]); - + if (entry!=MACH_PORT_NULL){ @@ -302,62 +281,48 @@ { uuid32 = OSSwapHostToBigInt32(adler32( (unsigned char *) uuidStr, UUID_STR_LEN )); - printf("uuid32 : 0x%lu\n",(unsigned long)uuid32); + printf("uuid32 : 0x%lx\n",uuid32); printf("uuidStr : %s\n",uuidStr); - - UInt8 mem[1024*1024]; - - bzero(mem, sizeof(mem)); - - int fdIn = open([inStr UTF8String], O_RDONLY, 0666); - - if (-1 == fdIn) { - printf("Error while opening the file \n"); - return 1; - } - - size_t nbRead = read(fdIn, (void*)mem, sizeof(mem)); - if (nbRead <= 0) { - printf("Error: Unable to read the file\n"); - close(fdIn); - return 1; - } - - ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)mem; - - close(fdIn); - + + NSMutableData * mem = [[NSMutableData alloc] initWithContentsOfFile : inStr ]; + if (!mem) { + NSLog(@"Error while opening the file : %@\n",inStr); + goto out; + } + ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)[mem mutableBytes]; + head->OemRevision = uuid32; SetChecksum(head); - { - char dir[1024]; - - sprintf(dir,"%s/%s.%lu.aml",[outStr UTF8String],cfilename,(unsigned long)uuid32); - - int fdOut = open(dir, O_WRONLY | O_CREAT, 0666); - - if (-1 == fdOut) { - printf("Error: Can't save the file\n"); - return 1; - } - write(fdOut, mem, head->Length); - - close(fdOut); - } - } + if ([mem writeToFile : [NSString stringWithFormat:@"%@/%@.%@.aml",outStr,filename,[NSNumber numberWithUnsignedLong:uuid32]] atomically: YES] == NO) { + + NSLog(@"Error: Can't save the file to %@ \n", [NSString stringWithFormat:@"%@/%@.%@.aml",outStr,filename,[NSNumber numberWithUnsignedLong:uuid32]]); + + } + [mem release]; + } - IOObjectRelease(entry); - goto out; - + } } - printf("No UUID entry\n"); - + NSLog(@"No UUID entry\n"); + } -out: + out: + if (chunks != NULL) { + [chunks release]; + } + if (data != NULL) { + CFRelease(data); + } + if (entry != MACH_PORT_NULL) { + IOObjectRelease(entry); + } + if (entry2 != MACH_PORT_NULL) { + IOObjectRelease(entry2); + } [pool drain]; return 0; } Index: branches/cparm/CREDITS =================================================================== --- branches/cparm/CREDITS (revision 1898) +++ branches/cparm/CREDITS (revision 1899) @@ -48,3 +48,4 @@ ErmaC scrax dmazar +Enzo