Remove default implementations for drivers
diff --git a/src/console.rs b/src/console.rs index 87ab382..b4f2c51 100644 --- a/src/console.rs +++ b/src/console.rs
@@ -74,14 +74,6 @@ } } -impl Default for Console { - fn default() -> Self { - Console { - allow_buffer: [0; 64], - } - } -} - impl fmt::Write for Console { fn write_str(&mut self, string: &str) -> Result<(), fmt::Error> { self.write(string).map_err(|_| fmt::Error)
diff --git a/src/debug/mod.rs b/src/debug/mod.rs index f67ae9b..1e55bb3 100644 --- a/src/debug/mod.rs +++ b/src/debug/mod.rs
@@ -1,20 +1,23 @@ //! Heapless debugging functions for Tock troubleshooting mod low_level_debug; +use crate::drivers::Drivers; pub use low_level_debug::*; -use crate::console::Console; +use crate::retrieve_drivers_unsafe; pub fn println() { let buffer = [b'\n']; - let mut console = Console::default(); + let Drivers { console_driver, .. } = unsafe { retrieve_drivers_unsafe() }; + let mut console = console_driver.create_console(); let _ = console.write(&buffer); } pub fn print_as_hex(value: usize) { let mut buffer = [b'\n'; 11]; write_as_hex(&mut buffer, value); - let mut console = Console::default(); + let Drivers { console_driver, .. } = unsafe { retrieve_drivers_unsafe() }; + let mut console = console_driver.create_console(); let _ = console.write(buffer); } @@ -26,7 +29,8 @@ let mut buffer = [b'\n'; 15]; buffer[0..4].clone_from_slice(b"SP: "); write_as_hex(&mut buffer[4..15], stack_pointer); - let mut console = Console::default(); + let Drivers { console_driver, .. } = unsafe { retrieve_drivers_unsafe() }; + let mut console = console_driver.create_console(); let _ = console.write(buffer); } @@ -50,7 +54,8 @@ } } buffer[27] = b'\n'; - let mut console = Console::default(); + let Drivers { console_driver, .. } = retrieve_drivers_unsafe(); + let mut console = console_driver.create_console(); let _ = console.write(&buffer); }