Driver reorganization

drivers/drmem-drv-ntp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drmem-drv-ntp"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Rich Neswold <rich.neswold@gmail.com>"]
 edition = "2021"
 homepage = "https://github.com/DrMemCS/drmem"

drivers/drmem-drv-ntp/src/config.rs

@@ -0,0 +1,43 @@
+use drmem_api::{driver::DriverConfig, Error};
+use std::net::SocketAddrV4;
+
+#[derive(serde::Deserialize)]
+pub struct Params {
+    pub addr: SocketAddrV4,
+}
+
+impl TryFrom<DriverConfig> for Params {
+    type Error = Error;
+
+    fn try_from(cfg: DriverConfig) -> std::result::Result<Self, Self::Error> {
+        cfg.parse_into()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Params;
+    use drmem_api::{driver::DriverConfig, Error, Result};
+    use std::net::SocketAddrV4;
+
+    // Helper function to build a config from a string view.
+
+    fn mk_cfg(text: &str) -> Result<Params> {
+        Into::<DriverConfig>::into(
+            toml::from_str::<toml::value::Table>(text)
+                .map_err(|e| Error::ConfigError(format!("{}", e)))?,
+        )
+        .parse_into()
+    }
+
+    #[test]
+    fn test_config() {
+        assert!(mk_cfg("addr = 5").is_err());
+        assert!(mk_cfg("addr = true").is_err());
+        assert!(mk_cfg("addr = \"hello\"").is_err());
+
+        let cfg = mk_cfg("addr = \"192.168.1.100:50\"").unwrap();
+
+        assert_eq!(cfg.addr, SocketAddrV4::new([192, 168, 1, 100].into(), 50));
+    }
+}

drivers/drmem-drv-ntp/src/device.rs

@@ -0,0 +1,41 @@
+use super::config;
+use drmem_api::{
+    driver::{self, ResettableState},
+    Result,
+};
+
+pub struct Set {
+    pub d_state: driver::ReadOnlyDevice<bool>,
+    pub d_source: driver::ReadOnlyDevice<String>,
+    pub d_offset: driver::ReadOnlyDevice<f64>,
+    pub d_delay: driver::ReadOnlyDevice<f64>,
+}
+
+impl driver::Registrator for Set {
+    type Config = config::Params;
+
+    async fn register_devices(
+        core: &mut driver::RequestChan,
+        _: &Self::Config,
+        max_history: Option<usize>,
+    ) -> Result<Self> {
+        // Define the devices managed by this driver.
+
+        let d_state = core.add_ro_device("state", None, max_history).await?;
+        let d_source = core.add_ro_device("source", None, max_history).await?;
+        let d_offset = core
+            .add_ro_device("offset", Some("ms"), max_history)
+            .await?;
+        let d_delay =
+            core.add_ro_device("delay", Some("ms"), max_history).await?;
+
+        Ok(Set {
+            d_state,
+            d_source,
+            d_offset,
+            d_delay,
+        })
+    }
+}
+
+impl ResettableState for Set {}