From 5301057324311b2fa8f9dbff00f2195879a4d123 Mon Sep 17 00:00:00 2001
From: Wren Turkal <wt@penguintechs.org>
Date: Sat, 8 Aug 2020 02:25:19 -0700
Subject: [PATCH] Convert some println -> log::info!.

Signed-off-by: Wren Turkal <wt@penguintechs.org>
---
 src/acpi/mod.rs          | 3 ++-
 src/arch/x86_64/start.rs | 8 ++++----
 src/memory/mod.rs        | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/acpi/mod.rs b/src/acpi/mod.rs
index 25e64eb..a604e14 100644
--- a/src/acpi/mod.rs
+++ b/src/acpi/mod.rs
@@ -12,6 +12,7 @@ use spin::RwLock;
 
 use crate::stop::kstop;
 
+use crate::log::info;
 use crate::memory::Frame;
 use crate::paging::{ActivePageTable, Page, PhysicalAddress, VirtualAddress};
 use crate::paging::entry::EntryFlags;
@@ -124,7 +125,7 @@ pub unsafe fn init(active_table: &mut ActivePageTable, already_supplied_rsdps: O
 
     // Search for RSDP
     if let Some(rsdp) = RSDP::get_rsdp(active_table, already_supplied_rsdps) {
-        println!("RSDP: {:?}", rsdp);
+        info!("RSDP: {:?}", rsdp);
         let rxsdt = get_sdt(rsdp.sdt_address(), active_table);
 
         for &c in rxsdt.signature.iter() {
diff --git a/src/arch/x86_64/start.rs b/src/arch/x86_64/start.rs
index 1f48db8..03a1f86 100644
--- a/src/arch/x86_64/start.rs
+++ b/src/arch/x86_64/start.rs
@@ -87,10 +87,10 @@ pub unsafe extern fn kstart(args_ptr: *const KernelArgs) -> ! {
         log::init_logger(|r| println!("{}:{} -- {}", r.target(), r.level(), r.args()));
 
         info!("Redox OS starting...");
-        println!("Kernel: {:X}:{:X}", kernel_base, kernel_base + kernel_size);
-        println!("Stack: {:X}:{:X}", stack_base, stack_base + stack_size);
-        println!("Env: {:X}:{:X}", env_base, env_base + env_size);
-        println!("RSDPs: {:X}:{:X}", acpi_rsdps_base, acpi_rsdps_base + acpi_rsdps_size);
+        info!("Kernel: {:X}:{:X}", kernel_base, kernel_base + kernel_size);
+        info!("Stack: {:X}:{:X}", stack_base, stack_base + stack_size);
+        info!("Env: {:X}:{:X}", env_base, env_base + env_size);
+        info!("RSDPs: {:X}:{:X}", acpi_rsdps_base, acpi_rsdps_base + acpi_rsdps_size);
 
         let ext_mem_ranges = if args.acpi_rsdps_base != 0 && args.acpi_rsdps_size > 0 {
             Some([(acpi_rsdps_base as usize, acpi_rsdps_size as usize)])
diff --git a/src/memory/mod.rs b/src/memory/mod.rs
index bb45e93..82bea17 100644
--- a/src/memory/mod.rs
+++ b/src/memory/mod.rs
@@ -1,6 +1,7 @@
 //! # Memory management
 //! Some code was borrowed from [Phil Opp's Blog](http://os.phil-opp.com/allocating-frames.html)
 
+use crate::log::info;
 pub use crate::paging::{PAGE_SIZE, PhysicalAddress};
 
 use self::bump::BumpAllocator;
@@ -76,7 +77,7 @@ pub unsafe fn init(kernel_start: usize, kernel_end: usize) {
     for (i, entry) in MEMORY_MAP.iter_mut().enumerate() {
         *entry = *(0x500 as *const MemoryArea).add(i);
         if entry._type != MEMORY_AREA_NULL {
-            println!("{:?}", entry);
+            info!("{:?}", entry);
         }
     }