Feature/nx

.dockerignore

@@ -0,0 +1,5 @@
+*target/
+*build/
+.github/
+docs/
+*Dockerfile

.github/workflows/rust.yml

@@ -56,4 +56,8 @@ jobs:
       run: cargo make libretro_desktop
 
     - name: Build libretro android
-      run: cargo make libretro_android
+      run: cargo make libretro_android
+
+    - name: Build nintendo switch
+      if: ${{ matrix.os == 'ubuntu-latest' }}  # This fails on windows since it does not have docker installed
+      run: cargo make nx

.gitignore

@@ -7,6 +7,7 @@ Dependencies/
 *.bmp
 *.img
 *.txt
+build/
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

Cargo.toml

@@ -6,7 +6,8 @@ members = [
     "core",
     "rpi",
     "common", 
-    "libretro"
+    "libretro",
+    "nx"
 ]
 
 [workspace.package]

Makefile.toml

@@ -45,7 +45,7 @@ install_crate_args=["--locked", "--version", "0.2.5"]
 command = "cross"
 args = ["build", "--release", "--target", "armv7-unknown-linux-gnueabihf", "--bin", "rpios","--no-default-features", "--features", "os"]
 
-[tasks.pre-rpibm]
+[tasks.nightly-install]
 command = "rustup"
 args = ["toolchain", "install", "--profile", "minimal", "--no-self-update", "${nightly_version}"]
 
@@ -55,7 +55,7 @@ install_crate = "cargo-binutils"
 install_crate_args=["--locked", "--version", "0.3.6"]
 command = "rust-objcopy"
 args = ["target/armv7a-none-eabihf/release/baremetal", "-O", "binary", "kernel7.img"]
-dependencies = ["pre-rpibm", "build_rpi_baremetal","install_llvm_tools"]
+dependencies = ["nightly-install", "build_rpi_baremetal","install_llvm_tools"]
 
 [tasks.build_rpi_baremetal]
 toolchain = "${nightly_version}"
@@ -85,4 +85,8 @@ dependencies = ["add_android_target"]
 
 [tasks.add_android_target]
 command = "rustup"
-args = ["target", "add", "aarch64-linux-android"]
+args = ["target", "add", "aarch64-linux-android"]
+
+[tasks.nx]
+command = "docker"
+args = ["build", ".", "--file", "nx/Dockerfile", "--target", "export", "--output=.", "--build-arg", "NIGHTLY=${nightly_version}"]

README.md

@@ -10,7 +10,7 @@ Install `cargo-make`
 ```sh
 cargo install cargo-make
 ```
-verify you have docker or podman installed 
+Verify you have cmake and docker or podman installed
 
 ### Desktop
 

common/Cargo.toml

@@ -15,8 +15,9 @@ fern = {version = "0.6", optional = true}
 chrono = {version = "0.4", optional = true}
 
 [features]
-std = ["chrono", "fern", "crossbeam-channel"]
+std = ["chrono", "fern", "crossbeam-channel", "alloc"]
 dbg = ["std"]
+alloc = []
 
 [dev-dependencies]
 criterion = "0.3"

common/src/audio/audio_resampler.rs

@@ -1,3 +1,5 @@
+use alloc::{string::String, vec::Vec};
+
 use magenboy_core::apu::audio_device::{Sample, AudioDevice, StereoSample, BUFFER_SIZE};
 
 pub trait AudioResampler{

common/src/audio/manual_audio_resampler.rs

@@ -1,6 +1,8 @@
+use alloc::vec::Vec;
+
 use magenboy_core::apu::audio_device::{BUFFER_SIZE, StereoSample};
-use super::audio_resampler::AudioResampler;
 
+use super::audio_resampler::AudioResampler;
 
 pub struct ManualAudioResampler{
     to_skip:u32,
@@ -17,9 +19,11 @@ impl AudioResampler for ManualAudioResampler{
         // Calling round in order to get the nearest integer and resample as precise as possible
         let div = original_frequency as f32 /  target_frequency as f32;
 
-        let lower_to_skip = div.floor() as u32;
-        let upper_to_skip = div.ceil() as u32;
-        let mut reminder = div.fract();
+        // Sicne we dont have many f32 methods without std we are implementing them ourself
+        let lower_to_skip = div as u32;     // Acts as f32::floor (since inputs are unsigned)
+        let upper_to_skip = ((original_frequency as f32 + target_frequency as f32 - 1.0) / target_frequency as f32) as u32;     // Acts as f32::ceil
+        let mut reminder = div - (div as u32 as f32);       // Acts as f32::fracts (since inputs are unsigned)
+
         let (to_skip, alt_to_skip) = if reminder < 0.5{
             (lower_to_skip, upper_to_skip)
         }
@@ -29,7 +33,7 @@ impl AudioResampler for ManualAudioResampler{
         };
 
         if lower_to_skip == 0{
-            std::panic!("target freqency is too high: {}", target_frequency);
+            core::panic!("target freqency is too high: {}", target_frequency);
         }
 
         ManualAudioResampler{

common/src/lib.rs

@@ -4,14 +4,19 @@ cfg_if::cfg_if!{ if #[cfg(feature = "std")] {
     pub mod mbc_handler;
     pub mod mpmc_gfx_device;
     pub mod logging;
+    pub mod initialization;
+    pub use initialization::*;
+}}
+
+cfg_if::cfg_if!{ if #[cfg(feature = "alloc")] {
+    extern crate alloc;
+
     pub mod audio{
         mod audio_resampler;
         mod manual_audio_resampler;
         pub use audio_resampler::*;
         pub use manual_audio_resampler::*;
     }
-    pub mod initialization;
-    pub use initialization::*;
 }}
 
 pub mod menu;

nx/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "magenboy_nx"
+edition.workspace = true
+version.workspace = true
+authors.workspace = true
+rust-version.workspace = true
+
+[lib]
+crate-type = ["staticlib"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+magenboy_core = { path = "../core", features = ["apu"] }
+magenboy_common = { path = "../common", features = ["alloc"] }
+log = "0.4"

nx/Dockerfile

@@ -0,0 +1,36 @@
+# We are installing the Rust toolchain so the version does not matter
+FROM rust:latest AS builder
+
+# Nightly version - entered as a build argument
+ARG NIGHTLY
+
+# Build the Rust crate for the Nintendo Switch target
+RUN rustup toolchain install ${NIGHTLY}
+RUN rustup +${NIGHTLY} component add rust-src
+
+# Set the working directory
+WORKDIR /magenboy
+
+# Copy source files
+COPY . .
+
+RUN cargo +${NIGHTLY} build --release --package magenboy_nx --target aarch64-nintendo-switch-freestanding \
+    -Z build-std=core,compiler_builtins,alloc -Z build-std-features=compiler-builtins-mem
+
+# Use the devkitpro/devkita64 image for the second stage
+FROM devkitpro/devkita64 AS final
+
+# Set the working directory for the C code
+WORKDIR /magenboy_nx
+
+# Copy the C source files and Makefile
+COPY nx/Makefile ./
+COPY nx/src ./src
+
+# Copy the built Rust library from the builder stage
+COPY --from=builder /magenboy/target/ ./target/
+
+RUN make --always-make
+
+FROM scratch AS export
+COPY --from=final /magenboy_nx/build/ /build