Module Name: src
Committed By: tsutsui
Date: Sun Jan 20 07:32:46 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: getline.c scsi.c
Log Message:
Don't call internal cngetc() and cnputc() directly.
Use public getchar() and puthchar() instead.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/getline.c \
src/sys/arch/luna68k/stand/boot/scsi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/stand/boot/getline.c
diff -u src/sys/arch/luna68k/stand/boot/getline.c:1.1 src/sys/arch/luna68k/stand/boot/getline.c:1.2
--- src/sys/arch/luna68k/stand/boot/getline.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/getline.c Sun Jan 20 07:32:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: getline.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: getline.c,v 1.2 2013/01/20 07:32:45 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -87,29 +87,28 @@ getline(char *prompt, char *buff)
printf("%s", prompt);
for(;;) {
- c = cngetc() & 0x7F;
+ c = getchar() & 0x7F;
switch (c) {
case 0x0a:
case 0x0d:
- cnputc('\r');
- cnputc('\n');
+ putchar('\n');
*p = '\0';
goto outloop;
case 0x08:
case 0x7f:
if (p > buff) {
- cnputc(0x08);
- cnputc(' ');
- cnputc(0x08);
+ putchar(0x08);
+ putchar(' ');
+ putchar(0x08);
p--;
}
break;
default:
*p++ = c;
- cnputc(c);
+ putchar(c);
break;
}
}
Index: src/sys/arch/luna68k/stand/boot/scsi.c
diff -u src/sys/arch/luna68k/stand/boot/scsi.c:1.1 src/sys/arch/luna68k/stand/boot/scsi.c:1.2
--- src/sys/arch/luna68k/stand/boot/scsi.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/scsi.c Sun Jan 20 07:32:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: scsi.c,v 1.2 2013/01/20 07:32:45 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -174,7 +174,7 @@ scsi(int argc, char *argv[])
while (i == 0) {
printf("Do you really want to format SCSI %d device ? [y/n]: ",
scsi_device);
- i = cngetc();
+ i = getchar();
printf("\n");
if ((i != 'y') && (i != 'Y') && (i != 'n') && (i != 'N'))
i = 0;
