refactor: migrate server-framework to depend on libkos

This commit is contained in:
2026-10-19 00:55:54 +02:00
parent edc55d6f2e
commit a4315d7665
5 changed files with 8 additions and 8 deletions

View File

@@ -5,4 +5,4 @@ edition = "2024"
[dependencies]
types = { workspace = true }
userspace = { workspace = true }
libkos = { workspace = true }

View File

@@ -1,15 +1,15 @@
use types::bounded::CapSlot;
pub async fn send(endpoint: CapSlot, w0: usize, w1: usize, w2: usize, w3: usize) -> usize {
userspace::syscall::send(endpoint, w0, w1, w2, w3)
libkos::syscall::send(endpoint, w0, w1, w2, w3)
}
pub async fn receive(endpoint: CapSlot) -> (usize, usize, usize, usize) {
userspace::syscall::receive(endpoint)
libkos::syscall::receive(endpoint)
}
pub async fn wait_for_interrupt(_irq: CapSlot) {
userspace::syscall::yield_now();
libkos::syscall::yield_now();
}
pub async fn acknowledge_interrupt(_irq: CapSlot) {

View File

@@ -28,7 +28,7 @@ pub fn block_on<F: Future>(future: F) -> F::Output {
Poll::Ready(output) => return output,
Poll::Pending => {
#[cfg(not(test))]
userspace::syscall::yield_now();
libkos::syscall::yield_now();
}
}
}

View File

@@ -6,7 +6,7 @@ macro_rules! select {
) => {
{
let sources = types::syscall_abi::SYS_WAIT_ANY;
let wake = userspace::syscall::receive($ep as usize);
let wake = libkos::syscall::receive($ep as usize);
let $msg = wake;
$ipc_body
}

View File

@@ -12,11 +12,11 @@ pub trait Server {
fn run(&mut self, endpoint: CapSlot) {
loop {
let words = userspace::syscall::receive(endpoint);
let words = libkos::syscall::receive(endpoint);
if let Some(request) = Self::Request::decode([words.0, words.1, words.2, words.3]) {
let response = self.handle(request);
let encoded = response.encode();
userspace::syscall::send(endpoint, encoded[0], encoded[1], encoded[2], encoded[3]);
libkos::syscall::send(endpoint, encoded[0], encoded[1], encoded[2], encoded[3]);
}
}
}