From 9765f3e0816fc1d59b690b2e22d2327962984e01 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Sun, 20 Jan 2019 02:24:59 +0200
Subject: [PATCH] [wip] Debugging display/boot problems

---
 src/main.rs             | 17 +++++++++++++++--
 src/platform/display.rs | 14 ++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 0918c53..e992640 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,15 +44,28 @@ use platform::{
 // Kernel entry point
 // arch crate is responsible for calling this
 fn kmain() -> ! {
-    let mut uart = MiniUart::new();
-    uart.init();
+    // let mut uart = MiniUart::new();
+    // uart.init();
     // Crashes if uncommenting next line: vvv
     // writeln!(uart, "Hey there, mini uart talking!");
+    // uart.puts("Hey there, mini uart talking!\n"); // shall this work though?
+    // uart.write_str(); // shall this?
 
     if let Some(mut display) = VC::init_fb(Size2d { x: 800, y: 600 } /*, &mut uart*/) {
         display.rect(10, 10, 250, 250, Color::rgb(32, 96, 64));
         display.draw_text(50, 50, "Hello there!", Color::rgb(128, 192, 255));
 
+        let mut buf = [0u8; 64];
+        // Crashes if uncommenting next line: vvv
+        // let s = write_to::show(&mut buf, format_args!("Display width {}", display.width));
+        // So, some rust runtime things are breaking it, why?
+
+        // if s.is_err() {
+        //     display.draw_text(50, 150, "Error displaying", Color::red())
+        // } else {
+        // display.draw_text(50, 150, s.unwrap(), Color::white());
+        // }
+
         display.draw_text(150, 50, "RED", Color::red());
         display.draw_text(160, 60, "GREEN", Color::green());
         display.draw_text(170, 70, "BLUE", Color::blue());
diff --git a/src/platform/display.rs b/src/platform/display.rs
index 10a0180..d9c9bb4 100644
--- a/src/platform/display.rs
+++ b/src/platform/display.rs
@@ -44,7 +44,7 @@ pub struct Display {
     pitch: u32,
     max_x: u32,
     max_y: u32,
-    width: u32,
+    pub width: u32,
     height: u32,
     order: PixelOrder,
 }
@@ -121,19 +121,21 @@ impl Display {
         })
     }
 
-    #[inline(never)]
+    #[inline]
     fn write_pixel_component(&self, x: u32, y: u32, chan: u16, c: u32) {
         unsafe {
             *(self.base as *mut u8).offset(
-                (y * self.pitch
-                    + x * 4//(self.depth / 8)
-                    + self.color_component(chan)) as isize,
+                // This is still a problem!
+                // 1. Fix display output so we can print some values
+                // 2. Print display info
+                // 3. Go from there.
+                (y * self.pitch + x * 4/*(self.depth / 8)*/ + self.color_component(chan)) as isize,
             ) = c as u8;
         }
     }
 
     /// Set a pixel value on display at given coordinates.
-    #[inline(never)]
+    #[inline]
     pub fn putpixel(&mut self, x: u32, y: u32, color: u32) {
         self.write_pixel_component(x, y, 0, color & 0xff);
         self.write_pixel_component(x, y, 1, (color >> 8) & 0xff);