Put the lldb capsule back in the platform object, we still need it.
Change-Id: I9d25c50017128edf6d983f7ff0bab4a3c69ea0ce
diff --git a/platform/src/main.rs b/platform/src/main.rs
index 83f00c8..7d67cdf 100644
--- a/platform/src/main.rs
+++ b/platform/src/main.rs
@@ -70,6 +70,10 @@
debug_uart: &'static DebugUartCapsule,
storage_manager: &'static StorageManagerCapsule,
elf_loader: &'static ElfLoaderCapsule,
+ lldb: &'static capsules::low_level_debug::LowLevelDebug<
+ 'static,
+ capsules::virtual_uart::UartDevice<'static>,
+ >,
}
/// Mapping of integer syscalls to objects that implement syscalls.
@@ -84,6 +88,7 @@
DRIVER_NUM_DEBUG_UART => f(Some(self.debug_uart)),
DRIVER_NUM_STORAGE_MANAGER => f(Some(self.storage_manager)),
DRIVER_NUM_ELF_LOADER => f(Some(self.elf_loader)),
+ capsules::low_level_debug::DRIVER_NUM => f(Some(self.lldb)),
_ => f(None),
}
}
@@ -174,6 +179,8 @@
// Create the debugger object that handles calls to `debug!()`.
components::debug_writer::DebugWriterComponent::new(uart_mux).finalize(());
+ let lldb = components::lldb::LowLevelDebugComponent::new(board_kernel, uart_mux).finalize(());
+
let debug_uart_capsule = static_init!(
DebugUartCapsule,
DebugUartCapsule {
@@ -199,6 +206,7 @@
debug_uart: debug_uart_capsule,
storage_manager: storage_manager,
elf_loader: elf_loader,
+ lldb: lldb,
};
kernel::procs::load_processes(
