diff --git a/src/user/drv.uart/main.cpp b/src/user/drv.uart/main.cpp index a758bbc..4cd0cd2 100644 --- a/src/user/drv.uart/main.cpp +++ b/src/user/drv.uart/main.cpp @@ -97,7 +97,7 @@ main(int argc, const char **argv) if (result != j6_status_ok) break; - j6::syslog("uart driver: got %d bytes from channel", size); + //j6::syslog("uart driver: got %d bytes from channel", size); com1.write(buffer, size); } if (result != j6_status_would_block) diff --git a/src/user/drv.uefi_fb/main.cpp b/src/user/drv.uefi_fb/main.cpp index f3f7972..98b2944 100644 --- a/src/user/drv.uefi_fb/main.cpp +++ b/src/user/drv.uefi_fb/main.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "font.h" @@ -21,7 +22,7 @@ extern "C" { int driver_main(unsigned argc, const char **argv, const char **env, const j6_init_args *init) { - j6_log("fb driver starting"); + j6::syslog("fb driver starting"); using bootproto::devices::uefi_fb; using bootproto::devices::video_mode; @@ -30,7 +31,7 @@ driver_main(unsigned argc, const char **argv, const char **env, const j6_init_ar const uefi_fb *fb = reinterpret_cast(init->args[0]); if (!fb || !fb->framebuffer) { - j6_log("fb driver didn't find a framebuffer, exiting"); + j6::syslog("fb driver didn't find a framebuffer, exiting"); return 1; } @@ -102,7 +103,7 @@ driver_main(unsigned argc, const char **argv, const char **env, const j6_init_ar buffer_size = size; continue; } else if (s != j6_status_ok) { - j6_log("fb driver got error from get_log, quitting"); + j6::syslog("fb driver got error from get_log, quitting"); return s; } @@ -128,6 +129,6 @@ driver_main(unsigned argc, const char **argv, const char **env, const j6_init_ar } } - j6_log("fb driver done, exiting"); + j6::syslog("fb driver done, exiting"); return 0; } diff --git a/src/user/testapp/main.cpp b/src/user/testapp/main.cpp index bf655b9..42203ff 100644 --- a/src/user/testapp/main.cpp +++ b/src/user/testapp/main.cpp @@ -97,7 +97,7 @@ main(int argc, const char **argv) void *base = malloc(0x1000); if (!base) - return 1; + return 1001; uint64_t *vma_ptr = reinterpret_cast(base); for (int i = 0; i < 3; ++i) @@ -107,7 +107,7 @@ main(int argc, const char **argv) j6::channel *chan = j6::channel::create(0x2000); if (!chan) - return 2; + return 1002; j6_log("main thread created channel");