Browse Source

Disable DMA for the time being

Signed-off-by: Daniel Egger <daniel@eggers-club.de>
Daniel Egger 5 years ago
parent
commit
bae2a2c65c

+ 0 - 0
examples/serial-dma-circ.rs → examples/serial-dma-circ.rs.disabled


+ 0 - 0
examples/serial-dma-peek.rs → examples/serial-dma-peek.rs.disabled


+ 0 - 0
examples/serial-dma-rx.rs → examples/serial-dma-rx.rs.disabled


+ 0 - 0
examples/serial-dma-tx.rs → examples/serial-dma-tx.rs.disabled


+ 2 - 0
src/dma.rs

@@ -317,6 +317,7 @@ macro_rules! dma {
     }
 }
 
+/*
 dma! {
     DMA1: (dma1, dma1en, dma1rst, {
         C1: (
@@ -420,6 +421,7 @@ dma! {
         ),
     }),
 }
+*/
 
 pub trait DmaChannel {
     type Dma;

+ 2 - 2
src/prelude.rs

@@ -8,6 +8,6 @@ pub use hal::digital::ToggleableOutputPin as _embedded_hal_digital_ToggleableOut
 pub use hal::prelude::*;
 pub use pwm::PwmExt as _stm32_hal_pwm_PwmExt;
 pub use rcc::RccExt as _stm32_hal_rcc_RccExt;
-pub use serial::ReadDma as _stm32_hal_serial_ReadDma;
-pub use serial::WriteDma as _stm32_hal_serial_WriteDma;
+//pub use serial::ReadDma as _stm32_hal_serial_ReadDma;
+//pub use serial::WriteDma as _stm32_hal_serial_WriteDma;
 pub use time::U32Ext as _stm32_hal_time_U32Ext;

+ 8 - 1
src/serial.rs

@@ -9,7 +9,8 @@ use stm32::{USART1, USART2, USART3};
 use void::Void;
 
 use afio::MAPR;
-use dma::{dma1, CircBuffer, Static, Transfer, R, W};
+//use dma::{dma1, CircBuffer, Static, Transfer, R, W};
+use dma::{CircBuffer, Static, Transfer, R, W};
 use gpio::gpioa::{PA10, PA2, PA3, PA9};
 use gpio::gpiob::{PB10, PB11, PB6, PB7};
 use gpio::{Alternate, Floating, Input, PushPull};
@@ -215,6 +216,7 @@ macro_rules! hal {
                 }
             }
 
+            /*
             impl<B> ReadDma<B> for Rx<$USARTX> where B: AsMut<[u8]> {
                 fn circ_read(self, mut chan: Self::Dma, buffer: &'static mut [B; 2],
                 ) -> CircBuffer<B, Self::Dma>
@@ -306,7 +308,9 @@ macro_rules! hal {
                     Transfer::w(buffer, chan, self)
                 }
             }
+            */
 
+            /*
             impl<A, B> WriteDma<A, B> for Tx<$USARTX> where A: AsRef<[u8]>, B: Static<A> {
                 fn write_all(self, mut chan: Self::Dma, buffer: B
                 ) -> Transfer<R, B, Self::Dma, Self>
@@ -353,6 +357,7 @@ macro_rules! hal {
                     Transfer::r(buffer, chan, self)
                 }
             }
+            */
 
             impl hal::serial::Write<u8> for Tx<$USARTX> {
                 type Error = Void;
@@ -418,6 +423,7 @@ hal! {
     ),
 }
 
+/*
 use dma::DmaChannel;
 
 impl DmaChannel for Rx<USART1> {
@@ -465,3 +471,4 @@ where
 {
     fn write_all(self, chan: Self::Dma, buffer: B) -> Transfer<R, B, Self::Dma, Self>;
 }
+*/