Module Name: src
Committed By: maxv
Date: Sat May 23 08:23:29 UTC 2020
Modified Files:
src/sys/arch/amd64/stand/prekern: console.c
Log Message:
Extract putc().
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/stand/prekern/console.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/amd64/stand/prekern/console.c
diff -u src/sys/arch/amd64/stand/prekern/console.c:1.4 src/sys/arch/amd64/stand/prekern/console.c:1.5
--- src/sys/arch/amd64/stand/prekern/console.c:1.4 Wed Apr 3 19:14:25 2019
+++ src/sys/arch/amd64/stand/prekern/console.c Sat May 23 08:23:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.4 2019/04/03 19:14:25 maxv Exp $ */
+/* $NetBSD: console.c,v 1.5 2020/05/23 08:23:28 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -64,28 +64,34 @@ static void check_scroll(void)
memcpy(cons_start, &cons_buffer[0], CONS_WID * 2 * CONS_HEI);
}
-void print_ext(int color, char *buf)
+static void putc(int color, char c)
{
char *ptr, *scr;
- size_t i;
- for (i = 0; buf[i] != '\0'; i++) {
- if (buf[i] == '\n') {
+ if (c == '\n') {
+ cons_x = 0;
+ cons_y++;
+ check_scroll();
+ } else {
+ if (cons_x + 1 == CONS_WID) {
cons_x = 0;
cons_y++;
check_scroll();
- } else {
- if (cons_x + 1 == CONS_WID) {
- cons_x = 0;
- cons_y++;
- check_scroll();
- }
- ptr = (cons_start + 2 * cons_x + 160 * cons_y);
- scr = (cons_buffer + 2 * cons_x + 160 * cons_y);
- ptr[0] = scr[0] = buf[i];
- ptr[1] = scr[1] = color;
- cons_x++;
}
+ ptr = (cons_start + 2 * cons_x + 160 * cons_y);
+ scr = (cons_buffer + 2 * cons_x + 160 * cons_y);
+ ptr[0] = scr[0] = c;
+ ptr[1] = scr[1] = color;
+ cons_x++;
+ }
+}
+
+void print_ext(int color, char *buf)
+{
+ size_t i;
+
+ for (i = 0; buf[i] != '\0'; i++) {
+ putc(color, buf[i]);
}
}
