Merge pull request tock#4857 from tock/dev/syscall-driver-types

boards: nrf52840dk: use component types

Author: alevy

boards/components/src/analog_comparator.rs

@@ -52,6 +52,8 @@ macro_rules! analog_comparator_component_static {
     };};
 }
 
+pub type AnalogComparatorComponentType<AC> = AnalogComparator<'static, AC>;
+
 pub struct AnalogComparatorComponent<
     AC: 'static + kernel::hil::analog_comparator::AnalogComparator<'static>,
 > {

boards/components/src/ble.rs

@@ -37,6 +37,9 @@ macro_rules! ble_component_static {
     }};
 }
 
+pub type BLEComponentType<B, A> =
+    capsules_extra::ble_advertising_driver::BLE<'static, B, VirtualMuxAlarm<'static, A>>;
+
 pub struct BLEComponent<
     A: kernel::hil::time::Alarm<'static> + 'static,
     B: kernel::hil::ble_advertising::BleAdvertisementDriver<'static> + BleConfig + 'static,

boards/components/src/i2c.rs

@@ -134,6 +134,9 @@ impl<I: 'static + i2c::I2CMaster<'static>> Component for I2CComponent<I> {
     }
 }
 
+pub type I2CMasterSlaveDriverComponentType<I> =
+    capsules_core::i2c_master_slave_driver::I2CMasterSlaveDriver<'static, I>;
+
 pub struct I2CMasterSlaveDriverComponent<I: 'static + i2c::I2CMasterSlave<'static>> {
     board_kernel: &'static kernel::Kernel,
     driver_num: usize,

boards/components/src/process_console.rs

@@ -65,6 +65,13 @@ macro_rules! process_console_component_static {
     };};
 }
 
+pub type ProcessConsoleComponentType<A> = process_console::ProcessConsole<
+    'static,
+    { capsules_core::process_console::DEFAULT_COMMAND_HISTORY_LEN },
+    VirtualMuxAlarm<'static, A>,
+    Capability,
+>;
+
 pub struct ProcessConsoleComponent<const COMMAND_HISTORY_LEN: usize, A: 'static + Alarm<'static>> {
     board_kernel: &'static kernel::Kernel,
     uart_mux: &'static MuxUart<'static>,

boards/components/src/spi.rs

@@ -113,6 +113,8 @@ pub struct SpiMuxComponent<S: 'static + spi::SpiMaster<'static>> {
     spi: &'static S,
 }
 
+pub type SpiSyscallComponentType<S> = Spi<'static, VirtualSpiMasterDevice<'static, S>>;
+
 pub struct SpiSyscallComponent<S: 'static + spi::SpiMaster<'static>> {
     board_kernel: &'static kernel::Kernel,
     spi_mux: &'static MuxSpiMaster<'static, S>,

boards/components/src/udp_driver.rs

@@ -68,6 +68,8 @@ macro_rules! udp_driver_component_static {
     };};
 }
 
+pub type UDPDriverComponentType = capsules_extra::net::udp::UDPDriver<'static>;
+
 pub struct UDPDriverComponent<A: Alarm<'static> + 'static> {
     board_kernel: &'static kernel::Kernel,
     driver_num: usize,