From f558f75116ae5f30ae742b3fdb78e3d28c3c862b Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 3 May 2021 00:20:51 +0800 Subject: [PATCH] add the skeleton for the codec server --- Cargo.lock | 16 +++++ Cargo.toml | 2 + services/codec/Cargo.toml | 23 +++++++ services/codec/src/api.rs | 10 ++++ services/codec/src/lib.rs | 25 ++++++++ services/codec/src/main.rs | 120 +++++++++++++++++++++++++++++++++++++ xtask/src/main.rs | 1 + 7 files changed, 197 insertions(+) create mode 100644 services/codec/Cargo.toml create mode 100644 services/codec/src/api.rs create mode 100644 services/codec/src/lib.rs create mode 100644 services/codec/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index cf6271991..6a6f56d97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -292,6 +292,22 @@ dependencies = [ "cc", ] +[[package]] +name = "codec" +version = "0.1.0" +dependencies = [ + "heapless", + "log", + "log-server", + "num-derive", + "num-traits", + "susres", + "ticktimer-server", + "utralib", + "xous", + "xous-names", +] + [[package]] name = "com" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index b250760d1..a3171f722 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,7 @@ default-members = [ "services/cb-test-c1", "services/cb-test-c2", "services/susres", + "services/codec", ] members = [ "xous-ipc", @@ -57,6 +58,7 @@ members = [ "services/cb-test-c1", "services/cb-test-c2", "services/susres", + "services/codec", ] resolver = "2" diff --git a/services/codec/Cargo.toml b/services/codec/Cargo.toml new file mode 100644 index 000000000..4f3cd99d7 --- /dev/null +++ b/services/codec/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "codec" +version = "0.1.0" +authors = ["bunnie "] +edition = "2018" +description = "Audio CODEC server" + +[dependencies] +xous = { path = "../../xous-rs" } +heapless = "0.5.6" +log-server = { path = "../log-server" } +ticktimer-server = { path = "../ticktimer-server" } +xous-names = { path = "../xous-names" } +log = "0.4" +num-derive = {version = "0.3", default-features = false} +num-traits = {version = "0.2", default-features = false} +susres = {path = "../susres"} + +[target.'cfg(not(any(windows,unix)))'.dependencies] +utralib = { path = "../../utralib"} + +[features] +default = [] diff --git a/services/codec/src/api.rs b/services/codec/src/api.rs new file mode 100644 index 000000000..98a74e272 --- /dev/null +++ b/services/codec/src/api.rs @@ -0,0 +1,10 @@ +pub(crate) const SERVER_NAME_CODEC: &str = "_Low-level Audio Codec Server_"; + +#[allow(dead_code)] +#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)] +pub(crate) enum Opcode { + + + /// Suspend/resume callback + SuspendResume, +} diff --git a/services/codec/src/lib.rs b/services/codec/src/lib.rs new file mode 100644 index 000000000..a9b91544f --- /dev/null +++ b/services/codec/src/lib.rs @@ -0,0 +1,25 @@ +#![cfg_attr(target_os = "none", no_std)] + +pub mod api; +use xous::{CID, send_message}; +use num_traits::ToPrimitive; + +pub struct Codec { + conn: CID, +} +impl Codec { + pub fn new(xns: &xous_names::XousNames) -> Result { + let conn = xns.request_connection_blocking(api::SERVER_NAME_CODEC).expect("Can't connect to Codec server"); + Ok(Codec { + conn + }) + } +} + +impl Drop for Codec { + fn drop(&mut self) { + // de-allocate myself. It's unsafe because we are responsible to make sure nobody else is using the connection. + unsafe{xous::disconnect(self.conn).unwrap();} + + } +} \ No newline at end of file diff --git a/services/codec/src/main.rs b/services/codec/src/main.rs new file mode 100644 index 000000000..729a83021 --- /dev/null +++ b/services/codec/src/main.rs @@ -0,0 +1,120 @@ +#![cfg_attr(target_os = "none", no_std)] +#![cfg_attr(target_os = "none", no_main)] + +mod api; + +use num_traits::FromPrimitive; + +use log::info; + + +#[cfg(target_os = "none")] +mod implementation { + use utralib::generated::*; + // use crate::api::*; + use log::info; + use susres::{RegManager, RegOrField, SuspendResume}; + + pub struct Codec { + csr: utralib::CSR, + fifo: xous::MemoryRange, + susres_manager: RegManager::<{utra::audio::AUDIO_NUMREGS}>, + } + + impl Codec { + pub fn new() -> Codec { + let csr = xous::syscall::map_memory( + xous::MemoryAddress::new(utra::audio::HW_AUDIO_BASE), + None, + 4096, + xous::MemoryFlags::R | xous::MemoryFlags::W, + ) + .expect("couldn't map Audio CSR range"); + let fifo = xous::syscall::map_memory( + xous::MemoryAddress::new(utralib::HW_AUDIO_MEM), + None, + utralib::HW_AUDIO_MEM_LEN, + xous::MemoryFlags::R | xous::MemoryFlags::W, + ) + .expect("couldn't map Audio CSR range"); + + let mut codec = Codec { + csr: CSR::new(csr.as_mut_ptr() as *mut u32), + susres_manager: RegManager::new(csr.as_mut_ptr() as *mut u32), + fifo, + }; + + codec + } + + pub fn suspend(&mut self) { + self.susres_manager.suspend(); + } + pub fn resume(&mut self) { + self.susres_manager.resume(); + } + } +} + +// a stub to try to avoid breaking hosted mode for as long as possible. +#[cfg(not(target_os = "none"))] +mod implementation { + use log::info; + + pub struct Codec { + } + + impl Codec { + pub fn new() -> Codec { + Codec { + } + } + pub fn suspend(&self) { + } + pub fn resume(&self) { + } + } +} + + +#[xous::xous_main] +fn xmain() -> ! { + use crate::implementation::Codec; + + log_server::init_wait().unwrap(); + log::set_max_level(log::LevelFilter::Info); + info!("my PID is {}", xous::process::id()); + + let xns = xous_names::XousNames::new().unwrap(); + let codec_sid = xns.register_name(api::SERVER_NAME_CODEC).expect("can't register server"); + log::trace!("registered with NS -- {:?}", codec_sid); + + let mut codec = Codec::new(); + + log::trace!("ready to accept requests"); + + // register a suspend/resume listener + let sr_cid = xous::connect(codec_sid).expect("couldn't create suspend callback connection"); + let mut susres = susres::Susres::new(&xns, api::Opcode::SuspendResume as u32, sr_cid).expect("couldn't create suspend/resume object"); + + loop { + let msg = xous::receive_message(codec_sid).unwrap(); + match FromPrimitive::from_usize(msg.body.id()) { + Some(api::Opcode::SuspendResume) => xous::msg_scalar_unpack!(msg, token, _, _, _, { + codec.suspend(); + susres.suspend_until_resume(token).expect("couldn't execute suspend/resume"); + codec.resume(); + }), + None => { + log::error!("couldn't convert opcode"); + break + } + } + } + // clean up our program + log::trace!("main loop exit, destroying servers"); + xns.unregister_server(codec_sid).unwrap(); + xous::destroy_server(codec_sid).unwrap(); + log::trace!("quitting"); + xous::terminate_process(); loop {} +} diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 8ebda14d0..da63936e6 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -51,6 +51,7 @@ fn try_main() -> Result<(), DynError> { "llio", "rtc", "susres", + "codec", ]; let benchmark_pkgs = [ "benchmark",