Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'static lifetime bounds to I2S DMA buffers #237

Merged
merged 2 commits into from
Sep 29, 2020
Merged

Add 'static lifetime bounds to I2S DMA buffers #237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0827c4
Add 'static lifetime bound to dma buffers
kalkyl Sep 28, 2020
3a838b0
Add comment explaining the use of Option for inner
kalkyl Sep 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions nrf-hal-common/src/i2s.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ impl I2S {
pub fn rx<W, B>(mut self, mut buffer: B) -> Result<Transfer<B>, Error>
where
W: SupportedWordSize,
B: WriteBuffer<Word = W>,
B: WriteBuffer<Word = W> + 'static,
{
let (ptr, len) = unsafe { buffer.write_buffer() };
if ptr as u32 % 4 != 0 {
Expand Down Expand Up @@ -300,8 +300,8 @@ impl I2S {
) -> Result<TransferFullDuplex<TxB, RxB>, Error>
where
W: SupportedWordSize,
TxB: ReadBuffer<Word = W>,
RxB: WriteBuffer<Word = W>,
TxB: ReadBuffer<Word = W> + 'static,
RxB: WriteBuffer<Word = W> + 'static,
{
let (rx_ptr, rx_len) = unsafe { rx_buffer.write_buffer() };
let (tx_ptr, tx_len) = unsafe { tx_buffer.read_buffer() };
Expand Down Expand Up @@ -345,7 +345,7 @@ impl I2S {
pub fn tx<W, B>(mut self, buffer: B) -> Result<Transfer<B>, Error>
where
W: SupportedWordSize,
B: ReadBuffer<Word = W>,
B: ReadBuffer<Word = W> + 'static,
{
let (ptr, len) = unsafe { buffer.read_buffer() };
if ptr as u32 % 4 != 0 {
Expand Down Expand Up @@ -602,6 +602,7 @@ pub enum I2SEvent {

/// A DMA transfer
pub struct Transfer<B> {
// FIXME: Always `Some`, only using `Option` here to allow moving fields out of `inner`.
inner: Option<Inner<B>>,
}

Expand Down Expand Up @@ -635,6 +636,7 @@ impl<B> Drop for Transfer<B> {
}
/// A full duplex DMA transfer
pub struct TransferFullDuplex<TxB, RxB> {
// FIXME: Always `Some`, only using `Option` here to allow moving fields out of `inner`.
inner: Option<InnerFullDuplex<TxB, RxB>>,
}

Expand Down