diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-04-27 14:54:59 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-27 14:54:59 +0000 |
| commit | 5b3aaaaa9c1ff3b35f28f7babc628950192ef850 (patch) | |
| tree | 770a2623209b8d8e0aac41eb11543f2014c153ac | |
| parent | 663642eabbe7c8b0a66a4c1d00d1cc681c1d497e (diff) | |
| parent | 7538f57d622c1b6afe32b91b1d2ab79a746af745 (diff) | |
Merge #737
737: Remove unnecessary feature gating for giant transfers in DCMI r=Dirbaio a=matoushybl
Co-authored-by: Matous Hybl <[email protected]>
| -rw-r--r-- | embassy-stm32/src/dcmi.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/embassy-stm32/src/dcmi.rs b/embassy-stm32/src/dcmi.rs index b1e557ae1..e70db90c0 100644 --- a/embassy-stm32/src/dcmi.rs +++ b/embassy-stm32/src/dcmi.rs | |||
| @@ -387,11 +387,7 @@ where | |||
| 387 | if buffer.len() <= 0xffff { | 387 | if buffer.len() <= 0xffff { |
| 388 | return self.capture_small(buffer).await; | 388 | return self.capture_small(buffer).await; |
| 389 | } else { | 389 | } else { |
| 390 | #[cfg(feature = "unsafe-double-buffered-dma")] | ||
| 391 | return self.capture_giant(buffer).await; | 390 | return self.capture_giant(buffer).await; |
| 392 | |||
| 393 | #[cfg(not(feature = "unsafe-double-buffered-dma"))] | ||
| 394 | panic!("For DCMI transfers with length > 0xffff, the `unsafe-double-buffered-dma` must be enabled."); | ||
| 395 | } | 391 | } |
| 396 | } | 392 | } |
| 397 | 393 | ||
| @@ -445,7 +441,6 @@ where | |||
| 445 | result | 441 | result |
| 446 | } | 442 | } |
| 447 | 443 | ||
| 448 | #[cfg(feature = "unsafe-double-buffered-dma")] | ||
| 449 | async fn capture_giant(&mut self, buffer: &mut [u32]) -> Result<(), Error> { | 444 | async fn capture_giant(&mut self, buffer: &mut [u32]) -> Result<(), Error> { |
| 450 | use crate::dma::TransferOptions; | 445 | use crate::dma::TransferOptions; |
| 451 | 446 | ||
