Skip to content

Add embedded_hal::serial implementation for uarte #281

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

Closed
wants to merge 19 commits into from
Closed

Add embedded_hal::serial implementation for uarte #281

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
19e332c
Add embedded_hal::serial implementation for uarte
lulf Jan 6, 2021
4ed85a5
Pass TX and RX buffers to split() to ensure move of UartTx and UartRx…
lulf Jan 7, 2021
a45bd6f
Check that buffers are in RAM
lulf Jan 7, 2021
ff3defe
Implement Drop trait to ensure DMA is stopped
lulf Jan 7, 2021
5da3e9b
Require DMA buffers to have static lifetime
lulf Jan 11, 2021
d84e1fe
Ensure write pointer is reset
lulf Jan 11, 2021
c333210
Avoid initiating transfer if no bytes have been written
lulf Jan 11, 2021
99616c7
Fix conversion
lulf Jan 11, 2021
7fef6b2
Address review comments
lulf Jan 12, 2021
d976137
Update nrf-hal-common/src/uarte.rs
lulf Jan 12, 2021
18c8763
Move into parent module
lulf Jan 12, 2021
3d78cde
Remove unneeded import
lulf Jan 12, 2021
1a58c9d
Update nrf-hal-common/src/uarte.rs
lulf Jan 12, 2021
d0dc119
Call flush if write buffer is full
lulf Jan 12, 2021
42dc2ee
Restrict serial API to read only 1 byte at a time to avoid DMA issues.
lulf Jan 12, 2021
655e41b
Simplify by passing slice only
lulf Jan 13, 2021
d25a746
Add comment
lulf Jan 13, 2021
cf11f38
Require a slice of size 1 for rx_buf
lulf Jan 13, 2021
8688eb6
Consistent buffer length check behavior
lulf Feb 16, 2021
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
14 changes: 5 additions & 9 deletions nrf-hal-common/src/uarte.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ where
///
/// The buffer must have a length of at most 255 bytes.
pub fn read(&mut self, rx_buffer: &mut [u8]) -> Result<(), Error> {
start_read(&*self.0, rx_buffer, rx_buffer.len())?;
start_read(&*self.0, rx_buffer)?;

// Wait for transmission to end.
while self.0.events_endrx.read().bits() == 0 {}
Expand Down Expand Up @@ -183,7 +183,7 @@ where
I: timer::Instance,
{
// Start the read.
start_read(&self.0, rx_buffer, rx_buffer.len())?;
start_read(&self.0, rx_buffer)?;

// Start the timeout timer.
timer.start(cycles);
Expand Down Expand Up @@ -326,11 +326,7 @@ fn stop_write(uarte: &uarte0::RegisterBlock) {

/// Start a UARTE read transaction by setting the control
/// values and triggering a read task.
fn start_read(
uarte: &uarte0::RegisterBlock,
rx_buffer: &mut [u8],
nbytes: usize,
) -> Result<(), Error> {
fn start_read(uarte: &uarte0::RegisterBlock, rx_buffer: &mut [u8]) -> Result<(), Error> {
if rx_buffer.len() > EASY_DMA_SIZE {
return Err(Error::RxBufferTooLong);
}
Expand Down Expand Up @@ -359,7 +355,7 @@ fn start_read(
//
// The MAXCNT field is at least 8 bits wide and accepts the full
// range of values.
unsafe { w.maxcnt().bits(nbytes.min(rx_buffer.len()) as _) });
unsafe { w.maxcnt().bits(rx_buffer.len() as _) });

// Start UARTE Receive transaction.
uarte.tasks_startrx.write(|w|
Expand Down Expand Up @@ -676,7 +672,7 @@ where
}
Ok(self.rx_buf[0])
} else {
start_read(&uarte, self.rx_buf, 1)?;
start_read(&uarte, &mut self.rx_buf[..1])?;
Err(nb::Error::WouldBlock)
}
}
Expand Down