From ed936b3749b7db329ff9a2805fd1030074b2f155 Mon Sep 17 00:00:00 2001 From: Ben Hamlin Date: Tue, 3 Oct 2023 17:30:09 +0000 Subject: [PATCH] Make http-server demo use hal-adapters Signed-off-by: Ben Hamlin --- crates/examples/microkit/http-server/pds/server/Cargo.toml | 2 +- crates/examples/microkit/http-server/pds/server/src/main.rs | 2 +- crates/private/meta/Cargo.toml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/examples/microkit/http-server/pds/server/Cargo.toml b/crates/examples/microkit/http-server/pds/server/Cargo.toml index faf24e2fe..b08e8a3f1 100644 --- a/crates/examples/microkit/http-server/pds/server/Cargo.toml +++ b/crates/examples/microkit/http-server/pds/server/Cargo.toml @@ -22,7 +22,7 @@ sel4-logging = { path = "../../../../../sel4-logging" } sel4-microkit-message = { path = "../../../../../sel4-microkit/message" } sel4-shared-ring-buffer = { path = "../../../../../sel4-shared-ring-buffer" } sel4-shared-ring-buffer-block-io = { path = "../../../../../sel4-shared-ring-buffer/block-io" } -sel4-shared-ring-buffer-smoltcp = { path = "../../../../../sel4-shared-ring-buffer/smoltcp" } +sel4-hal-adapters = { path = "../../../../../sel4-hal-adapters" } sel4-sync = { path = "../../../../../sel4-sync" } [dependencies.microkit-http-server-example-sp804-driver-interface-types] diff --git a/crates/examples/microkit/http-server/pds/server/src/main.rs b/crates/examples/microkit/http-server/pds/server/src/main.rs index aa09e98b7..d3260881e 100644 --- a/crates/examples/microkit/http-server/pds/server/src/main.rs +++ b/crates/examples/microkit/http-server/pds/server/src/main.rs @@ -25,7 +25,7 @@ use sel4_logging::{LevelFilter, Logger, LoggerBuilder}; use sel4_microkit::{memory_region_symbol, protection_domain, var, Channel, Handler}; use sel4_shared_ring_buffer::{RingBuffer, RingBuffers}; use sel4_shared_ring_buffer_block_io::SharedRingBufferBlockIO; -use sel4_shared_ring_buffer_smoltcp::DeviceImpl; +use sel4_hal_adapters::smoltcp::phy::DeviceImpl; use microkit_http_server_example_server_core::run_server; diff --git a/crates/private/meta/Cargo.toml b/crates/private/meta/Cargo.toml index 8e658be45..12f58d3f6 100644 --- a/crates/private/meta/Cargo.toml +++ b/crates/private/meta/Cargo.toml @@ -24,6 +24,7 @@ sel4-bounce-buffer-allocator = { path = "../../sel4-bounce-buffer-allocator" } sel4-config = { path = "../../sel4/config" } sel4-immediate-sync-once-cell = { path = "../../sel4-immediate-sync-once-cell" } sel4-immutable-cell = { path = "../../sel4-immutable-cell" } +sel4-hal-adapters = { path = "../../sel4-hal-adapters" } sel4-logging = { path = "../../sel4-logging" } sel4-microkit = { path = "../../sel4-microkit", features = ["full"], optional = true } sel4-microkit-message = { path = "../../sel4-microkit/message", optional = true }