Use audiohw: instead of hda:

src/main.rs

@@ -20,7 +20,7 @@ fn from_syscall_error(error: syscall::Error) -> io::Error {
 
 extern "C" fn sigusr_handler(_sig: usize) {}
 
-fn thread(scheme: Arc<Mutex<AudioScheme>>, pid: usize, mut hda_file: fs::File) -> io::Result<()> {
+fn thread(scheme: Arc<Mutex<AudioScheme>>, pid: usize, mut hw_file: fs::File) -> io::Result<()> {
     // Enter null namespace
     syscall::setrens(0, 0).map_err(from_syscall_error)?;
 
@@ -36,12 +36,12 @@ fn thread(scheme: Arc<Mutex<AudioScheme>>, pid: usize, mut hda_file: fs::File) -
         // Wake up the scheme thread
         syscall::kill(pid, SIGUSR1).map_err(from_syscall_error)?;
 
-        hda_file.write(&buffer_u8)?;
+        hw_file.write(&buffer_u8)?;
     }
 }
 
 fn daemon(daemon: Daemon) -> io::Result<()> {
-    // Handle signals from the hda thread
+    // Handle signals from the hw thread
     syscall::sigaction(SIGUSR1, Some(&SigAction {
         sa_handler: Some(sigusr_handler),
         sa_mask: [0; 2],
@@ -50,7 +50,7 @@ fn daemon(daemon: Daemon) -> io::Result<()> {
 
     let pid = syscall::getpid().map_err(from_syscall_error)?;
 
-    let hda_file = fs::OpenOptions::new().write(true).open("hda:")?;
+    let hw_file = fs::OpenOptions::new().write(true).open("audiohw:")?;
 
     let mut scheme_file = fs::OpenOptions::new().create(true).read(true).write(true).open(":audio")?;
 
@@ -58,7 +58,7 @@ fn daemon(daemon: Daemon) -> io::Result<()> {
 
     // Spawn a thread to mix and send audio data
     let scheme_thread = scheme.clone();
-    let _thread = thread::spawn(move || thread(scheme_thread, pid, hda_file));
+    let _thread = thread::spawn(move || thread(scheme_thread, pid, hw_file));
 
     // Enter the null namespace - done after thread is created so
     // memory: can be accessed for stack allocation

src/scheme.rs

@@ -3,8 +3,8 @@ use syscall::error::{EBADF, EWOULDBLOCK, Error, Result};
 use syscall::flag::O_NONBLOCK;
 use syscall::scheme::SchemeBlockMut;
 
-// The strict buffer size of the hda: driver
-const HDA_BUFFER_SIZE: usize = 512;
+// The strict buffer size of the audiohw: driver
+const HW_BUFFER_SIZE: usize = 512;
 // The desired buffer size of each handle
 const HANDLE_BUFFER_SIZE: usize = 4096;
 
@@ -26,8 +26,8 @@ impl AudioScheme {
         }
     }
 
-    pub fn buffer(&mut self) -> [(i16, i16); HDA_BUFFER_SIZE] {
-        let mut buffer = [(0i16, 0i16); HDA_BUFFER_SIZE];
+    pub fn buffer(&mut self) -> [(i16, i16); HW_BUFFER_SIZE] {
+        let mut buffer = [(0i16, 0i16); HW_BUFFER_SIZE];
 
         for (_id, handle) in self.handles.iter_mut() {
             let mut i = 0;