Index: trunk/i386/libsaio/console.c =================================================================== --- trunk/i386/libsaio/console.c (revision 999) +++ trunk/i386/libsaio/console.c (revision 1000) @@ -67,14 +67,14 @@ char *msgbuf = 0; char *cursor = 0; -struct putc_info +struct putc_info //Azi: exists on gui.c & printf.c { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) +sputc(int c, struct putc_info * pi) //Azi: same as above { if (pi->last_str) if (pi->str == pi->last_str) @@ -263,5 +263,6 @@ void pause() { printf("Press a key to continue...\n"); - getc(); //Azi: this works here because the function is up above... change?? + getchar(); //getc(); //Azi: getc works here because the function is up above; changed for now. + // replace getchar() by pause() ?? } Index: trunk/i386/libsaio/acpi_patcher.c =================================================================== --- trunk/i386/libsaio/acpi_patcher.c (revision 999) +++ trunk/i386/libsaio/acpi_patcher.c (revision 1000) @@ -1058,8 +1058,7 @@ } #if DEBUG_ACPI printf("Press a key to continue... (DEBUG_ACPI)\n"); -// getc(); - getchar(); //getc(); Azi: getc stuff + getchar(); #endif return 1; } Index: trunk/i386/libsaio/spd.c =================================================================== --- trunk/i386/libsaio/spd.c (revision 999) +++ trunk/i386/libsaio/spd.c (revision 1000) @@ -344,8 +344,9 @@ slot->SerialNo); #if DEBUG_SPD - dumpPhysAddr("spd content: ", slot->spd, spd_size); //Azi: reminder - can be remove/replaced?? - getchar(); //getc(); Azi: getc stuff + //Azi: this was gone with mem.c... remove?? + dumpPhysAddr("spd content: ", slot->spd, spd_size); + getchar(); #endif } Index: trunk/i386/libsaio/dram_controllers.c =================================================================== --- trunk/i386/libsaio/dram_controllers.c (revision 999) +++ trunk/i386/libsaio/dram_controllers.c (revision 1000) @@ -557,7 +557,6 @@ ,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(); Azi: getc stuff - */ +// getchar(); } } Index: trunk/i386/libsaio/load.c =================================================================== --- trunk/i386/libsaio/load.c (revision 999) +++ trunk/i386/libsaio/load.c (revision 1000) @@ -135,7 +135,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 + getchar(); #endif ncmds = mH->ncmds; @@ -219,7 +219,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 + getchar(); #endif } else @@ -239,7 +239,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 + getchar(); #endif } @@ -324,7 +324,7 @@ #if DEBUG printf("symoff: %x, nsyms: %x, stroff: %x, strsize: %x\n", symTab->symoff, symTab->nsyms, symTab->stroff, symTab->strsize); - getchar(); //getc(); Azi: getc stuff + getchar(); #endif symsSize = symTab->stroff - symTab->symoff; Index: trunk/i386/libsaio/disk.c =================================================================== --- trunk/i386/libsaio/disk.c (revision 999) +++ trunk/i386/libsaio/disk.c (revision 1000) @@ -1636,7 +1636,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 + getchar(); #endif *count = bvCount; Index: trunk/i386/libsaio/hpet.c =================================================================== --- trunk/i386/libsaio/hpet.c (revision 999) +++ trunk/i386/libsaio/hpet.c (revision 1000) @@ -97,7 +97,7 @@ } #if DEBUG_HPET - printf("Press [Enter] to continue...\n"); // replace by pause() function, console.c - getchar(); //getc(); Azi: getc stuff + printf("Press [Enter] to continue...\n"); + getchar(); #endif } Index: trunk/i386/libsaio/biosfn.c =================================================================== --- trunk/i386/libsaio/biosfn.c (revision 999) +++ trunk/i386/libsaio/biosfn.c (revision 1000) @@ -185,7 +185,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); getchar(); //getc(); Azi: getc stuff + //printf("Get memory map 0x%x, %d\n", rangeArray); getchar(); if (maxRangeCount > (BIOS_LEN / sizeof(MemoryRange))) { maxRangeCount = (BIOS_LEN / sizeof(MemoryRange)); } @@ -252,10 +252,10 @@ #if DEBUG { int i; - printf("%d total ranges\n", count); getchar(); //getc(); Azi: getc stuff + printf("%d total ranges\n", count); getchar(); 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); getchar(); } } #endif @@ -509,7 +509,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 + printf("press a key->\n"); getchar(); #endif /* Some BIOSes erroneously return cf = 1 */ @@ -675,7 +675,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 + printf("press a key->\n"); getchar(); #endif if (ret == 0) { Index: trunk/i386/boot2/gui.c =================================================================== --- trunk/i386/boot2/gui.c (revision 999) +++ trunk/i386/boot2/gui.c (revision 1000) @@ -1018,14 +1018,14 @@ } } -struct putc_info //Azi: same as below +struct putc_info //Azi: exists on console.c & printf.c { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) //Azi: exists on console.c & printf.c +sputc(int c, struct putc_info * pi) //Azi: same as above { if (pi->last_str) if (pi->str == pi->last_str) { Index: trunk/i386/libsa/printf.c =================================================================== --- trunk/i386/libsa/printf.c (revision 999) +++ trunk/i386/libsa/printf.c (revision 1000) @@ -28,14 +28,14 @@ #include "libsa.h" -struct putc_info //Azi: same as below +struct putc_info //Azi: exists on console.c & gui.c { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) //Azi: exists on console.c & gui.c +sputc(int c, struct putc_info * pi) //Azi: same as above { if (pi->last_str) if (pi->str == pi->last_str) {