diff --git a/crates/console/prometeu-hal/src/cartridge.rs b/crates/console/prometeu-hal/src/cartridge.rs index d850645b..1d5f2b76 100644 --- a/crates/console/prometeu-hal/src/cartridge.rs +++ b/crates/console/prometeu-hal/src/cartridge.rs @@ -71,7 +71,6 @@ pub enum Capability { None, System, Gfx, - Input, Audio, Fs, Log, diff --git a/crates/console/prometeu-hal/src/cartridge_loader.rs b/crates/console/prometeu-hal/src/cartridge_loader.rs index babf88a9..d114ee59 100644 --- a/crates/console/prometeu-hal/src/cartridge_loader.rs +++ b/crates/console/prometeu-hal/src/cartridge_loader.rs @@ -99,7 +99,6 @@ fn normalize_capabilities(capabilities: &[Capability]) -> Result caps::NONE, Capability::System => caps::SYSTEM, Capability::Gfx => caps::GFX, - Capability::Input => caps::INPUT, Capability::Audio => caps::AUDIO, Capability::Fs => caps::FS, Capability::Log => caps::LOG, @@ -196,11 +195,11 @@ mod tests { #[test] fn load_with_multiple_capabilities_combines_flags() { - let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["gfx", "input"]))); + let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["gfx", "audio"]))); let cartridge = DirectoryCartridgeLoader::load(dir.path()).expect("cartridge must load"); - assert_eq!(cartridge.capabilities, caps::GFX | caps::INPUT); + assert_eq!(cartridge.capabilities, caps::GFX | caps::AUDIO); } #[test] @@ -238,4 +237,13 @@ mod tests { assert!(matches!(error, CartridgeError::InvalidManifest)); } + + #[test] + fn load_with_legacy_input_capability_fails() { + let dir = TestCartridgeDir::new(manifest_with_capabilities(Some(vec!["input"]))); + + let error = DirectoryCartridgeLoader::load(dir.path()).unwrap_err(); + + assert!(matches!(error, CartridgeError::InvalidManifest)); + } } diff --git a/crates/console/prometeu-hal/src/syscalls/caps.rs b/crates/console/prometeu-hal/src/syscalls/caps.rs index 109f25ce..3230b1ce 100644 --- a/crates/console/prometeu-hal/src/syscalls/caps.rs +++ b/crates/console/prometeu-hal/src/syscalls/caps.rs @@ -3,10 +3,9 @@ use super::CapFlags; pub const NONE: CapFlags = 0; pub const SYSTEM: CapFlags = 1 << 0; pub const GFX: CapFlags = 1 << 1; -pub const INPUT: CapFlags = 1 << 2; -pub const AUDIO: CapFlags = 1 << 3; -pub const FS: CapFlags = 1 << 4; -pub const LOG: CapFlags = 1 << 5; -pub const ASSET: CapFlags = 1 << 6; -pub const BANK: CapFlags = 1 << 7; -pub const ALL: CapFlags = SYSTEM | GFX | INPUT | AUDIO | FS | LOG | ASSET | BANK; +pub const AUDIO: CapFlags = 1 << 2; +pub const FS: CapFlags = 1 << 3; +pub const LOG: CapFlags = 1 << 4; +pub const ASSET: CapFlags = 1 << 5; +pub const BANK: CapFlags = 1 << 6; +pub const ALL: CapFlags = SYSTEM | GFX | AUDIO | FS | LOG | ASSET | BANK;