From 44e6787e2eb39b0fbfa7b8d1ec71b2fa79895634 Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@crans.org>
Date: Fri, 9 Feb 2018 17:28:53 +0100
Subject: [PATCH] makefile gdb

---
 kernel-rs/Makefile   |  2 +-
 kernel-rs/src/lib.rs | 33 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/kernel-rs/Makefile b/kernel-rs/Makefile
index 507d4ae7..a76a6dca 100644
--- a/kernel-rs/Makefile
+++ b/kernel-rs/Makefile
@@ -27,7 +27,7 @@ asm_source		:= $(wildcard src/arch/$(arch)/*.asm)
 asm_object		:= $(patsubst src/arch/$(arch)/%.asm, build/arch/$(arch)/%.o, $(asm_source))
 
 KERNEL_RUN		:= $(QEMU) -curses -cdrom $(iso)
-MONITOR 		:= sleep 0.5; telnet 127.0.0.1 $(PORT); kill \`ps -x | grep gdb | head -n 2 | tail -n 1 | cut -d \  -f 2 \`
+MONITOR 		:= sleep 0.5; telnet 127.0.0.1 $(PORT); kill \`ps -x | grep gdb | head -n 2 | tail -n 1 | cut -d \  -f 1 \`
 GDB 			:= gdb -q -ex \"target remote localhost:$(PORTG)\" -ex \"continue\"
 
 
diff --git a/kernel-rs/src/lib.rs b/kernel-rs/src/lib.rs
index d82ba782..b5ced73a 100644
--- a/kernel-rs/src/lib.rs
+++ b/kernel-rs/src/lib.rs
@@ -22,24 +22,23 @@ pub extern fn kmain() -> ! {
     use vga_buffer::ColorCode;
 
     WRITER.lock().reset_screen();
+    WRITER.lock().color_code = ColorCode::new(Color::Yellow, Color::Black);
+    println!(r#"        ,--,               "#);
+    println!(r#"      ,--.'|      ,----,   "#);
+    println!(r#"   ,--,  | :    .'   .' \  "#);
+    println!(r#",---.'|  : '  ,----,'    | "#);
+    println!(r#";   : |  | ;  |    :  .  ; "#);
+    println!(r#"|   | : _' |  ;    |.'  /  "#);
+    println!(r#":   : |.'  |  `----'/  ;   "#);
+    println!(r#"|   ' '  ; :    /  ;  /    "#);
+    println!(r#"\   \  .'. |   ;  /  /-,   "#);
+    println!(r#" `---`:  | '  /  /  /.`|   "#);
+    println!(r#"      '  ; |./__;      :   "#);
+    println!(r#"      |  : ;|   :    .'    "#);
+    println!(r#"      '  ,/ ;   | .'       "#);
+    println!(r#"      '--'  `---'          "#);
+    WRITER.lock().color_code = ColorCode::new(Color::White, Color::Black);
     println!(">> Kernel startup...");
-    println!(">> Kernel startup...");
-
-    WRITER.lock().color_code = ColorCode::new(Color::Blue, Color::Yellow);
-    println!(">> Kernel startup...");
-    println!(">> Kernel startup...");
-    println!(">> Kernel startup...");
-
-    WRITER.lock().color_code = ColorCode::new(Color::Red, Color::Green);
-    println!(">> Kernel startup...");
-    print!("\n");
-    println!(">> Kernel startup...");
-    print!("\n");
-    println!(">> Kernel startup...");
-    print!("0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
-
-    // WRITER.lock().color_code = ColorCode::new(Color::White, Color::Black);
-
     loop {
         let control = unsafe { cpuio::inb(0x64) };
         if (control & 1) == 1 {