lib/devfs: Switch from `ukplat` to `ukconsole` for printing

`ukconsole` replaces the use of the platform-provided print
functions so `devfs` should use `ukconsole` too.

Signed-off-by: Thassilo Schulze <thassilo@unikraft.io>
Approved-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Michalis Pappas <michalis@unikraft.io>
GitHub-Closes: #1464

diff --git a/lib/devfs/Config.uk b/lib/devfs/Config.uk
index 48cf14cded3dd7a5fbca02a01eae407187657b83..8347351b982f894e9866b1174fe6c1aa17289821 100644 (file)
--- a/lib/devfs/Config.uk
+++ b/lib/devfs/Config.uk
@@ -28,5 +28,6 @@ if LIBDEVFS
        config LIBDEVFS_DEV_STDOUT
                bool "Register stdout device"
                default y if LIBDEVFS_AUTOMOUNT
+               select LIBUKCONSOLE
                default n
 endif

diff --git a/lib/devfs/stdout.c b/lib/devfs/stdout.c
index cc026c7b607f526f71e3801992f701602a8b982a..600a04dfaab90f6467a816f71fa0f97ec08ff8b2 100644 (file)
--- a/lib/devfs/stdout.c
+++ b/lib/devfs/stdout.c
@@ -39,14 +39,14 @@
 #include <uk/print.h>
 #include <vfscore/uio.h>
 #include <devfs/device.h>
-#include <uk/plat/console.h>
+#include <uk/console.h>
 
 #ifdef CONFIG_LIBDEVFS_DEV_STDOUT
 #define DEV_STDOUT_NAME "stdout"
 
 static int __write_fn(void *dst __unused, void *src, size_t *cnt)
 {
-       int ret = ukplat_coutk(src, *cnt);
+       int ret = uk_console_out(src, *cnt);
 
        if (ret < 0)
                /* TODO: remove -1 when vfscore switches to negative