From 76edb1759d0baeb5141615455d0908ad4af6461e Mon Sep 17 00:00:00 2001 From: Thibault Date: Sat, 15 Apr 2017 15:07:43 +0200 Subject: [PATCH] Added an image of yaos running in qemu --- README.md | 2 +- img/yaos_running.png | Bin 0 -> 8245 bytes kernel/kernel.c | 5 +---- kernel/user/shell.c | 1 + 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 img/yaos_running.png diff --git a/README.md b/README.md index 8166ca8..3a2e964 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ $ make run ### What you should see -TODO: insert images +![yaos running in qemu](/img/yaos_running.png) ## Resources used for this project diff --git a/img/yaos_running.png b/img/yaos_running.png new file mode 100644 index 0000000000000000000000000000000000000000..c29370828cb8db559b3a40c9997597a5386cf848 GIT binary patch literal 8245 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 WCO1I)^!EdP;DMU<-LgB@VgCi>h-_2< literal 0 HcmV?d00001 diff --git a/kernel/kernel.c b/kernel/kernel.c index b0c8c77..f76135f 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -49,14 +49,11 @@ void kernel_main(Multiboot_info *args) vfs_init(); kernel_log(INFO_MSG, "Virtual file system initialized"); - puts(""); - puts("Hello kernel world!"); - syscall_init(); enter_user_space(); puts(""); - puts("Hello user world!"); + printf("============================== USER SPACE =============================="); shell_init(); } diff --git a/kernel/user/shell.c b/kernel/user/shell.c index 662d565..195b95d 100644 --- a/kernel/user/shell.c +++ b/kernel/user/shell.c @@ -16,6 +16,7 @@ void shell_init(void) size_t i; char c; while(true) { + puts(""); printf("user: %s> ", current_dir->name); i = 0;