LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3935 from edenbarby/main

Browse Source 
embassy-rp: pio: Add access to DMA engine byte swapping
This commit is contained in:
Ulf Lilleengen 2025-03-06 07:13:03 +00:00 committed by GitHub
commit 6af79f00e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cyw43-pio/src/lib.rs
View File

@ -169,12 +169,12 @@ where
self.sm.set_enable(true); self.sm.set_enable(true);
self.sm.tx().dma_push(self.dma.reborrow(), write).await; self.sm.tx().dma_push(self.dma.reborrow(), write, false).await;
let mut status = 0; let mut status = 0;
self.sm self.sm
.rx() .rx()
.dma_pull(self.dma.reborrow(), slice::from_mut(&mut status)) .dma_pull(self.dma.reborrow(), slice::from_mut(&mut status), false)
.await; .await;
status status
} }
@ -201,13 +201,16 @@ where
// self.cs.set_low(); // self.cs.set_low();
self.sm.set_enable(true); self.sm.set_enable(true);
self.sm.tx().dma_push(self.dma.reborrow(), slice::from_ref(&cmd)).await; self.sm
self.sm.rx().dma_pull(self.dma.reborrow(), read).await; .tx()
.dma_push(self.dma.reborrow(), slice::from_ref(&cmd), false)
.await;
self.sm.rx().dma_pull(self.dma.reborrow(), read, false).await;
let mut status = 0; let mut status = 0;
self.sm self.sm
.rx() .rx()
.dma_pull(self.dma.reborrow(), slice::from_mut(&mut status)) .dma_pull(self.dma.reborrow(), slice::from_mut(&mut status), false)
.await; .await;
#[cfg(feature = "defmt")] #[cfg(feature = "defmt")]

10
embassy-rp/src/pio/mod.rs
View File

@ -362,6 +362,7 @@ impl<'d, PIO: Instance, const SM: usize> StateMachineRx<'d, PIO, SM> {
&'a mut self, &'a mut self,
ch: PeripheralRef<'a, C>, ch: PeripheralRef<'a, C>,
data: &'a mut [W], data: &'a mut [W],
bswap: bool,
) -> Transfer<'a, C> { ) -> Transfer<'a, C> {
let pio_no = PIO::PIO_NO; let pio_no = PIO::PIO_NO;
let p = ch.regs(); let p = ch.regs();
@ -379,6 +380,7 @@ impl<'d, PIO: Instance, const SM: usize> StateMachineRx<'d, PIO, SM> {
w.set_chain_to(ch.number()); w.set_chain_to(ch.number());
w.set_incr_read(false); w.set_incr_read(false);
w.set_incr_write(true); w.set_incr_write(true);
w.set_bswap(bswap);
w.set_en(true); w.set_en(true);
}); });
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
@ -447,7 +449,12 @@ impl<'d, PIO: Instance, const SM: usize> StateMachineTx<'d, PIO, SM> {
} }
/// Prepare a DMA transfer to TX FIFO. /// Prepare a DMA transfer to TX FIFO.
pub fn dma_push<'a, C: Channel, W: Word>(&'a mut self, ch: PeripheralRef<'a, C>, data: &'a [W]) -> Transfer<'a, C> { pub fn dma_push<'a, C: Channel, W: Word>(
&'a mut self,
ch: PeripheralRef<'a, C>,
data: &'a [W],
bswap: bool,
) -> Transfer<'a, C> {
let pio_no = PIO::PIO_NO; let pio_no = PIO::PIO_NO;
let p = ch.regs(); let p = ch.regs();
p.read_addr().write_value(data.as_ptr() as u32); p.read_addr().write_value(data.as_ptr() as u32);
@ -464,6 +471,7 @@ impl<'d, PIO: Instance, const SM: usize> StateMachineTx<'d, PIO, SM> {
w.set_chain_to(ch.number()); w.set_chain_to(ch.number());
w.set_incr_read(true); w.set_incr_read(true);
w.set_incr_write(false); w.set_incr_write(false);
w.set_bswap(bswap);
w.set_en(true); w.set_en(true);
}); });
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);

4
embassy-rp/src/pio_programs/hd44780.rs
View File

@ -173,7 +173,7 @@ impl<'l, P: Instance, const S: usize> PioHD44780<'l, P, S> {
sm.set_enable(true); sm.set_enable(true);
// display on and cursor on and blinking, reset display // display on and cursor on and blinking, reset display
sm.tx().dma_push(dma.reborrow(), &[0x81u8, 0x0f, 1]).await; sm.tx().dma_push(dma.reborrow(), &[0x81u8, 0x0f, 1], false).await;
Self { Self {
dma: dma.map_into(), dma: dma.map_into(),
@ -198,6 +198,6 @@ impl<'l, P: Instance, const S: usize> PioHD44780<'l, P, S> {
// set cursor to 1:15 // set cursor to 1:15
self.buf[38..].copy_from_slice(&[0x80, 0xcf]); self.buf[38..].copy_from_slice(&[0x80, 0xcf]);
self.sm.tx().dma_push(self.dma.reborrow(), &self.buf).await; self.sm.tx().dma_push(self.dma.reborrow(), &self.buf, false).await;
} }
} }

2
embassy-rp/src/pio_programs/i2s.rs
View File

@ -90,6 +90,6 @@ impl<'a, P: Instance, const S: usize> PioI2sOut<'a, P, S> {
/// Return an in-prograss dma transfer future. Awaiting it will guarentee a complete transfer. /// Return an in-prograss dma transfer future. Awaiting it will guarentee a complete transfer.
pub fn write<'b>(&'b mut self, buff: &'b [u32]) -> Transfer<'b, AnyChannel> { pub fn write<'b>(&'b mut self, buff: &'b [u32]) -> Transfer<'b, AnyChannel> {
self.sm.tx().dma_push(self.dma.reborrow(), buff) self.sm.tx().dma_push(self.dma.reborrow(), buff, false)
} }
} }

2
embassy-rp/src/pio_programs/ws2812.rs
View File

@ -111,7 +111,7 @@ impl<'d, P: Instance, const S: usize, const N: usize> PioWs2812<'d, P, S, N> {
} }
// DMA transfer // DMA transfer
self.sm.tx().dma_push(self.dma.reborrow(), &words).await; self.sm.tx().dma_push(self.dma.reborrow(), &words, false).await;
Timer::after_micros(55).await; Timer::after_micros(55).await;
} }

4
examples/rp/src/bin/pio_dma.rs
View File

@ -72,8 +72,8 @@ async fn main(_spawner: Spawner) {
loop { loop {
let (rx, tx) = sm.rx_tx(); let (rx, tx) = sm.rx_tx();
join( join(
tx.dma_push(dma_out_ref.reborrow(), &dout), tx.dma_push(dma_out_ref.reborrow(), &dout, false),
rx.dma_pull(dma_in_ref.reborrow(), &mut din), rx.dma_pull(dma_in_ref.reborrow(), &mut din, false),
) )
.await; .await;
for i in 0..din.len() { for i in 0..din.len() {

4
examples/rp235x/src/bin/pio_dma.rs
View File

@ -72,8 +72,8 @@ async fn main(_spawner: Spawner) {
loop { loop {
let (rx, tx) = sm.rx_tx(); let (rx, tx) = sm.rx_tx();
join( join(
tx.dma_push(dma_out_ref.reborrow(), &dout), tx.dma_push(dma_out_ref.reborrow(), &dout, false),
rx.dma_pull(dma_in_ref.reborrow(), &mut din), rx.dma_pull(dma_in_ref.reborrow(), &mut din, false),
) )
.await; .await;
for i in 0..din.len() { for i in 0..din.len() {