diff options
author | Ian Moffett <ian@osmora.org> | 2025-09-15 03:01:25 -0400 |
---|---|---|
committer | Ian Moffett <ian@osmora.org> | 2025-09-15 03:02:27 -0400 |
commit | b736f9f73b44dc6d6bbefdd11eda73abe0e0eea5 (patch) | |
tree | b0b67eb5fa1e584f97c2b01f8b63feedc17e80c4 /src/sys/include | |
parent | 51727d06791a071f1b5d69f6a91345da9776b081 (diff) |
kern: cons: Add console string writing routine
Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'src/sys/include')
-rw-r--r-- | src/sys/include/io/cons/cons.h | 17 | ||||
-rw-r--r-- | src/sys/include/io/cons/consvar.h | 52 | ||||
-rw-r--r-- | src/sys/include/io/cons/font.h | 47 |
3 files changed, 116 insertions, 0 deletions
diff --git a/src/sys/include/io/cons/cons.h b/src/sys/include/io/cons/cons.h index 3f95cc0..7b0543e 100644 --- a/src/sys/include/io/cons/cons.h +++ b/src/sys/include/io/cons/cons.h @@ -32,9 +32,14 @@ #include <sys/types.h> #include <sys/bootvars.h> +#include <os/spinlock.h> struct cons_scr { + struct spinlock lock; struct bootvar_fb fbvars; + size_t text_x; + size_t text_y; + size_t max_col; uint32_t scr_bg; uint32_t scr_fg; }; @@ -51,4 +56,16 @@ extern struct cons_scr g_root_scr; */ int cons_init(void); +/* + * Write a string onto the screen + * + * @scr: Screen to write on + * @str: String to write onto the screen + * @len: Length of string to write + * + * Returns the number of bytes written on success, + * otherwise a less than zero value to indicate failure. + */ +ssize_t cons_putstr(struct cons_scr *scr, const char *str, size_t len); + #endif /* !_CONS_CONS_H_ */ diff --git a/src/sys/include/io/cons/consvar.h b/src/sys/include/io/cons/consvar.h new file mode 100644 index 0000000..c4d7b5c --- /dev/null +++ b/src/sys/include/io/cons/consvar.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _CONS_CONVAR_H_ +#define _CONS_CONSVAR_H_ + +#include <sys/types.h> + +/* + * Represents a printable character. + * + * @c: Actual character to print + * @x: X position + * @y: Y position + * @bg: Background color + * @fg: Foreground color + */ +struct cons_ch { + char c; + uint32_t x; + uint32_t y; + uint32_t bg; + uint32_t fg; +}; + +#endif /* !_CONS_CONSVAR_H_ */ diff --git a/src/sys/include/io/cons/font.h b/src/sys/include/io/cons/font.h new file mode 100644 index 0000000..b16c279 --- /dev/null +++ b/src/sys/include/io/cons/font.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _CONS_FONT_H_ +#define _CONS_FONT_H_ 1 + +#include <sys/cdefs.h> +#include <sys/types.h> + +#define FONT_HDRLEN (sizeof(struct font_header)) +#define PSF1_MAGIC 0x0436 + +struct __packed font_header { + uint16_t magic; + uint8_t mode; + uint8_t csize; +}; + +extern uint8_t g_CONS_FONT[]; + +#endif /* !_CONS_FONT_H_ */ |