Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 May 2024 04:08:44 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 125b181674e8 - main - userboot: Use C99 Initializers for each of the consoles here
Message-ID:  <202405200408.44K48i8Z081535@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=125b181674e894baebfe463ed097305329427a2e

commit 125b181674e894baebfe463ed097305329427a2e
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-05-19 21:03:34 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-05-20 04:05:42 +0000

    userboot: Use C99 Initializers for each of the consoles here
    
    Sponsored by:           Netflix
---
 stand/userboot/userboot/userboot_cons.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/stand/userboot/userboot/userboot_cons.c b/stand/userboot/userboot/userboot_cons.c
index a905f1397232..26c89dc2a37e 100644
--- a/stand/userboot/userboot/userboot_cons.c
+++ b/stand/userboot/userboot/userboot_cons.c
@@ -42,14 +42,13 @@ static int userboot_cons_getchar(void);
 static int userboot_cons_poll(void);
 
 struct console userboot_console = {
-	"userboot",
-	"userboot",
-	0,
-	userboot_cons_probe,
-	userboot_cons_init,
-	userboot_cons_putchar,
-	userboot_cons_getchar,
-	userboot_cons_poll,
+	.c_name = "userboot",
+	.c_desc = "userboot",
+	.c_probe = userboot_cons_probe,
+	.c_init = userboot_cons_init,
+	.c_out = userboot_cons_putchar,
+	.c_in = userboot_cons_getchar,
+	.c_ready = userboot_cons_poll,
 };
 
 /*
@@ -57,14 +56,13 @@ struct console userboot_console = {
  * console to comconsole without resulting in an error
  */
 struct console userboot_comconsole = {
-	"comconsole",
-	"comconsole",
-	0,
-	userboot_comcons_probe,
-	userboot_comcons_init,
-	userboot_cons_putchar,
-	userboot_cons_getchar,
-	userboot_cons_poll,
+	.c_name = "comconsole",
+	.c_desc = "comconsole",
+	.c_probe = userboot_comcons_probe,
+	.c_init = userboot_comcons_init,
+	.c_out = userboot_cons_putchar,
+	.c_in = userboot_cons_getchar,
+	.c_ready = userboot_cons_poll,
 };
 
 static void



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405200408.44K48i8Z081535>