Merge pull request sunriseos#455 from Orycterope/kfs-6-7-memes

Kfs 6 7 memes
Orycterope · Aug 26, 2019 · ed532ce · ed532ce
2 parents fba7fc2 + c7c74e0
commit ed532ce
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/isofiles/boot/grub/grub.cfg b/isofiles/boot/grub/grub.cfg
@@ -15,7 +15,7 @@ terminal_input console
 terminal_output gfxterm
 
 insmod png
-background_image -m stretch /boot/grub/splash.png
+background_image -m stretch /boot/grub/splash_ioapic.png
 
 menuentry "my os" {
     multiboot2 /boot/sunrise-bootstrap "info"

diff --git a/isofiles/boot/grub/splash_ioapic.png b/isofiles/boot/grub/splash_ioapic.png
diff --git a/isofiles/boot/grub/splash.png → .../boot/grub/splash_keyboard_controller.png b/isofiles/boot/grub/splash.png → .../boot/grub/splash_keyboard_controller.png
diff --git a/shell/img/meme6.gif b/shell/img/meme6.gif
diff --git a/shell/img/meme7.gif b/shell/img/meme7.gif
diff --git a/shell/src/main.rs b/shell/src/main.rs
@@ -170,6 +170,8 @@ fn main() {
             "meme3" => show_gif(&LOUIS3[..]),
             "meme4" => show_gif(&LOUIS4[..]),
             "meme5" => show_gif(&LOUIS5[..]),
+            "meme6" => show_gif(&LOUIS6[..]),
+            "memset" => show_gif(&LOUIS7[..]),
             "cat" => {
                 match arguments.nth(0) {
                     None => {
@@ -223,6 +225,8 @@ fn main() {
                 let _ = writeln!(&mut terminal, "meme3: Display the KFS-3 meme");
                 let _ = writeln!(&mut terminal, "meme4: Display the KFS-4 meme");
                 let _ = writeln!(&mut terminal, "meme5: Display the KFS-5 meme");
+                let _ = writeln!(&mut terminal, "meme6: Display the KFS-6 meme");
+                let _ = writeln!(&mut terminal, "memset: Display the KFS-7 meme");
                 let _ = writeln!(&mut terminal, "test_threads: Run threads that concurrently print As and Bs");
                 let _ = writeln!(&mut terminal, "test_divide_by_zero: Check exception handling by throwing a divide by zero");
                 let _ = writeln!(&mut terminal, "test_page_fault: Check exception handling by throwing a page_fault");
@@ -532,15 +536,19 @@ fn test_page_fault() {
 }
 
 /// Meme for KFS1
-static LOUIS1: &[u8; 89915] = include_bytes!("../img/meme1.gif");
+static LOUIS1: &[u8] = include_bytes!("../img/meme1.gif");
 /// Meme for KFS2
-static LOUIS2: &[u8; 93818] = include_bytes!("../img/meme2.gif");
+static LOUIS2: &[u8] = include_bytes!("../img/meme2.gif");
 /// Meme for KFS3
-static LOUIS3: &[u8; 1318100] = include_bytes!("../img/meme3.gif");
+static LOUIS3: &[u8] = include_bytes!("../img/meme3.gif");
 /// Meme for KFS4
-static LOUIS4: &[u8; 103803] = include_bytes!("../img/meme4.gif");
+static LOUIS4: &[u8] = include_bytes!("../img/meme4.gif");
 /// Meme for KFS5
-static LOUIS5: &[u8; 106140] = include_bytes!("../img/meme5.gif");
+static LOUIS5: &[u8] = include_bytes!("../img/meme5.gif");
+/// Meme for KFS6
+static LOUIS6: &[u8] = include_bytes!("../img/meme6.gif");
+/// Meme for KFS7
+static LOUIS7: &[u8] = include_bytes!("../img/meme7.gif");
 
 capabilities!(CAPABILITIES = Capabilities {
     svcs: [