From 20ea35fc9639487eaa21f1dcee6c32d8a66a0fbb Mon Sep 17 00:00:00 2001
From: kbleeke <pluth@0t.re>
Date: Mon, 27 Mar 2023 18:04:48 +0200
Subject: [PATCH] Move pio driver to separate crate

---
 .vscode/settings.json                               |  1 +
 Cargo.toml                                          |  6 ++++++
 cyw43-pio/Cargo.toml                                | 13 +++++++++++++
 .../rpi-pico-w/src/pio.rs => cyw43-pio/src/lib.rs   | 12 +++++++++---
 examples/rpi-pico-w/Cargo.toml                      |  3 +--
 examples/rpi-pico-w/src/main.rs                     |  5 +----
 6 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 cyw43-pio/Cargo.toml
 rename examples/rpi-pico-w/src/pio.rs => cyw43-pio/src/lib.rs (93%)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index dd479929e..344307695 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,6 +9,7 @@
     "rust-analyzer.check.noDefaultFeatures": true,
     "rust-analyzer.linkedProjects": [
         "examples/rpi-pico-w/Cargo.toml",
+        "cyw43-pio/Cargo.toml",
     ],
     "rust-analyzer.server.extraEnv": {
         "WIFI_NETWORK": "foo",
diff --git a/Cargo.toml b/Cargo.toml
index a307a6cc3..04a47a3a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,3 +32,9 @@ embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "e3f8020c3
 embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "e3f8020c3bdf726dfa451b5b190f27191507a18f" }
 embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "e3f8020c3bdf726dfa451b5b190f27191507a18f" }
 embassy-net-driver-channel = { git = "https://github.com/embassy-rs/embassy", rev = "e3f8020c3bdf726dfa451b5b190f27191507a18f" }
+embassy-rp = { git = "https://github.com/embassy-rs/embassy", rev = "e3f8020c3bdf726dfa451b5b190f27191507a18f" }
+
+[workspace]
+members = ["cyw43-pio"]
+default-members = ["cyw43-pio", "."]
+exclude = ["examples"]
\ No newline at end of file
diff --git a/cyw43-pio/Cargo.toml b/cyw43-pio/Cargo.toml
new file mode 100644
index 000000000..2fc6b7591
--- /dev/null
+++ b/cyw43-pio/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "cyw43-pio"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+cyw43 = { path = "../" }
+embassy-rp = { version = "0.1.0",  features = ["defmt", "unstable-traits", "nightly", "unstable-pac", "time-driver", "pio"] }
+pio-proc = "0.2"
+pio = "0.2.1"
+defmt = "0.3"
\ No newline at end of file
diff --git a/examples/rpi-pico-w/src/pio.rs b/cyw43-pio/src/lib.rs
similarity index 93%
rename from examples/rpi-pico-w/src/pio.rs
rename to cyw43-pio/src/lib.rs
index 846113060..2159796cd 100644
--- a/examples/rpi-pico-w/src/pio.rs
+++ b/cyw43-pio/src/lib.rs
@@ -1,3 +1,7 @@
+#![no_std]
+#![allow(incomplete_features)]
+#![feature(async_fn_in_trait)]
+
 use core::slice;
 
 use cyw43::SpiBusCyw43;
@@ -125,7 +129,8 @@ where
 
         self.sm.dma_push(dma.reborrow(), write).await;
 
-        let status = self.sm.wait_pull().await;
+        let mut status = 0;
+        self.sm.dma_pull(dma.reborrow(), slice::from_mut(&mut status)).await;
         status
     }
 
@@ -145,9 +150,10 @@ where
         self.sm.set_enable(true);
 
         self.sm.dma_push(dma.reborrow(), slice::from_ref(&cmd)).await;
-        self.sm.dma_pull(dma, read).await;
+        self.sm.dma_pull(dma.reborrow(), read).await;
 
-        let status = self.sm.wait_pull().await;
+        let mut status = 0;
+        self.sm.dma_pull(dma.reborrow(), slice::from_mut(&mut status)).await;
         status
     }
 }
diff --git a/examples/rpi-pico-w/Cargo.toml b/examples/rpi-pico-w/Cargo.toml
index 4a531c88c..41ee8a3c4 100644
--- a/examples/rpi-pico-w/Cargo.toml
+++ b/examples/rpi-pico-w/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 
 [dependencies]
 cyw43 = { path = "../../", features = ["defmt", "firmware-logs"] }
+cyw43-pio = { path = "../../cyw43-pio" }
 embassy-executor = { version = "0.1.0",  features = ["defmt", "integrated-timers"] }
 embassy-time = { version = "0.1.0",  features = ["defmt", "defmt-timestamp-uptime"] }
 embassy-rp = { version = "0.1.0",  features = ["defmt", "unstable-traits", "nightly", "unstable-pac", "time-driver", "pio"] }
@@ -20,8 +21,6 @@ panic-probe = { version = "0.3", features = ["print-defmt"] }
 cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
 cortex-m-rt = "0.7.0"
 futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
-pio-proc = "0.2"
-pio = "0.2.1"
 
 embedded-io = { version = "0.4.0", features = ["async", "defmt"] }
 heapless = "0.7.15"
diff --git a/examples/rpi-pico-w/src/main.rs b/examples/rpi-pico-w/src/main.rs
index e3c59223b..4b1623be7 100644
--- a/examples/rpi-pico-w/src/main.rs
+++ b/examples/rpi-pico-w/src/main.rs
@@ -4,11 +4,10 @@
 #![feature(async_fn_in_trait)]
 #![allow(incomplete_features)]
 
-mod pio;
-
 use core::slice;
 use core::str::from_utf8;
 
+use cyw43_pio::PioSpi;
 use defmt::*;
 use embassy_executor::Spawner;
 use embassy_net::tcp::TcpSocket;
@@ -20,8 +19,6 @@ use embedded_io::asynch::Write;
 use static_cell::StaticCell;
 use {defmt_rtt as _, panic_probe as _};
 
-use crate::pio::PioSpi;
-
 macro_rules! singleton {
     ($val:expr) => {{
         type T = impl Sized;