From 33c093e9d00ea92e70af652f22f66bc32e9fb184 Mon Sep 17 00:00:00 2001
From: Rafal Mielniczuk <rafal.mielniczuk2@gmail.com>
Date: Wed, 2 Oct 2024 23:35:21 +0100
Subject: [PATCH] Add midi player

Converts to wav form and sends to sound-daemon

doom lvl 1 midi file provided.
---
 Cargo.lock                                    |  52 ++++--
 Makefile                                      |   2 +-
 disk-scripts/install_os.sh                    |   4 +-
 sysroot/assets/D_E1M1.mid                     | Bin 0 -> 23322 bytes
 userspace/Cargo.lock                          |  93 ++++++++++-
 userspace/Cargo.toml                          |   2 +-
 userspace/playaudio/Cargo.toml                |  26 +++
 userspace/playaudio/src/playmidi/bin/main.rs  |  85 ++++++++++
 userspace/playaudio/src/playwav/bin/main.rs   |  56 +++++++
 userspace/playwav/Cargo.toml                  |  10 --
 userspace/playwav/src/main.rs                 | 158 ------------------
 .../sound-daemon/src/sound-daemon/bin/main.rs |   8 +-
 12 files changed, 306 insertions(+), 190 deletions(-)
 create mode 100644 sysroot/assets/D_E1M1.mid
 create mode 100644 userspace/playaudio/Cargo.toml
 create mode 100644 userspace/playaudio/src/playmidi/bin/main.rs
 create mode 100644 userspace/playaudio/src/playwav/bin/main.rs
 delete mode 100644 userspace/playwav/Cargo.toml
 delete mode 100644 userspace/playwav/src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index ca28d292..016c3f08 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -32,9 +32,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bit_field"
@@ -85,7 +85,7 @@ dependencies = [
  "bitmaps",
  "chrono",
  "downcast-rs",
- "hashbrown",
+ "hashbrown 0.15.0",
  "intrusive-collections",
  "lazy_static",
  "linked_list_allocator",
@@ -106,6 +106,18 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -116,6 +128,17 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "intrusive-collections"
 version = "0.9.7"
@@ -159,7 +182,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -182,9 +205,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "paste"
@@ -192,6 +218,12 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.20"
@@ -247,9 +279,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 
 [[package]]
 name = "raw-cpuid"
-version = "11.1.0"
+version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
  "bitflags",
 ]
@@ -280,9 +312,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Makefile b/Makefile
index 0912faa2..f5b3a67b 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ endif
 debug: $(disk)
 	#qemu-system-x86_64 -drive format=raw,file=$(iso) -serial stdio -no-reboot -s -S -smp cpus=4 -no-shutdown -netdev tap,helper=/usr/lib/qemu/qemu-bridge-helper,id=ck_net0 -device e1000,netdev=ck_net0,id=ck_nic0
 	#qemu-system-x86_64 -serial stdio -no-reboot -s -S -m 5811 -smp cpus=4 -no-shutdown -netdev user,id=mynet0,net=192.168.1.0/24,dhcpstart=192.168.1.128,hostfwd=tcp::4444-:80 -device e1000e,netdev=mynet0,id=ck_nic0 -drive format=raw,file=disk.img,if=none,id=test-img -device ich9-ahci,id=ahci -device ide-hd,drive=test-img,bus=ahci.0 -monitor /dev/stdout
-	qemu-system-x86_64 -serial stdio -no-reboot -s -S -m 5811 -smp cpus=4 -no-shutdown -netdev tap,helper=/usr/lib/qemu/qemu-bridge-helper,id=hn0 -device e1000,netdev=hn0,id=nic1 -drive format=raw,file=disk.img,if=none,id=test-img -device ich9-ahci,id=ahci -device ide-hd,drive=test-img,bus=ahci.0 -audio driver=pipewire,model=hda -monitor /dev/stdout -enable-kvm
+	qemu-system-x86_64 -serial stdio -no-reboot -s -S -m 5811 -smp cpus=4 -no-shutdown -netdev tap,helper=/usr/lib/qemu/qemu-bridge-helper,id=hn0 -device e1000,netdev=hn0,id=nic1 -drive format=raw,file=disk.img,if=none,id=test-img -device ich9-ahci,id=ahci -device ide-hd,drive=test-img,bus=ahci.0 -audio driver=pipewire,model=hda -monitor /dev/stdout
 
 gdb:
 	@rust-gdb "$(kernel)" -ex "target remote :1234"
diff --git a/disk-scripts/install_os.sh b/disk-scripts/install_os.sh
index 426ca893..ebdfc222 100755
--- a/disk-scripts/install_os.sh
+++ b/disk-scripts/install_os.sh
@@ -32,7 +32,7 @@ fi
 sudo umount mnt
 
 PROGS="test testcpp hello stack nyancat ttytest fork poweroff stat fbdoom doom1.wad open_sleep"
-RUST_PROGS="init shell mount umount unixsocket-server unixsocket-client forktest mprotecttest playwav threads sound-daemon"
+RUST_PROGS="init shell mount umount unixsocket-server unixsocket-client forktest mprotecttest playwav playmidi threads sound-daemon"
 
 sudo mount /dev/loop0p2 mnt
 sudo chown -R $USER:$USER mnt
@@ -47,6 +47,8 @@ for prog in $RUST_PROGS; do
 done
 
 cp sysroot/assets/imperial.wav mnt/
+cp sysroot/assets/D_E1M1.mid mnt/
+cp sysroot/assets/FluidR3_GM.sf2 mnt/
 
 rsync -a sysroot/cykusz/usr mnt/
 rsync -a sysroot/cykusz/etc mnt/
diff --git a/sysroot/assets/D_E1M1.mid b/sysroot/assets/D_E1M1.mid
new file mode 100644
index 0000000000000000000000000000000000000000..bfd6eb116edb2d6c44325bc285a60f47e88ecc78
GIT binary patch
literal 23322
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%0A9|>M=`Cg-&muvBAE$(+D$LfFZa{bJEsUMz6
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
U&LQ9Qqrd5cd_I>hf1S+!5AU~Sr2qf`

literal 0
HcmV?d00001

diff --git a/userspace/Cargo.lock b/userspace/Cargo.lock
index 54401ad5..240b3196 100644
--- a/userspace/Cargo.lock
+++ b/userspace/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -14,6 +14,12 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
+[[package]]
+name = "bytemuck"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+
 [[package]]
 name = "chrono"
 version = "0.4.38"
@@ -54,13 +60,45 @@ dependencies = [
 ]
 
 [[package]]
-name = "playwav"
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "playaudio"
 version = "0.1.0"
 dependencies = [
+ "rustysynth",
  "syscall-defs",
  "syscall-user",
+ "wavers",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
 ]
 
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rustysynth"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bff572eb558d73c5f5e0fd82c19dd82bb010234d2a65d54f52e93da5856241c7"
+
 [[package]]
 name = "shell"
 version = "0.1.0"
@@ -78,6 +116,17 @@ dependencies = [
  "syscall-user",
 ]
 
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "syscall-defs"
 version = "0.1.0"
@@ -101,6 +150,26 @@ dependencies = [
  "syscall-user",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "umount"
 version = "0.1.0"
@@ -109,6 +178,12 @@ dependencies = [
  "syscall-user",
 ]
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
 [[package]]
 name = "unixsockets"
 version = "0.1.0"
@@ -116,3 +191,15 @@ dependencies = [
  "syscall-defs",
  "syscall-user",
 ]
+
+[[package]]
+name = "wavers"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab501e9e5b13446d3a6e846de0c190c96b85ca3eced3bd00460edc67654500c8"
+dependencies = [
+ "bytemuck",
+ "num-traits",
+ "paste",
+ "thiserror",
+]
diff --git a/userspace/Cargo.toml b/userspace/Cargo.toml
index 07a668d1..64579ce7 100644
--- a/userspace/Cargo.toml
+++ b/userspace/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
 resolver = "2"
-members = ["init", "shell", "mount", "umount", "syscall-user", "unixsockets", "testprogs", "playwav", "sound-daemon"]
\ No newline at end of file
+members = ["init", "shell", "mount", "umount", "syscall-user", "unixsockets", "testprogs", "playaudio", "sound-daemon"]
\ No newline at end of file
diff --git a/userspace/playaudio/Cargo.toml b/userspace/playaudio/Cargo.toml
new file mode 100644
index 00000000..e9eb5238
--- /dev/null
+++ b/userspace/playaudio/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "playaudio"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "playwav"
+test = false
+bench = false
+path = "src/playwav/bin/main.rs"
+
+[[bin]]
+name = "playmidi"
+test = false
+bench = false
+path = "src/playmidi/bin/main.rs"
+
+[dependencies]
+rustysynth = "*"
+wavers = "*"
+
+[dependencies.syscall-defs]
+path = "../../syscall-defs"
+
+[dependencies.syscall-user]
+path = "../syscall-user"
diff --git a/userspace/playaudio/src/playmidi/bin/main.rs b/userspace/playaudio/src/playmidi/bin/main.rs
new file mode 100644
index 00000000..62702f4d
--- /dev/null
+++ b/userspace/playaudio/src/playmidi/bin/main.rs
@@ -0,0 +1,85 @@
+use rustysynth::{MidiFile, MidiFileSequencer, SoundFont, Synthesizer, SynthesizerSettings};
+use std::fs::File;
+use std::io::Write;
+use std::os::unix::net::UnixStream;
+use std::process::ExitCode;
+use std::sync::Arc;
+use wavers::Samples;
+
+fn main() -> Result<(), ExitCode> {
+    let mut args = std::env::args();
+
+    if args.len() < 3 {
+        println!("Usage: playmidi <soundfont> <midi>");
+        return Err(ExitCode::FAILURE);
+    }
+    args.next();
+
+    let soundfont_path = args.next().unwrap();
+    let midi_path = args.next().unwrap();
+
+    println!("soundfont: {soundfont_path}, midi: {midi_path}");
+
+    let mut sf2 = File::open(soundfont_path).unwrap();
+    let sound_font = Arc::new(SoundFont::new(&mut sf2).unwrap());
+
+    println!("Creating sequencer...");
+
+    // Create the MIDI file sequencer.
+    let settings = SynthesizerSettings::new(44100);
+    let synthesizer = Synthesizer::new(&sound_font, &settings).unwrap();
+    let mut sequencer = MidiFileSequencer::new(synthesizer);
+
+    println!("Loading midi...");
+
+    // Load the MIDI file.
+    let mut mid = File::open(midi_path).unwrap();
+    let midi_file = Arc::new(MidiFile::new(&mut mid).unwrap());
+
+    println!("Sequencer play...");
+
+    sequencer.play(&midi_file, false);
+
+    // The output buffer.
+    let sample_count = (settings.sample_rate as f64 * midi_file.get_length()) as usize;
+    let mut left: Vec<f32> = vec![0_f32; sample_count];
+    let mut right: Vec<f32> = vec![0_f32; sample_count];
+
+    println!("Render waveform {} {}", left.len(), right.len());
+
+    // Render the waveform.
+    sequencer.render(&mut left, &mut right);
+
+    println!("Convert...");
+
+    let left: Samples<i16> = wavers::Samples::from(left).convert();
+    let right: Samples<i16> = wavers::Samples::from(right).convert();
+
+    println!("Collect...");
+
+    let both = left
+        .iter()
+        .zip(right.iter())
+        .map(|(a, b)| (*a, *b))
+        .collect::<Vec<(i16, i16)>>();
+
+    println!("Send...");
+
+    let mut socket = UnixStream::connect("/sound-daemon.pid").map_err(|_e| ExitCode::from(3))?;
+
+    let buf = unsafe { std::slice::from_raw_parts(both.as_ptr() as *const u8, both.len() * 4) };
+
+    let mut written = 0;
+    loop {
+        let n = socket
+            .write(&buf[written..])
+            .map_err(|_e| ExitCode::from(4))?;
+        written += n;
+        if written == buf.len() {
+            break;
+        }
+    }
+    println!("write finished");
+
+    Ok(())
+}
diff --git a/userspace/playaudio/src/playwav/bin/main.rs b/userspace/playaudio/src/playwav/bin/main.rs
new file mode 100644
index 00000000..82b0a5cf
--- /dev/null
+++ b/userspace/playaudio/src/playwav/bin/main.rs
@@ -0,0 +1,56 @@
+#![feature(seek_stream_len)]
+#![feature(raw_ref_op)]
+
+use std::io::{Seek, Write};
+use std::os::fd::AsRawFd;
+use std::os::unix::net::UnixStream;
+use std::process::ExitCode;
+use std::ptr::slice_from_raw_parts;
+use syscall_defs::{MMapFlags, MMapProt};
+
+fn send_to_daemon(song: &str) -> Result<(), ExitCode> {
+    let mut wav = std::fs::File::open(song).map_err(|_e| ExitCode::from(1))?;
+    let wav_size = wav.stream_len().map_err(|_e| ExitCode::from(2))? as usize;
+
+    let wav_map = syscall_user::mmap(
+        None,
+        wav_size,
+        MMapProt::PROT_READ,
+        MMapFlags::MAP_PRIVATE,
+        Some(wav.as_raw_fd() as usize),
+        0,
+    )
+    .map_err(|_e| ExitCode::from(1))?;
+
+    let buf = unsafe { &*slice_from_raw_parts(wav_map as *const u8, wav_size) };
+
+    let mut socket = UnixStream::connect("/sound-daemon.pid").map_err(|_e| ExitCode::from(3))?;
+
+    //println!("writing {} bytes", buf.len());
+    let mut written = 0;
+    loop {
+        let n = socket
+            .write(&buf[written..])
+            .map_err(|_e| ExitCode::from(4))?;
+        written += n;
+        if written == buf.len() {
+            break;
+        }
+    }
+    println!("write finished");
+
+    Ok(())
+}
+
+fn main() -> Result<(), ExitCode> {
+    let mut args = std::env::args();
+
+    if args.len() < 2 {
+        println!("Usage: playwav <wav file path>");
+        return Err(ExitCode::from(1));
+    }
+    args.next();
+
+    let file = args.next().unwrap();
+    Ok(send_to_daemon(file.as_str())?)
+}
diff --git a/userspace/playwav/Cargo.toml b/userspace/playwav/Cargo.toml
deleted file mode 100644
index ef11d9e2..00000000
--- a/userspace/playwav/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "playwav"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies.syscall-defs]
-path = "../../syscall-defs"
-
-[dependencies.syscall-user]
-path = "../syscall-user"
diff --git a/userspace/playwav/src/main.rs b/userspace/playwav/src/main.rs
deleted file mode 100644
index eb56a968..00000000
--- a/userspace/playwav/src/main.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-#![feature(seek_stream_len)]
-#![feature(raw_ref_op)]
-
-use std::io::{Seek, Write};
-use std::os::fd::AsRawFd;
-use std::os::unix::net::UnixStream;
-use std::process::ExitCode;
-use std::ptr::{slice_from_raw_parts, slice_from_raw_parts_mut};
-use syscall_defs::{MMapFlags, MMapProt};
-
-fn play(song: &str) -> Result<(), ExitCode> {
-    let mut wav = std::fs::File::open(song).map_err(|_e| ExitCode::from(1))?;
-
-    let wav_size = wav.stream_len().map_err(|_e| ExitCode::from(2))? as usize;
-
-    let hda_dev = std::fs::File::open("/dev/hda").map_err(|_e| ExitCode::from(3))?;
-
-    let hda_map = syscall_user::mmap(
-        None,
-        2048 * 32 + 4096,
-        MMapProt::PROT_READ | MMapProt::PROT_WRITE,
-        MMapFlags::MAP_SHARED,
-        Some(hda_dev.as_raw_fd() as usize),
-        0,
-    )
-    .map_err(|_e| ExitCode::from(4))?;
-
-    let wav_map = syscall_user::mmap(
-        None,
-        wav_size,
-        MMapProt::PROT_READ,
-        MMapFlags::MAP_PRIVATE,
-        Some(wav.as_raw_fd() as usize),
-        0,
-    )
-    .map_err(|_e| ExitCode::from(4))?;
-
-    for addr in (wav_map..wav_map + wav_size).step_by(4096) {
-        let _ = unsafe {
-            // prefault to read the file into memory
-            (addr as *const u64).read_volatile()
-        };
-    }
-
-    //println!("file size: {}", wav_size);
-
-    let get_current_hda_block =
-        || unsafe { (hda_map as *const u64).offset(4).read_volatile() as usize / 2048 };
-
-    let mut file_block = 0;
-    let buf_block_count = 32;
-
-    let wav_data = unsafe { &*slice_from_raw_parts((wav_map + 44) as *const u8, wav_size - 44) };
-    let hda_data =
-        unsafe { &mut *slice_from_raw_parts_mut((hda_map + 4096) as *mut u8, 2048 * 32) };
-
-    let mut wp_block = (get_current_hda_block() + 6) % buf_block_count;
-
-    while file_block * 2048 < wav_data.len() {
-        let rem = wav_data.len() - (file_block * 2048);
-
-        let chunk = std::cmp::min(rem, 2048);
-
-        while ((get_current_hda_block() + 3) % buf_block_count) != wp_block {
-            // yield cpu for other tasks
-            let _ = syscall_user::yield_execution();
-        }
-
-        hda_data[wp_block * 2048..wp_block * 2048 + chunk]
-            .copy_from_slice(&wav_data[file_block * 2048..file_block * 2048 + chunk]);
-
-        wp_block = (wp_block + 1) % buf_block_count;
-        file_block += 1;
-    }
-
-    while get_current_hda_block() != wp_block {
-        // yield cpu for other tasks
-        let _ = syscall_user::yield_execution();
-    }
-
-    hda_data.fill(0); //silence
-
-    Ok(())
-}
-
-fn send_to_daemon(song: &str) -> Result<(), ExitCode> {
-    let mut wav = std::fs::File::open(song).map_err(|_e| ExitCode::from(1))?;
-    let wav_size = wav.stream_len().map_err(|_e| ExitCode::from(2))? as usize;
-
-    let wav_map = syscall_user::mmap(
-        None,
-        wav_size,
-        MMapProt::PROT_READ,
-        MMapFlags::MAP_PRIVATE,
-        Some(wav.as_raw_fd() as usize),
-        0,
-    )
-    .map_err(|_e| ExitCode::from(1))?;
-
-    let buf = unsafe { &*slice_from_raw_parts(wav_map as *const u8, wav_size) };
-
-    let mut socket = UnixStream::connect("/sound-daemon.pid").map_err(|_e| ExitCode::from(3))?;
-
-    //println!("writing {} bytes", buf.len());
-    let mut written = 0;
-    loop {
-        let n = socket
-            .write(&buf[written..])
-            .map_err(|_e| ExitCode::from(4))?;
-        written += n;
-        if written == buf.len() {
-            break;
-        }
-    }
-    println!("write finished");
-
-    Ok(())
-}
-
-fn main() -> Result<(), ExitCode> {
-    let mut args = std::env::args();
-
-    if args.len() < 2 {
-        println!("Usage: playwav [-d] <dest dir path>");
-        return Err(ExitCode::from(1));
-    }
-
-    args.next();
-    let mut daemonize = false;
-
-    let mut file = args.next().unwrap();
-    if let Some(arg2) = args.next() {
-        if file == "-d" {
-            daemonize = true;
-            file = arg2;
-        }
-    }
-
-    if !daemonize {
-        return Ok(send_to_daemon(file.as_str())?);
-    }
-
-    let daemon = syscall_user::fork().expect("fork failed");
-
-    if daemon > 0 {
-        return Ok(());
-    }
-
-    let _sid = syscall_user::setsid().expect("setsid failed");
-
-    syscall_user::chdir("/").expect("chdir failed");
-
-    syscall_user::close(0).expect("close 0 faield");
-    syscall_user::close(1).expect("close 1 faield");
-    syscall_user::close(2).expect("close 2 faield");
-
-    Ok(play(file.as_str())?)
-}
diff --git a/userspace/sound-daemon/src/sound-daemon/bin/main.rs b/userspace/sound-daemon/src/sound-daemon/bin/main.rs
index ce21e1d6..8105c3f4 100644
--- a/userspace/sound-daemon/src/sound-daemon/bin/main.rs
+++ b/userspace/sound-daemon/src/sound-daemon/bin/main.rs
@@ -38,9 +38,7 @@ impl SoundChunk {
     }
 
     fn as_bytes_mut(&mut self) -> &mut [u8; 2048] {
-        unsafe {
-            std::mem::transmute::<&mut [i16; 1024], &mut [u8; 2048]>(&mut self.0)
-        }
+        unsafe { std::mem::transmute::<&mut [i16; 1024], &mut [u8; 2048]>(&mut self.0) }
     }
 }
 
@@ -190,9 +188,7 @@ fn sound_daemon() -> Result<(), ExitCode> {
 
     loop {
         let mut polls = output.poll_fds();
-        if let Ok(res) =
-            syscall_user::poll(polls.as_mut_slice(), 0)
-        {
+        if let Ok(res) = syscall_user::poll(polls.as_mut_slice(), 0) {
             if res > 0 {
                 for (id, ev) in polls.iter().enumerate() {
                     if id == 0 && ev.revents.contains(PollEventFlags::READ) {