Property changes on: trunk/artwork/themes/default/text_scroll_prev.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsraid.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/logo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_ext3.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_single_user.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/boot.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_fat_o.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_ntfs_o.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_scroll_prev.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_ignore_caches.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_verbose_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsplus_o.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_boot.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/font_console.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_fat.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_ntfs.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_single_user_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/font_small.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/text_scroll_next.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_cdrom_o.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsplus.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_selection.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_ignore_caches_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_video_info.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_memory_info.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_generic_o.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_selection.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_scroll_next.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_help.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_hfsraid_o.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/background.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/thumb.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_ext3_o.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_cdrom.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/progress_bar_background.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/progress_bar.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/menu_verbose.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/default/device_generic.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/text_scroll_prev.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/font_small.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/text_scroll_next.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/logo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_ext3.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_single_user.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/boot.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_hfsplus.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_ignore_caches_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_selection.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_video_info.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_memory_info.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_selection.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_scroll_prev.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_scroll_next.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_help.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_ignore_caches.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/background.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_verbose_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_cdrom.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_boot.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/progress_bar_background.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/font_console.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/progress_bar.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_ntfs.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_fat.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_verbose.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/menu_single_user_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/legacy/device_generic.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/text_scroll_prev.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_fat32.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/font_small.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/text_scroll_next.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_fat16.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/logo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_ext3.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_single_user.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/boot.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_hfsplus.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_ignore_caches_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_selection.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_video_info.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_memory_info.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_selection.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_scroll_prev.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_scroll_next.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_help.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_ignore_caches.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/background.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_verbose_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_cdrom.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_boot.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/progress_bar_background.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/font_console.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/progress_bar.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_ntfs.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_verbose.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/menu_single_user_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/bullet/device_generic.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/pinktink/logo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/msi_netbook/logo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/twilight/font_small.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/twilight/logo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/text_scroll_prev.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/font_small.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_hfsraid.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/text_scroll_next.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/logo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_ext3.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_single_user.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/boot.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_hfsplus.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_ignore_caches_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_selection.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_video_info.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_memory_info.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_selection.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_scroll_prev.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_scroll_next.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_help.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_ignore_caches.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/background.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_verbose_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_cdrom.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_boot.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/progress_bar_background.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/font_console.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/progress_bar.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_ntfs.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_fat.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_verbose.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/menu_single_user_disabled.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/artwork/themes/embed/device_generic.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Index: trunk/i386/libsaio/console.c =================================================================== --- trunk/i386/libsaio/console.c (revision 993) +++ trunk/i386/libsaio/console.c (revision 994) @@ -53,28 +53,28 @@ bool gVerboseMode; bool gErrors; -/** Kabyl: BooterLog - -Azi: Doubled available log size; this seems to fix some hangs and instant reboots caused by -booting with -f (ignore caches). 96kb are enough to hold full log, booting with -f; even so, -this depends on how much we "play" at the boot prompt and with what patches we're playing, -depending on how much they print to the log. -**/ //Azi: closing **/ alows colapse/expand... is this desirable?? colapsing an entire page - // will also colapse comments.... +/* + * Azi: Doubled available log size; this seems to fix some hangs and instant reboots caused by + * booting with -f (ignore caches). 96kb are enough to hold full log, booting with -f; even so, + * this depends on how much we "play" at the boot prompt and with what patches we're playing, + * depending on how much they print to the log. + * + * Kabyl: BooterLog + */ #define BOOTER_LOG_SIZE (128 * 1024) #define SAFE_LOG_SIZE 134 char *msgbuf = 0; char *cursor = 0; -struct putc_info //Azi: same as below +struct putc_info { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) //Azi: exists on printf.c & gui.c +sputc(int c, struct putc_info * pi) { if (pi->last_str) if (pi->str == pi->last_str) @@ -263,5 +263,5 @@ void pause() { printf("Press a key to continue...\n"); - getc(); + getc(); //Azi: this works here because the function is up above... change?? } Index: trunk/i386/libsaio/bootstruct.c =================================================================== --- trunk/i386/libsaio/bootstruct.c (revision 993) +++ trunk/i386/libsaio/bootstruct.c (revision 994) @@ -116,7 +116,8 @@ bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args)); bcopy(oldAddr, bootArgs, sizeof(boot_args)); } - else { + else + { void *oldAddr = bootArgsPreLion; bootArgsPreLion = (boot_args_pre_lion *)AllocateKernelMemory(sizeof(boot_args_pre_lion)); bcopy(oldAddr, bootArgsPreLion, sizeof(boot_args_pre_lion)); Index: trunk/i386/libsaio/bootstruct.h =================================================================== --- trunk/i386/libsaio/bootstruct.h (revision 993) +++ trunk/i386/libsaio/bootstruct.h (revision 994) @@ -1,4 +1,4 @@ -/** <-- JavaDoc style (doxygen) //Azi +/* * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ @@ -30,7 +30,7 @@ #include "bios.h" #include "device_tree.h" -/*! <-- QT style (doxygen) //Azi +/*! Kernel boot args global also used by booter for its own data. */ extern boot_args *bootArgs; Index: trunk/i386/libsaio/acpi_patcher.c =================================================================== --- trunk/i386/libsaio/acpi_patcher.c (revision 993) +++ trunk/i386/libsaio/acpi_patcher.c (revision 994) @@ -14,7 +14,7 @@ #include "aml_generator.h" #ifndef DEBUG_ACPI -#define DEBUG_ACPI 0 +#define DEBUG_ACPI 1 #endif #if DEBUG_ACPI==2 @@ -1058,7 +1058,8 @@ } #if DEBUG_ACPI printf("Press a key to continue... (DEBUG_ACPI)\n"); - getc(); +// getc(); + getchar(); //getc(); Azi: getc stuff #endif return 1; } Index: trunk/i386/libsaio/spd.c =================================================================== --- trunk/i386/libsaio/spd.c (revision 993) +++ trunk/i386/libsaio/spd.c (revision 994) @@ -344,8 +344,8 @@ slot->SerialNo); #if DEBUG_SPD - dumpPhysAddr("spd content: ", slot->spd, spd_size); - getc(); + dumpPhysAddr("spd content: ", slot->spd, spd_size); //Azi: reminder - can be remove/replaced?? + getchar(); //getc(); Azi: getc stuff #endif } Index: trunk/i386/libsaio/usb.c =================================================================== --- trunk/i386/libsaio/usb.c (revision 993) +++ trunk/i386/libsaio/usb.c (revision 994) @@ -107,7 +107,7 @@ { // Set usb legacy off modification by Signal64 // NOTE: This *must* be called after the last file is loaded from the drive in the event that we are booting form usb. - // NOTE2: This should be called after any getc() call. (aka, after the Wait=y keyworkd is used) + // NOTE2: This should be called after any getc()/getchar() call. (aka, after the Wait=y keyworkd is used) // AKA: Make this run immediatly before the kernel is called uint32_t capaddr, opaddr; uint8_t eecp; Index: trunk/i386/libsaio/dram_controllers.c =================================================================== --- trunk/i386/libsaio/dram_controllers.c (revision 993) +++ trunk/i386/libsaio/dram_controllers.c (revision 994) @@ -557,7 +557,7 @@ ,Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS ,Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS ); - /* getc(); + /* getc(); Azi: getc stuff */ } } Index: trunk/i386/libsaio/load.c =================================================================== --- trunk/i386/libsaio/load.c (revision 993) +++ trunk/i386/libsaio/load.c (revision 994) @@ -26,6 +26,8 @@ * */ +//#define DEBUG 1 + #include #include #include @@ -135,7 +137,7 @@ printf("ncmds: %x\n", (unsigned)mH->ncmds); printf("sizeofcmds: %x\n", (unsigned)mH->sizeofcmds); printf("flags: %x\n", (unsigned)mH->flags); - getc(); + getchar(); //getc(); Azi: getc stuff #endif ncmds = mH->ncmds; @@ -213,7 +215,14 @@ fileaddr = (gBinaryAddress + segCmd->fileoff); filesize = segCmd->filesize; - segname=segCmd->segname; + segname=segCmd->segname; + +#ifdef DEBUG + printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x, nsects: %d, flags: %x.\n", + segCmd->segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize, + (unsigned) segCmd->nsects, (unsigned)segCmd->flags); + getchar(); //getc(); Azi: getc stuff +#endif } else { @@ -226,7 +235,14 @@ fileaddr = (gBinaryAddress + segCmd->fileoff); filesize = segCmd->filesize; - segname=segCmd->segname; + segname=segCmd->segname; + +#ifdef DEBUG + printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x, nsects: %d, flags: %x.\n", + segCmd->segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize, + (unsigned) segCmd->nsects, (unsigned)segCmd->flags); + getchar(); //getc(); Azi: getc stuff +#endif } if (vmsize == 0 || filesize == 0) { @@ -235,12 +251,12 @@ return 0; } -#if DEBUG +/*#if DEBUG printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x, nsects: %d, flags: %x.\n", segCmd->segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize, (unsigned) segCmd->nsects, (unsigned)segCmd->flags); getc(); -#endif +#endif*/ if (! ((vmaddr >= KERNEL_ADDR && (vmaddr + vmsize) <= (KERNEL_ADDR + KERNEL_LEN)) || @@ -310,7 +326,7 @@ #if DEBUG printf("symoff: %x, nsyms: %x, stroff: %x, strsize: %x\n", symTab->symoff, symTab->nsyms, symTab->stroff, symTab->strsize); - getc (); + getchar(); //getc(); Azi: getc stuff #endif symsSize = symTab->stroff - symTab->symoff; Index: trunk/i386/libsaio/disk.c =================================================================== --- trunk/i386/libsaio/disk.c (revision 993) +++ trunk/i386/libsaio/disk.c (revision 994) @@ -55,6 +55,8 @@ #define UFS_SUPPORT 0 #endif +//#define DEBUG 1 + #include "libsaio.h" #include "boot.h" #include "bootstruct.h" @@ -1636,7 +1638,7 @@ printf(" bvr: %d, dev: %d, part: %d, flags: %d, vis: %d\n", bvr, bvr->biosdev, bvr->part_no, bvr->flags, bvr->visible); } printf("count: %d\n", bvCount); - getc(); + getchar(); //getc(); Azi: getc stuff #endif *count = bvCount; Index: trunk/i386/libsaio/hpet.c =================================================================== --- trunk/i386/libsaio/hpet.c (revision 993) +++ trunk/i386/libsaio/hpet.c (revision 994) @@ -7,7 +7,7 @@ #include "hpet.h" #ifndef DEBUG_HPET -#define DEBUG_HPET 0 +#define DEBUG_HPET 1 #endif #if DEBUG_HPET @@ -97,7 +97,7 @@ } #if DEBUG_HPET - printf("Press [Enter] to continue...\n"); - getc(); + printf("Press [Enter] to continue...\n"); // replace by pause() function, console.c + getchar(); //getc(); Azi: getc stuff #endif } Index: trunk/i386/libsaio/biosfn.c =================================================================== --- trunk/i386/libsaio/biosfn.c (revision 993) +++ trunk/i386/libsaio/biosfn.c (revision 994) @@ -39,9 +39,13 @@ 2007-12-29 dfe - Added ebiosEjectMedia */ + +//#define DEBUG 1 + #include "bootstruct.h" #include "libsaio.h" + #define MAX_DRIVES 8 static biosBuf_t bb; @@ -183,7 +187,7 @@ // Some BIOSes will simply ignore the value of ECX on entry. // Probably best to keep its value at 20 to avoid surprises. - //printf("Get memory map 0x%x, %d\n", rangeArray);getc(); + //printf("Get memory map 0x%x, %d\n", rangeArray); getchar(); //getc(); Azi: getc stuff if (maxRangeCount > (BIOS_LEN / sizeof(MemoryRange))) { maxRangeCount = (BIOS_LEN / sizeof(MemoryRange)); } @@ -250,10 +254,10 @@ #if DEBUG { int i; - printf("%d total ranges\n", count);getc(); + printf("%d total ranges\n", count); getchar(); //getc(); Azi: getc stuff for (i=0, range = rangeArray; itype, (unsigned int)range->base, (unsigned int)range->length); getc(); + range->type, (unsigned int)range->base, (unsigned int)range->length); getchar(); //getc(); Azi: getc stuff } } #endif @@ -507,7 +511,7 @@ printf("media_type: %x\n", pkt.media_type); printf("drive_num: %x\n", pkt.drive_num); printf("device_spec: %x\n", pkt.device_spec); - printf("press a key->\n");getc(); + printf("press a key->\n"); getchar(); //getc(); Azi: getc stuff #endif /* Some BIOSes erroneously return cf = 1 */ @@ -673,7 +677,7 @@ print_drive_info(di); printf("uses_ebios = 0x%x\n", dp->uses_ebios); printf("result %d\n", ret); - printf("press a key->\n");getc(); + printf("press a key->\n"); getchar(); //getc(); Azi: getc stuff #endif if (ret == 0) { Index: trunk/i386/boot2/bmdecompress.c =================================================================== --- trunk/i386/boot2/bmdecompress.c (revision 993) +++ trunk/i386/boot2/bmdecompress.c (revision 994) @@ -19,8 +19,10 @@ * * @APPLE_LICENSE_HEADER_END@ */ + #include "boot.h" + static void PreviewDecompress16(uint32_t * compressBuffer, uint32_t width, uint32_t height, uint32_t row, Property changes on: trunk/package/buildpkg ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/package/fdisk440 ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/package/Resources/Italian.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Resources/background.tiff ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Resources/Portuguese.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Resources/Bulgarian.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Resources/Bulgarian.lproj/License.rtf ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Resources/French.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Resources/Spanish.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Resources/English.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Resources/German.lproj/Localizable.strings ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/package/Kexts/Disabler.kext/Contents/MacOS/Disabler ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/archive/Users_Guide0.4.pdf ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/archive/UsersGuide-v0.2.pdf ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/archive/Users_Guide_v0.3.pdf ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/themeinfo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/install_complete.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/Chameleon 2 v0.5.docx ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/install_stand.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/colorchart.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/install_start.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/install_cust.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/install_dest.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/screen_format.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/chameleon.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/User_Guide_src/xnulogo.png ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream Property changes on: trunk/doc/Users_Guide0.5.pdf ___________________________________________________________________ Deleted: svn:mime-type - application/octet-stream