aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Melchior Jacobsen <[email protected]>2022-12-23 15:49:22 +0100
committerRasmus Melchior Jacobsen <[email protected]>2022-12-23 15:49:22 +0100
commit47a0769fc287afa8c982514ea34de0d4f18a3f99 (patch)
treeed1b8999e0760b2e526c8635e9919b4de8985fd1
parente9a2c4a9e38ada8a6927e6dba66d486d190edf21 (diff)
Let repeated clock byte be singular pointer and not array pointer
-rw-r--r--embassy-stm32/src/dma/bdma.rs2
-rw-r--r--embassy-stm32/src/dma/dma.rs2
-rw-r--r--embassy-stm32/src/dma/gpdma.rs2
-rw-r--r--embassy-stm32/src/dma/mod.rs4
-rw-r--r--embassy-stm32/src/spi/mod.rs2
5 files changed, 6 insertions, 6 deletions
diff --git a/embassy-stm32/src/dma/bdma.rs b/embassy-stm32/src/dma/bdma.rs
index bc51cdc43..6160b9f40 100644
--- a/embassy-stm32/src/dma/bdma.rs
+++ b/embassy-stm32/src/dma/bdma.rs
@@ -78,7 +78,7 @@ foreach_dma_channel! {
78 ); 78 );
79 } 79 }
80 80
81 unsafe fn start_write_repeated<W: Word>(&mut self, _request: Request, repeated: *const [W], count: usize, reg_addr: *mut W, options: TransferOptions) { 81 unsafe fn start_write_repeated<W: Word>(&mut self, _request: Request, repeated: *const W, count: usize, reg_addr: *mut W, options: TransferOptions) {
82 low_level_api::start_transfer( 82 low_level_api::start_transfer(
83 pac::$dma_peri, 83 pac::$dma_peri,
84 $channel_num, 84 $channel_num,
diff --git a/embassy-stm32/src/dma/dma.rs b/embassy-stm32/src/dma/dma.rs
index 250505859..fec60f708 100644
--- a/embassy-stm32/src/dma/dma.rs
+++ b/embassy-stm32/src/dma/dma.rs
@@ -102,7 +102,7 @@ foreach_dma_channel! {
102 ) 102 )
103 } 103 }
104 104
105 unsafe fn start_write_repeated<W: Word>(&mut self, request: Request, repeated: *const [W], count: usize, reg_addr: *mut W, options: TransferOptions) { 105 unsafe fn start_write_repeated<W: Word>(&mut self, request: Request, repeated: *const W, count: usize, reg_addr: *mut W, options: TransferOptions) {
106 low_level_api::start_transfer( 106 low_level_api::start_transfer(
107 pac::$dma_peri, 107 pac::$dma_peri,
108 $channel_num, 108 $channel_num,
diff --git a/embassy-stm32/src/dma/gpdma.rs b/embassy-stm32/src/dma/gpdma.rs
index 87c0dfdf0..d252cef3e 100644
--- a/embassy-stm32/src/dma/gpdma.rs
+++ b/embassy-stm32/src/dma/gpdma.rs
@@ -75,7 +75,7 @@ foreach_dma_channel! {
75 ) 75 )
76 } 76 }
77 77
78 unsafe fn start_write_repeated<W: Word>(&mut self, request: Request, repeated: *const [W], count: usize, reg_addr: *mut W, options: TransferOptions) { 78 unsafe fn start_write_repeated<W: Word>(&mut self, request: Request, repeated: *const W, count: usize, reg_addr: *mut W, options: TransferOptions) {
79 low_level_api::start_transfer( 79 low_level_api::start_transfer(
80 pac::$dma_peri, 80 pac::$dma_peri,
81 $channel_num, 81 $channel_num,
diff --git a/embassy-stm32/src/dma/mod.rs b/embassy-stm32/src/dma/mod.rs
index 706bcff30..b51e0d40b 100644
--- a/embassy-stm32/src/dma/mod.rs
+++ b/embassy-stm32/src/dma/mod.rs
@@ -59,7 +59,7 @@ pub(crate) mod sealed {
59 unsafe fn start_write_repeated<W: super::Word>( 59 unsafe fn start_write_repeated<W: super::Word>(
60 &mut self, 60 &mut self,
61 request: Request, 61 request: Request,
62 repeated: *const [W], 62 repeated: *const W,
63 count: usize, 63 count: usize,
64 reg_addr: *mut W, 64 reg_addr: *mut W,
65 options: TransferOptions, 65 options: TransferOptions,
@@ -246,7 +246,7 @@ mod transfers {
246 pub fn write_repeated<'a, W: Word>( 246 pub fn write_repeated<'a, W: Word>(
247 channel: impl Peripheral<P = impl Channel> + 'a, 247 channel: impl Peripheral<P = impl Channel> + 'a,
248 request: Request, 248 request: Request,
249 repeated: *const [W], 249 repeated: *const W,
250 count: usize, 250 count: usize,
251 reg_addr: *mut W, 251 reg_addr: *mut W,
252 ) -> impl Future<Output = ()> + 'a { 252 ) -> impl Future<Output = ()> + 'a {
diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs
index 439d92b97..5b81c791a 100644
--- a/embassy-stm32/src/spi/mod.rs
+++ b/embassy-stm32/src/spi/mod.rs
@@ -466,7 +466,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
466 466
467 let tx_request = self.txdma.request(); 467 let tx_request = self.txdma.request();
468 let tx_dst = T::REGS.tx_ptr(); 468 let tx_dst = T::REGS.tx_ptr();
469 let clock_byte = [0x00u8]; 469 let clock_byte = 0x00u8;
470 let tx_f = crate::dma::write_repeated(&mut self.txdma, tx_request, &clock_byte, clock_byte_count, tx_dst); 470 let tx_f = crate::dma::write_repeated(&mut self.txdma, tx_request, &clock_byte, clock_byte_count, tx_dst);
471 471
472 unsafe { 472 unsafe {