Changeset 61c91532 in mainline for kernel/generic/include/console/console.h

Timestamp:

2025-04-17T16:18:27Z (5 days ago)

Author:

GitHub <noreply@…>

Children:

634340fd

Parents:

a65ccc4 (diff), 888c06e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-17 16:18:27)

git-committer:

GitHub <noreply@…> (2025-04-17 16:18:27)

Message:

Merge branch 'HelenOS:master' into master

File:

• kernel/generic/include/console/console.h (modified) (3 diffs)

kernel/generic/include/console/console.h

@@ -36 +36 @@
 #define KERN_CONSOLE_H_
 
-#include <typedefs.h>
-#include <print.h>
 #include <console/chardev.h>
 #include <synch/spinlock.h>
@@ -66 +64 @@
 extern void kio_update(void *);
 extern void kio_flush(void);
-extern void kio_push_char(const char32_t);
-SPINLOCK_EXTERN(kio_lock);
+extern void kio_push_bytes(const char *, size_t);
+extern irq_spinlock_t kio_lock;
 
+extern sysarg_t sys_kio_read(uspace_addr_t buf, size_t size, size_t at);
 extern sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size);
 
@@ -79 +78 @@
 extern void console_unlock(void);
 
+extern void putstr(const char *s, size_t n);
+
 #endif /* KERN_CONSOLE_H_ */