From a4315d766520886549da5552b6c5f05591ac7dd5 Mon Sep 17 00:00:00 2001
From: Gabriel Kaszewski <gabrielkaszewski@gmail.com>
Date: Mon, 19 Oct 2026 00:55:54 +0200
Subject: [PATCH] refactor: migrate server-framework to depend on libkos

---
 crates/server-framework/Cargo.toml               | 2 +-
 crates/server-framework/src/async_syscall/mod.rs | 6 +++---
 crates/server-framework/src/executor/mod.rs      | 2 +-
 crates/server-framework/src/select/mod.rs        | 2 +-
 crates/server-framework/src/server/mod.rs        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/server-framework/Cargo.toml b/crates/server-framework/Cargo.toml
index 53c8f54..1fe9a5b 100644
--- a/crates/server-framework/Cargo.toml
+++ b/crates/server-framework/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2024"
 
 [dependencies]
 types = { workspace = true }
-userspace = { workspace = true }
+libkos = { workspace = true }
diff --git a/crates/server-framework/src/async_syscall/mod.rs b/crates/server-framework/src/async_syscall/mod.rs
index c9e90b8..6531460 100644
--- a/crates/server-framework/src/async_syscall/mod.rs
+++ b/crates/server-framework/src/async_syscall/mod.rs
@@ -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) {
diff --git a/crates/server-framework/src/executor/mod.rs b/crates/server-framework/src/executor/mod.rs
index cde7fb4..1dec2fb 100644
--- a/crates/server-framework/src/executor/mod.rs
+++ b/crates/server-framework/src/executor/mod.rs
@@ -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();
             }
         }
     }
diff --git a/crates/server-framework/src/select/mod.rs b/crates/server-framework/src/select/mod.rs
index e0d8cd2..db50465 100644
--- a/crates/server-framework/src/select/mod.rs
+++ b/crates/server-framework/src/select/mod.rs
@@ -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
         }
diff --git a/crates/server-framework/src/server/mod.rs b/crates/server-framework/src/server/mod.rs
index 0e02968..238c22f 100644
--- a/crates/server-framework/src/server/mod.rs
+++ b/crates/server-framework/src/server/mod.rs
@@ -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]);
             }
         }
     }