fixup: i2s

Author: rleh

src/modm/platform/i2s/stm32/i2s_hal.hpp.in

@@ -56,6 +56,12 @@ public:
 				BitDepth bitDepth = BitDepth::Sixteen,
 				MasterClockOutput masterClockOutput = MasterClockOutput::Enabled);
 
+	static void
+	start();
+
+	static void
+	stop();
+
 	static void
 	write(uint16_t sample);
 

src/modm/platform/i2s/stm32/i2s_hal_impl.hpp.in

@@ -52,7 +52,11 @@ modm::platform::I2sHal{{ id }}::initialize( OddFactor oddFactor, uint8_t i2s_div
 	SPI{{ id }}->I2SPR |= static_cast<uint32_t>(masterClockOutput) |
 	                      static_cast<uint32_t>(oddFactor) |
 						  i2s_div;
-	// re-enable peripheral
+}
+
+void inline
+modm::platform::I2sHal3::start()
+{
 	SPI{{ id }}->I2SCFGR |= SPI_I2SCFGR_I2SE;
 }
 

src/modm/platform/i2s/stm32/i2s_master.hpp.in

@@ -31,9 +31,10 @@ namespace platform
  *
  * TODO: say something about the nature of implementation
  *
- * @tparam DmaChannelTX DMA channel for sending
+ * @tparam	DmaChannelTX DMA channel for sending
  *
- * @author	Marton Ledneczki, Raphael Lehmann
+ * @author	Marton Ledneczki
+ * @author	Raphael Lehmann
  * @ingroup	modm_platform_i2s modm_platform_i2s_{{id}}
  */
 template <class DmaChannelTx>
@@ -46,10 +47,11 @@ class I2sMaster{{ id }} : public modm::I2sMaster
 				Peripheral::Spi{{ id }}, DmaBase::Signal::Tx>::Request;
 	};
 
-public:
+public: // TBD: private?
 	using Hal = I2sHal{{ id }};
 
 
+public:
 	template< class... Signals >
 	static void
 	connect()
@@ -83,11 +85,12 @@ public:
 		Hal::initialize(odd_factor ? Hal::OddFactor::Enabled : Hal::OddFactor::Disabled,
 						i2s_div);
 
+		dmaError = false;
 		Dma::TxChannel::configure(
 			DmaBase::DataTransferDirection::MemoryToPeripheral, DmaBase::MemoryDataSize::Bit16,
 			DmaBase::PeripheralDataSize::Bit16, DmaBase::MemoryIncrementMode::Increment,
 			DmaBase::PeripheralIncrementMode::Fixed, dmaPriority,
-			DmaBase::CircularMode::Disabled, DmaBase::DoubleBufferMode::Enabled);
+			DmaBase::CircularMode::Disabled);
 		Dma::TxChannel::setPeripheralAddress(SPI{{ id }}_BASE + 0x0c);
 		Dma::TxChannel::setTransferErrorIrqHandler(handleDmaTransferError);
 		Dma::TxChannel::enableInterruptVector();
@@ -97,40 +100,29 @@ public:
 	}
 
 	static inline void
-	setTxBufferAddresses(uintptr_t first_address, uintptr_t second_address, std::size_t length)
+	setTxBufferAddresses(uintptr_t address, std::size_t length)
 	{
-		Dma::TxChannel::setMemoryAddress(first_address);
-		Dma::TxChannel::setMemoryAddress2(second_address);
+		Dma::TxChannel::setMemoryAddress(address);
 		Dma::TxChannel::setDataLength(length);
 	}
 
 	static inline void
-	setTxBufferAddress1(uintptr_t first_address)
-	{
-		Dma::TxChannel::setMemoryAddress(first_address);
-	}
-
-	static inline void
-	setTxBufferAddress2( uintptr_t second_address)
-	{
-		Dma::TxChannel::setMemoryAddress2(second_address);
-	}
-
-	static inline bool
-	isBuffer1Active()
+	setTransferCompleteIrqHandler(DmaBase::IrqHandler handleDmaTransferComplete)
 	{
-		return Dma::TxChannel::isPrimaryBufferActive();
+		Dma::TxChannel::setTransferCompleteIrqHandler(handleDmaTransferComplete);
 	}
 
 	static inline void
 	start()
 	{
 		Dma::TxChannel::start();
+		Hal::start();
 	}
 
 	static inline void
 	stop()
 	{
+		//Hal::stop();
 		Dma::TxChannel::stop();
 	}