Rust XHCI scaffolding

rust/Cargo.lock

@@ -161,7 +161,7 @@ version = "0.1.0"
 dependencies = [
  "mammoth",
  "victoriafalls",
- "voyageurs",
+ "voyageurs_client",
  "yellowstone-yunq",
 ]
 
@@ -192,6 +192,13 @@ dependencies = [
 [[package]]
 name = "voyageurs"
 version = "0.1.0"
+dependencies = [
+ "mammoth",
+]
+
+[[package]]
+name = "voyageurs_client"
+version = "0.1.0"
 dependencies = [
  "mammoth",
  "yellowstone-yunq",
@@ -206,7 +213,6 @@ dependencies = [
  "denali_client",
  "mammoth",
  "victoriafalls",
- "voyageurs",
  "yellowstone-yunq",
  "yunq",
 ]

rust/Cargo.toml

@@ -1,15 +1,18 @@
 [workspace]
 
 members = [
-  "lib/client/denali_client", "lib/fs/ext2",
-  "lib/mammoth", "lib/pci",
-  "lib/voyageurs",
+    "lib/client/denali_client",
+    "lib/client/voyageurs_client",
+    "lib/fs/ext2",
+    "lib/mammoth",
+    "lib/pci",
     "lib/yellowstone",
     "lib/yunq",
     "lib/yunq-test",
     "sys/denali",
     "sys/teton",
     "sys/victoriafalls",
+    "sys/voyageurs",
     "sys/yellowstone",
     "usr/testbed",
 ]

rust/lib/client/voyageurs_client/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "voyageurs_client"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+mammoth = { path = "../../mammoth" }
+yellowstone-yunq = { path = "../../yellowstone" }
+yunq = { path = "../../yunq" }
+
+[build-dependencies]
+yunqc = { path = "../../../../yunq/rust" }

rust/lib/client/voyageurs_client/build.rs

@@ -1,7 +1,7 @@
 use std::fs;
 
 fn main() {
-    let input_file = "../../../sys/voyageurs/lib/voyageurs/voyageurs.yunq";
+    let input_file = "../../../../sys/voyageurs/lib/voyageurs/voyageurs.yunq";
 
     println!("cargo::rerun-if-changed={input_file}");
 

rust/lib/voyageurs/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "voyageurs"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-mammoth = { path = "../mammoth" }
-yellowstone-yunq = { path = "../yellowstone" }
-yunq = {path = "../yunq"}
-
-[build-dependencies]
-yunqc = {path = "../../../yunq/rust"}
-

rust/sys/teton/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 [dependencies]
 mammoth = { path = "../../lib/mammoth" }
 victoriafalls = { path = "../victoriafalls" }
-voyageurs = { path = "../../lib/voyageurs" }
+voyageurs_client = { path = "../../lib/client/voyageurs_client/" }
 yellowstone-yunq = { path = "../../lib/yellowstone" }

rust/sys/teton/src/main.rs

@@ -9,7 +9,7 @@ mod psf;
 mod terminal;
 
 use mammoth::{debug, define_entry, zion::z_err_t};
-use voyageurs::listener;
+use voyageurs_client::listener;
 
 define_entry!();
 

rust/sys/teton/src/terminal.rs

@@ -6,7 +6,7 @@ use alloc::{
     string::{String, ToString},
 };
 use victoriafalls::dir;
-use voyageurs::listener::KeyboardHandler;
+use voyageurs_client::listener::KeyboardHandler;
 
 pub struct Terminal {
     console: Console,

rust/sys/voyageurs/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "voyageurs"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+mammoth = { path = "../../lib/mammoth/" }

rust/sys/voyageurs/src/main.rs

@@ -0,0 +1,14 @@
+#![no_std]
+#![no_main]
+
+extern crate alloc;
+
+use mammoth::{debug, define_entry, zion::z_err_t};
+
+define_entry!();
+
+#[unsafe(no_mangle)]
+extern "C" fn main() -> z_err_t {
+    debug!("In Voyageurs");
+    0
+}

rust/sys/yellowstone/Cargo.toml

@@ -7,6 +7,5 @@ edition = "2021"
 mammoth = { path = "../../lib/mammoth" }
 denali_client = { path = "../../lib/client/denali_client" }
 victoriafalls = { path = "../victoriafalls" }
-voyageurs = { path = "../../lib/voyageurs" }
 yellowstone-yunq = { path = "../../lib/yellowstone" }
 yunq = { path = "../../lib/yunq" }