Index: branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c (revision 1022) +++ branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c (revision 1023) @@ -1107,7 +1107,7 @@ } #if DEBUG_ACPI printf("Press a key to continue... (DEBUG_ACPI)\n"); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff #endif return 1; } Index: branches/azimutz/Chazi/i386/libsaio/load.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/load.c (revision 1022) +++ branches/azimutz/Chazi/i386/libsaio/load.c (revision 1023) @@ -137,7 +137,7 @@ printf("ncmds: %x\n", (unsigned)mH->ncmds); printf("sizeofcmds: %x\n", (unsigned)mH->sizeofcmds); printf("flags: %x\n", (unsigned)mH->flags); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff #endif ncmds = mH->ncmds; @@ -221,7 +221,7 @@ 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 + getc(); //getchar(); Azi: getc stuff #endif } else @@ -241,7 +241,7 @@ 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 + getc(); //getchar(); Azi: getc stuff #endif } @@ -325,7 +325,7 @@ #ifdef DEBUG printf("symoff: %x, nsyms: %x, stroff: %x, strsize: %x\n", symTab->symoff, symTab->nsyms, symTab->stroff, symTab->strsize); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff #endif symsSize = symTab->stroff - symTab->symoff; Index: branches/azimutz/Chazi/i386/libsaio/disk.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/disk.c (revision 1022) +++ branches/azimutz/Chazi/i386/libsaio/disk.c (revision 1023) @@ -1649,7 +1649,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); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff #endif *count = bvCount; Index: branches/azimutz/Chazi/i386/libsaio/biosfn.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/biosfn.c (revision 1022) +++ branches/azimutz/Chazi/i386/libsaio/biosfn.c (revision 1023) @@ -254,10 +254,10 @@ #if DEBUG { int i; - printf("%d total ranges\n", count); getchar(); //getc(); Azi: getc stuff + printf("%d total ranges\n", count); getc(); //getchar(); Azi: getc stuff for (i=0, range = rangeArray; itype, (unsigned int)range->base, (unsigned int)range->length); getchar(); //getc(); Azi: getc stuff + range->type, (unsigned int)range->base, (unsigned int)range->length); getc(); //getchar(); Azi: getc stuff } } #endif @@ -511,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"); getchar(); //getc(); Azi: getc stuff + pause(); #endif /* Some BIOSes erroneously return cf = 1 */ @@ -676,7 +676,7 @@ print_drive_info(di); printf("uses_ebios = 0x%x\n", dp->uses_ebios); printf("result %d\n", ret); - printf("press a key->\n"); getchar(); //getc(); Azi: getc stuff + pause(); #endif if (ret == 0) { Index: branches/azimutz/Chazi/i386/libsaio/saio_internal.h =================================================================== --- branches/azimutz/Chazi/i386/libsaio/saio_internal.h (revision 1022) +++ branches/azimutz/Chazi/i386/libsaio/saio_internal.h (revision 1023) @@ -49,8 +49,6 @@ extern int ebiosEjectMedia(int biosdev); extern void bios_putchar(int ch); extern void putca(int ch, int attr, int repeat); -//extern int getc(void); Azi: getc stuff -extern void pause(); extern int readKeyboardStatus(void); extern int readKeyboardShiftFlags(void); extern unsigned int time18(void); @@ -93,12 +91,14 @@ extern void initBooterLog(void); extern void setupBooterLog(void); extern int putchar(int ch); +extern int getc(void); //Azi: getc stuff extern int getchar(void); extern void msglog(const char * format, ...); extern int printf(const char *format, ...); extern int error(const char *format, ...); extern int verbose(const char *format, ...); extern void stop(const char *format, ...); +extern void pause(); /* disk.c */ extern void rescanBIOSDevice(int biosdev); Index: branches/azimutz/Chazi/i386/boot2/mboot.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/mboot.c (revision 1022) +++ branches/azimutz/Chazi/i386/boot2/mboot.c (revision 1023) @@ -344,13 +344,6 @@ bootArgs = NULL; return bootdevice; } -/* declared on gui.h - moved to boot.h -enum { - kReturnKey = 0x0d, - kEscapeKey = 0x1b, - kBackspaceKey = 0x08, - kASCIIKeyMask = 0x7f -};*/ //Azi:reminder // This is the meat of our implementation. It grabs the boot device from Index: branches/azimutz/Chazi/i386/boot2/resume.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/resume.c (revision 1022) +++ branches/azimutz/Chazi/i386/boot2/resume.c (revision 1023) @@ -118,7 +118,7 @@ printf ("Resuming from Encrypted image is unsupported.\n" "Uncheck \"Use secure virtual memory\" in \"Security\" pane on system preferences.\n" "Press any key to proceed with normal boot.\n"); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff return; } // depends on NVRAM @@ -145,7 +145,7 @@ if ( (long long)mem_base + allocSize < 1024*bootInfo->extmem + 0x100000 ) { printf("Not enough space to restore image. Press any key to proceed with normal boot.\n"); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff return; } Index: branches/azimutz/Chazi/i386/boot2/boot.h =================================================================== --- branches/azimutz/Chazi/i386/boot2/boot.h (revision 1022) +++ branches/azimutz/Chazi/i386/boot2/boot.h (revision 1023) @@ -162,7 +162,8 @@ #define kBootTimeout -1 #define kCDBootTimeout 8 -//Azi: place ?? +//Azi: place ?? Well, somehow this change of place seemd a good idea +// to me at the time; if i just remembered why ??? - check in what files are these used!*** enum { kBackspaceKey = 0x08, kTabKey = 0x09, Index: branches/azimutz/Chazi/i386/boot2/modules.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/modules.c (revision 1022) +++ branches/azimutz/Chazi/i386/boot2/modules.c (revision 1023) @@ -17,7 +17,7 @@ #if CONFIG_MODULE_DEBUG #define DBG(x...) printf(x); -#define DBGPAUSE() getchar() +#define DBGPAUSE() getc() //getchar() #else #define DBG(x...) #define DBGPAUSE() @@ -87,7 +87,7 @@ else { // The module does not have a valid start function - printf("Unable to start %s\n", SYMBOLS_MODULE); getchar(); + printf("Unable to start %s\n", SYMBOLS_MODULE); getc(); //getchar(); } } } @@ -186,7 +186,7 @@ else // The module does not have a valid start function. This may be a library. { printf("WARNING: Unable to start %s\n", module); - getchar(); + getc(); //getchar(); } #else else msglog("WARNING: Unable to start %s\n", module); @@ -305,7 +305,7 @@ #if CONFIG_MODULE_DEBUG printf("Unable to locate symbol %s\n", name); - getchar(); + getc(); //getchar(); #endif if(strcmp(name, VOID_SYMBOL) == 0) return 0xFFFFFFFF; @@ -892,7 +892,7 @@ else { printf("Unable to bind symbol %s\n", symbolName); - getchar(); + getc(); //getchar(); } segmentAddress += sizeof(void*); @@ -911,7 +911,7 @@ else { printf("Unable to bind symbol %s\n", symbolName); - getchar(); + getc(); //getchar(); } segmentAddress += tmp + sizeof(void*); @@ -929,7 +929,7 @@ else { printf("Unable to bind symbol %s\n", symbolName); - getchar(); + getc(); //getchar(); } segmentAddress += (immediate * sizeof(void*)) + sizeof(void*); @@ -954,7 +954,7 @@ else { printf("Unable to bind symbol %s\n", symbolName); - getchar(); + getc(); //getchar(); } break; } @@ -1134,7 +1134,7 @@ void dyld_stub_binder() { printf("ERROR: dyld_stub_binder was called, should have been take care of by the linker.\n"); - getchar(); + getc(); //getchar(); } #else /* CONFIG_MODULES */ Index: branches/azimutz/Chazi/i386/boot2/gui.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/gui.c (revision 1022) +++ branches/azimutz/Chazi/i386/boot2/gui.c (revision 1023) @@ -1634,7 +1634,7 @@ updateVRAM(); - key = getchar(); //getc(); Azi: getc stuff + key = getc(); //getchar(); Azi: getc stuff if( key == kUpArrowkey ) if( currentline > 0 ) Index: branches/azimutz/Chazi/i386/boot2/ramdisk.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/ramdisk.c (revision 1022) +++ branches/azimutz/Chazi/i386/boot2/ramdisk.c (revision 1023) @@ -278,7 +278,7 @@ showInfoRAMDisk(); //Azi: check Chazileon on these line breaks here*** printf("\n\nPress any key to continue.\n"); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff setActiveDisplayPage(0); } else @@ -291,7 +291,7 @@ printf("\n?rd m - mount ramdisk image\n?rd u - unmount ramdisk image"); printf("\n?rd e - enable bt(0,0) alias\n?rd d - disable bt(0,0) alias"); printf("\n\nPress any key to continue.\n"); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff setActiveDisplayPage(0); } } Index: branches/azimutz/Chazi/i386/boot2/options.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/options.c (revision 1022) +++ branches/azimutz/Chazi/i386/boot2/options.c (revision 1023) @@ -924,7 +924,7 @@ // reset cursor co-ords gui.debug.cursor = pos( gui.screen.width - 160 , 10 ); } - key = getchar(); //getc(); Azi: getc stuff + key = getc(); //getchar(); Azi: getc stuff updateMenu( key, (void **) &menuBVR ); newShowPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot); @@ -1489,7 +1489,7 @@ printf("[Type %s%sq to quit viewer]", (line_offset > 0) ? "p for previous page, " : "", (*bp != '\1') ? "space for next page, " : ""); } - c = getchar(); //getc(); Azi: getc stuff + c = getc(); //getchar(); Azi: getc stuff if (c == 'q' || c == 'Q') { break; } @@ -1562,7 +1562,7 @@ printf("Typical boot devices are 80 (First HD), 81 (Second HD)\n"); printf("Enter two-digit hexadecimal boot device [%02x]: ", bootdevice); do { - key = getchar(); //getc(); Azi: getc stuff + key = getc(); //getchar(); Azi: getc stuff switch (key & kASCIIKeyMask) { case kBackspaceKey: if (digitsI > 0) { @@ -1613,7 +1613,7 @@ bool promptForRescanOption(void) { printf("\nWould you like to enable media rescan option?\nPress ENTER to enable or any key to skip.\n"); - if ( getchar()/*getc(); Azi: getc stuff*/ == kReturnKey) { + if ( getc()/*getchar(); Azi: getc stuff*/ == kReturnKey) { return true; } else { return false; Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c =================================================================== --- branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c (revision 1022) +++ branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c (revision 1023) @@ -390,7 +390,7 @@ } else { printf("Running on a 10.0.0 kernel, patch unsupported\n"); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff } Index: branches/azimutz/Chazi/i386/modules/Memory/spd.c =================================================================== --- branches/azimutz/Chazi/i386/modules/Memory/spd.c (revision 1022) +++ branches/azimutz/Chazi/i386/modules/Memory/spd.c (revision 1023) @@ -328,7 +328,7 @@ slot->SerialNo); #if DEBUG_SPD dumpPhysAddr("spd content: ",slot->spd, spd_size); - getchar(); //getc(); Azi: getc stuff + getc(); //getchar(); Azi: getc stuff #endif } Index: branches/azimutz/Chazi/i386/modules/GraphicsEnabler/IntelGraphicsEnabler/gma.c =================================================================== --- branches/azimutz/Chazi/i386/modules/GraphicsEnabler/IntelGraphicsEnabler/gma.c (revision 1022) +++ branches/azimutz/Chazi/i386/modules/GraphicsEnabler/IntelGraphicsEnabler/gma.c (revision 1023) @@ -109,7 +109,7 @@ { printf("Failed initializing dev-prop string dev-entry, press any key...\n"); - getchar(); + getc(); //Azi: getchar(); return false; } @@ -161,7 +161,7 @@ if (!stringdata) { printf("no stringdata press a key...\n"); - getchar(); + getc(); //Azi: getchar(); return false; } Index: branches/azimutz/Chazi/i386/modules/GraphicsEnabler/ATiGraphicsEnabler/ati.c =================================================================== --- branches/azimutz/Chazi/i386/modules/GraphicsEnabler/ATiGraphicsEnabler/ati.c (revision 1022) +++ branches/azimutz/Chazi/i386/modules/GraphicsEnabler/ATiGraphicsEnabler/ati.c (revision 1023) @@ -658,7 +658,7 @@ device = devprop_add_device(string, devicepath); if (!device) { printf("Failed initializing dev-prop string dev-entry, press any key...\n"); - getchar(); + getc(); //Azi: getchar(); return false; } Index: branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.cpp =================================================================== --- branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.cpp (revision 1022) +++ branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.cpp (revision 1023) @@ -35,10 +35,7 @@ delete obj2; printf("Hello world from ExecKernel hook. Binary located at 0x%X\n", binary); - getchar(); - - // - + getc(); //Azi: getchar(); } void HelloWorld_start()