Minor changes

Author: XorTroll

Makefile

@@ -1,7 +1,6 @@
 
 #.PHONY: all dev emuiibo emuiibo-dev sysmodule sysmodule-dev overlay emuiigen dist clean emuiibo-clean emuiigen-clean
 
-# We need to provide a custom target triple since the official tier 3 one doesn't provide crypto support
 TARGET_TRIPLE := aarch64-nintendo-switch-freestanding
 PROGRAM_ID := 0100000000000352
 

emuiibo.lst

@@ -3,4 +3,4 @@ build-std = ["core", "compiler_builtins", "alloc"]
 build-std-features = ["compiler-builtins-mem"]
 
 [target.aarch64-nintendo-switch-freestanding]
-rustflags = ["-Ctarget-feature=+aes,+sha2"]
+rustflags = ["-Ctarget-feature=+aes,+sha2", "--cfg", "aes_armv8"]

emuiibo/.cargo/config.toml

@@ -2,28 +2,21 @@
 name = "emuiibo"
 version = "1.1.1"
 authors = ["XorTroll"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
-#nx = { git = "https://github.com/pantsman0/nx", branch = "getting_ready_for_merge", features = [
-#    "services",
-#    "fs",
-#    "crypto",
-#    "input",
-#    "rand",
-#] }
-nx = { path = "/mnt/c/code/nx", features = ["services", "fs", "input", "rand"] }
+nx = { git = "https://github.com/aarch64-switch-rs/nx", features = ["services", "fs", "input", "rand"] }
 
 paste = "1.0"
 static_assertions = "1.1.0"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 atomic_enum = "0.3.0"
 generic_once_cell = { version = "0.1.1", default-features = false }
-aes = {version = "0.8.4", features = ["zeroize"] }
-ctr = {version = "0.9.2", features = ["zeroize"] }
+aes = { version = "0.8.4", features = ["zeroize"] }
+ctr = { version = "0.9.2", features = ["zeroize"] }
 hmac = "0.12.1"
-sha2 = {version = "0.10.9", default-features = false}
+sha2 = { version = "0.10.9", default-features = false }
 
 [package.metadata.nx.nsp.npdm]
 name = "emuiibo"

emuiibo/Cargo.lock

@@ -29,5 +29,4 @@ pub mod amiibo;
 
 pub mod area;
 
-
 pub use ipc::emu::{EmulationService, IEmulationServiceClient};

emuiibo/Cargo.toml

@@ -7,36 +7,41 @@ extern crate nx;
 #[macro_use]
 extern crate alloc;
 
-#[macro_use]
 extern crate emuiibo;
 
+use nx::diag;
 use nx::diag::abort;
 use nx::fs;
 use nx::ipc::server;
 use nx::result::*;
+use nx::svc;
+use nx::thread;
 use nx::util;
 
 use emuiibo::*;
 
 use core::panic;
-use core::ptr::addr_of_mut;
 
 rrt0_define_default_module_name!();
 
 const CUSTOM_HEAP_SIZE: usize = 0x8000;
 static mut CUSTOM_HEAP: [u8; CUSTOM_HEAP_SIZE] = [0; CUSTOM_HEAP_SIZE];
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[allow(static_mut_refs)]
 pub fn initialize_heap(_hbl_heap: util::PointerAndSize) -> util::PointerAndSize {
     unsafe {
         // SAFETY: CUSTOM_HEAP must only ever be referenced from here, and nowhere else.
-        util::PointerAndSize::new(addr_of_mut!(CUSTOM_HEAP) as _, CUSTOM_HEAP.len())
+        util::PointerAndSize::new(&raw mut CUSTOM_HEAP as _, CUSTOM_HEAP.len())
     }
 }
 
-#[no_mangle]
+use nx::diag::log::lm::LmLogger;
+use nx::diag::log::LogSeverity;
+
+#[unsafe(no_mangle)]
 pub fn main() -> Result<()> {
+    thread::set_current_thread_name("emuiibo.Main");
     fs::initialize_fspsrv_session()?;
     fs::mount_sd_card("sdmc")?;
     fsext::ensure_directories()?;