Chameleon

Chameleon Commit Details

Date:2011-06-09 04:18:19 (8 years 2 months ago)
Author:Azimutz
Commit:1000
Parents: 999
Message:Clean getc() --> getchar() comments; leave just the essential reminders.
Changes:
M/trunk/i386/libsaio/acpi_patcher.c
M/trunk/i386/libsaio/console.c
M/trunk/i386/libsaio/spd.c
M/trunk/i386/boot2/gui.c
M/trunk/i386/libsaio/dram_controllers.c
M/trunk/i386/libsa/printf.c
M/trunk/i386/libsaio/disk.c
M/trunk/i386/libsaio/load.c
M/trunk/i386/libsaio/biosfn.c
M/trunk/i386/libsaio/hpet.c

File differences

trunk/i386/libsaio/console.c
6767
6868
6969
70
70
7171
7272
7373
7474
7575
7676
77
77
7878
7979
8080
......
263263
264264
265265
266
266
267
267268
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)
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() ??
}
trunk/i386/libsaio/acpi_patcher.c
10581058
10591059
10601060
1061
1062
1061
10631062
10641063
10651064
}
#if DEBUG_ACPI
printf("Press a key to continue... (DEBUG_ACPI)\n");
//getc();
getchar(); //getc(); Azi: getc stuff
getchar();
#endif
return 1;
}
trunk/i386/libsaio/spd.c
344344
345345
346346
347
348
347
348
349
349350
350351
351352
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
}
trunk/i386/libsaio/dram_controllers.c
557557
558558
559559
560
561
560
562561
563562
,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();
}
}
trunk/i386/libsaio/load.c
135135
136136
137137
138
138
139139
140140
141141
......
219219
220220
221221
222
222
223223
224224
225225
......
239239
240240
241241
242
242
243243
244244
245245
......
324324
325325
326326
327
327
328328
329329
330330
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;
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
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
}
#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;
trunk/i386/libsaio/disk.c
16361636
16371637
16381638
1639
1639
16401640
16411641
16421642
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;
trunk/i386/libsaio/hpet.c
9797
9898
9999
100
101
100
101
102102
103103
}
#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
}
trunk/i386/libsaio/biosfn.c
185185
186186
187187
188
188
189189
190190
191191
......
252252
253253
254254
255
255
256256
257257
258
258
259259
260260
261261
......
509509
510510
511511
512
512
513513
514514
515515
......
675675
676676
677677
678
678
679679
680680
681681
// 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));
}
#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; i<count; i++, range++) {
printf("range: type %d, base 0x%x, length 0x%x\n",
range->type, (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
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 */
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) {
trunk/i386/boot2/gui.c
10181018
10191019
10201020
1021
1021
10221022
10231023
10241024
10251025
10261026
10271027
1028
1028
10291029
10301030
10311031
}
}
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) {
trunk/i386/libsa/printf.c
2828
2929
3030
31
31
3232
3333
3434
3535
3636
3737
38
38
3939
4040
4141
#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) {

Archive Download the corresponding diff file

Revision: 1000