Skip to content

Implement SpiOperation::TransferInPlace based on SpidevTransfer::read_write_in_place() #123

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

Merged
merged 4 commits into from
Oct 26, 2025
Merged

Implement SpiOperation::TransferInPlace based on SpidevTransfer::read_write_in_place() #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c0791d
Implement SpiOperation::TransferInPlace based on SpidevTransfer::read…
jannic Oct 21, 2025
68d7e8c
Use spidev 0.6.1 instead of 0.7.0 to avoid breaking change
jannic Oct 23, 2025
1c061ff
Add changelog entry
jannic Oct 23, 2025
88abb3c
Fix CI on MSRV
jannic Oct 23, 2025
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ jobs:
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}

- if: ${{ matrix.rust=='1.65.0' }}
run: cargo update --precise 2.0.106 --package syn

- name: Install armv7 libraries
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
run: |
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Added async `DelayNs` implementation for `tokio`.
- Added feature flag for `serial`.

### Fixed

- Fix UB (and remove unsafe block) in handling of SpiOperation::TransferInPlace

## [v0.4.0] - 2024-01-10

### Changed
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sysfs_gpio = { version = "0.6.1", optional = true }
i2cdev = { version = "0.6.0", optional = true }
nb = "1"
serialport = { version = "4.2.0", default-features = false, optional = true }
spidev = { version = "0.6.0", optional = true }
spidev = { version = "0.6.1", optional = true }
nix = { version = "0.27.1", optional = true }
tokio = { version = "1", default-features = false, optional = true }

Expand Down
9 changes: 2 additions & 7 deletions src/spi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,8 @@ mod embedded_hal_impl {
}

fn transfer_in_place(&mut self, words: &mut [u8]) -> Result<(), Self::Error> {
let tx = words.to_owned();
self.0
.transfer(&mut SpidevTransfer::read_write(&tx, words))
.transfer(&mut SpidevTransfer::read_write_in_place(words))
.map_err(|err| SPIError { err })
}

Expand Down Expand Up @@ -214,11 +213,7 @@ mod embedded_hal_impl {
}
},
SpiOperation::TransferInPlace(buf) => {
let tx = unsafe {
let p = buf.as_ptr();
std::slice::from_raw_parts(p, buf.len())
};
transfers.push(SpidevTransfer::read_write(tx, buf));
transfers.push(SpidevTransfer::read_write_in_place(buf));
}
SpiOperation::DelayNs(ns) => {
let us = {
Expand Down