Save morning's work.

Author: xC0000005

cores/arduino/stm32/dma.h

@@ -40,6 +40,10 @@
 #ifndef __DMA_H
 #define __DMA_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stm32_def.h>
 
 /**
@@ -56,4 +60,8 @@ void prepare_dma(DMA_HandleTypeDef *dma_handle);
   */
 void end_dma(DMA_HandleTypeDef *dma_handle);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

libraries/DMA/library.properties

@@ -1,7 +1,8 @@
 name=DMA
 version=0.0.1
 author=J.C. Nelson
+maintainer=xC0000005
 sentence=Enables Direct Memory Access Transfers.
 paragraph=This library allows use of Direct Memory Access (DMA) for transfer between memory locations, to and from peripherals.
-category=Data Transfers
+category=Uncategorized
 architectures=stm32

libraries/DMA/src/DMATransfer.cpp

@@ -1,44 +1,47 @@
 #include <dma.h>
+#include <DMATransfer.h>
 
 /**
   * @brief  Prepares for DMA Transfer by enabling clocks
   *         and storing the settings in the slots
   * @param  settings : dma transfer settings
   * @retval None
   */
-void DMATransferClass::prepare(dmatransfer_t *settings) {
+void DMATransferClass::prepare(dmatransfer_t *settings)
+{
   if (!_prepared) {
     // TODO - figure out which DMA to enable the clock for.
     __HAL_RCC_DMA1_CLK_ENABLE();
-    
+
     memcpy(&_transfer_settings, settings, sizeof(dmatransfer_t));
 
-    _transfer_settings.dma_settings.Init.Direction = transfer_direction;
+    _transfer_settings.dma_settings.Init.Direction = _transfer_settings.transfer_direction;
     _transfer_settings.dma_settings.Init.PeriphInc = DMA_PINC_DISABLE;
     _transfer_settings.dma_settings.Init.MemInc = DMA_MINC_DISABLE;
     _transfer_settings.dma_settings.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
     _transfer_settings.dma_settings.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
-    _transfer_settings.dma_settings.Init.Mode = settings.circular ? DMA_CIRCULAR : DMA_NORMAL;
+    _transfer_settings.dma_settings.Init.Mode = _transfer_settings.circular ? DMA_CIRCULAR : DMA_NORMAL;
     _transfer_settings.dma_settings.Init.Priority = DMA_PRIORITY_VERY_HIGH;
-    _transfer_settings.dma_settings.Instance = settings.channel_stream;
+    _transfer_settings.dma_settings.Instance = _transfer_settings.channel_stream;
     // TODO - intialize the callbacks.
 
     // Perform HAL Initialization first.
-    HAL_DMA_Init(&dmaUpdate);
+    HAL_DMA_Init(&_transfer_settings.dma_settings);
 
     // Call dma prepare
-    prepare_dma(&_transfer_settings);
+    prepare_dma(&_transfer_settings.dma_settings);
   }
 }
 
 /**
   * @brief  Begin the DMA transfer
   * @retval None
   */
-void DMATransferClass::begin(int bytes_to_transfer) {
-  if (!prepared) {
+void DMATransferClass::begin(int bytes_to_transfer)
+{
+  if (!_prepared) {
     // call dma prepare
-    prepare_dma(&_transfer_settings);
+    prepare_dma(&_transfer_settings.dma_settings);
   }
 
   // Reset flags so it starts over
@@ -55,12 +58,13 @@ void DMATransferClass::begin(int bytes_to_transfer) {
   * @brief  End the DMA transfer
   * @retval None
   */
-void DMATransferClass::end() {
+void DMATransferClass::end()
+{
 
-  __HAL_DMA_DISABLE(&_transfer_settings);
+  __HAL_DMA_DISABLE(&_transfer_settings.dma_settings);
 
   if (_prepared) {
-    end_dma(&_transfer_settings);
+    end_dma(&_transfer_settings.dma_settings);
     _prepared = false;
   }
 }

libraries/DMA/src/DMATransfer.h

@@ -6,17 +6,17 @@
 typedef struct dmatransfer_s dmatransfer_t;
 
 #if defined(STM32F2xx) || defined(STM32F4xx) || defined(STM32F7xx)
-  typedef DMA_Stream_TypeDef DMA_CS_Selection;
+typedef DMA_Stream_TypeDef DMA_CS_Selection;
 #else
-  typedef DMA_Channel_TypeDef DMA_CS_Selection;
+typedef DMA_Channel_TypeDef DMA_CS_Selection;
 #endif
 
 
 struct dmatransfer_s {
-    /*  Keep this the first member so casting back and forth is easy
-     */
-  DMA_HandleTypeDef *dma_settings;
-  DMA_CS_Selection channel_stream;
+  /*  Keep this the first member so casting back and forth is easy
+   */
+  DMA_HandleTypeDef dma_settings;
+  DMA_CS_Selection *channel_stream;
   uint32_t transfer_direction;
   boolean circular;
   void (*transferComplete)(DMA_HandleTypeDef *);