diff options
| author | imp <imp@FreeBSD.org> | 2002-12-17 22:00:06 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2002-12-17 22:00:06 +0000 |
| commit | a360e4752ed74f06f7a791461009e29d78ffaf75 (patch) | |
| tree | 3244db840fd879d3479feaf34996815a5fe7dc51 /sys/boot | |
| parent | 51c494ca748e82aa9783781aa6cf477066e63913 (diff) | |
| download | FreeBSD-src-a360e4752ed74f06f7a791461009e29d78ffaf75.zip FreeBSD-src-a360e4752ed74f06f7a791461009e29d78ffaf75.tar.gz | |
Reduce diffs with Peter's expanded diffs:
1) Put back the keyboard printing printf, at the cost of 58 bytes.
2) Minor tweak to getstr at no apparent cost.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/boot2/boot2.c | 8 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 865a508..7850bc1 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -167,14 +167,14 @@ getstr(void) for (;;) { switch (c = xgetc(0)) { case 0: - continue; + break; case '\177': case '\b': if (s > cmd) { s--; printf("\b \b"); } - continue; + break; case '\n': case '\r': *s = 0; @@ -182,8 +182,8 @@ getstr(void) default: if (s - cmd < sizeof(cmd) - 1) *s++ = c; + putchar(c); } - putchar(c); } } @@ -388,7 +388,7 @@ parse() } if (opts & 1 << RBX_PROBEKBD) { i = *(uint8_t *)PTOV(0x496) & 0x10; - /* printf("Keyboard: %s\n", i ? "yes" : "no"); */ + printf("Keyboard: %s\n", i ? "yes" : "no"); if (!i) opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 865a508..7850bc1 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -167,14 +167,14 @@ getstr(void) for (;;) { switch (c = xgetc(0)) { case 0: - continue; + break; case '\177': case '\b': if (s > cmd) { s--; printf("\b \b"); } - continue; + break; case '\n': case '\r': *s = 0; @@ -182,8 +182,8 @@ getstr(void) default: if (s - cmd < sizeof(cmd) - 1) *s++ = c; + putchar(c); } - putchar(c); } } @@ -388,7 +388,7 @@ parse() } if (opts & 1 << RBX_PROBEKBD) { i = *(uint8_t *)PTOV(0x496) & 0x10; - /* printf("Keyboard: %s\n", i ? "yes" : "no"); */ + printf("Keyboard: %s\n", i ? "yes" : "no"); if (!i) opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); |
