Fixed DMA bugs

Author: petewarden

examples/adc_dma/adc_dma_main.c

@@ -32,47 +32,27 @@ void OnReset(void) {
   RccInitForAdc();
 
   // TODO: At the moment, only port A0 seems to be working.
-  AdcInit(GPIOA, 0);
+  AdcInit(GPIOA, 0, 0);
   DmaInit();
   AdcDmaOn(g_dma_buffer, DMA_BUFFER_SIZE);
-  AdcOn();
+  //AdcOn();
   while (1) {
     const int32_t adc_log_length = 256;
     char adc_log[adc_log_length];
     StrCpy(adc_log, adc_log_length, "DMA: ");
-    StrCatInt32(adc_log, adc_log_length, g_error_count);
-    StrCatStr(adc_log, adc_log_length, " errors,");
-    StrCatInt32(adc_log, adc_log_length, g_half_count);
-    StrCatStr(adc_log, adc_log_length, " half,");
-    StrCatInt32(adc_log, adc_log_length, g_complete_count);
+    StrCatInt32(adc_log, adc_log_length, g_error_count, 10);
+    StrCatStr(adc_log, adc_log_length, " errors, ");
+    StrCatInt32(adc_log, adc_log_length, g_half_count, 10);
+    StrCatStr(adc_log, adc_log_length, " half, ");
+    StrCatInt32(adc_log, adc_log_length, g_complete_count, 10);
     StrCatStr(adc_log, adc_log_length, " complete\n");
     DebugLog(adc_log);
   }
   AdcOff();
 }
 
-// If you have a function named OnAdcInterrupt() in your program, this will be
-// called once an ADC value is available, if you've set up the system as shown
-// in the OnReset() function above.
-void OnAdcInterrupt() {
-  // We're expecting an EOC signal to be marked in the status register.
-  if (!(ADC1->SR & ADC_SR_EOC)) {
-    DebugLog("ADC Interrupt called outside of an End Of Conversion event.\n");
-    return;
-  }
-  // Read the value from the data register and output it to the debug log.
-  const int32_t adc_value = ADC1->DR;
-  const int32_t adc_log_length = 256;
-  char adc_log[adc_log_length];
-  StrCpy(adc_log, adc_log_length, "ADC: ");
-  StrCatInt32(adc_log, adc_log_length, adc_value);
-  StrCatStr(adc_log, adc_log_length, "\n");
-  DebugLog(adc_log);
-}
-
 void OnDma1Channel1Interrupt() {
   if (DMA1->ISR & DMA_ISR_TEIF1) {
-    //DebugLog("DMA Error\n");
     ++g_error_count;
     DMA1->IFCR |= DMA_IFCR_CTEIF1;
     return;

examples/adc_interrupt/adc_interrupt_main.c

@@ -23,7 +23,7 @@ void OnReset(void) {
   RccInitForAdc();
 
   // TODO: At the moment, only port A0 seems to be working.
-  AdcInit(GPIOA, 0);
+  AdcInit(GPIOA, 0, 1);
   while (1) {
     // Calls to AdcOn() cause the interrupt to be called back once
     // a value is available.
@@ -46,7 +46,7 @@ void OnAdcInterrupt() {
   const int32_t adc_log_length = 256;
   char adc_log[adc_log_length];
   StrCpy(adc_log, adc_log_length, "ADC: ");
-  StrCatInt32(adc_log, adc_log_length, adc_value);
+  StrCatInt32(adc_log, adc_log_length, adc_value, 10);
   StrCatStr(adc_log, adc_log_length, "\n");
   DebugLog(adc_log);
 }

include/adc.h

@@ -40,38 +40,61 @@ static inline void EnableNvic(int irq) {
 
 // Sets up the clock control system for ADC access.
 static inline void RccInitForAdc(void) {
-  //  RCC->CFGR = PLL_HSE | PLL_9 | SYS_HSI | APB1_DIV2;
-  RCC->CFGR = RCC_CFGR_PLLSRC_HSE | RCC_CFGR_PLLMUL_9 | RCC_CFGR_SW_HSI | RCC_CFGR_PPRE1_DIV_2;
-  RCC->CR = RCC_CR_HSION | RCC_CR_HSEON | RCC_CR_PLLON;
+  RCC->CFGR =
+    RCC_CFGR_PLLSRC_HSE |
+    RCC_CFGR_PLLMUL_9 |
+    RCC_CFGR_SW_HSI |
+    RCC_CFGR_PPRE1_DIV_2;
+  RCC->CR =
+    RCC_CR_HSION |
+    RCC_CR_HSEON |
+    RCC_CR_PLLON;
   while (!(RCC->CR & RCC_CR_PLLRDY)) {
   }
 
   // Configure flash to work with the new speed, with prefetching enabled
   // and a two-clock wait for access.
   *FLASH_ACR = FLASH_ACR_PRFTBE | FLASH_ACR_LATENCY_2;
 
-  //RCC->CFGR = PLL_HSE | PLL_9 | SYS_PLL | ADC_DIV6 | APB1_DIV2;
-  RCC->CFGR = RCC_CFGR_PLLSRC_HSE | RCC_CFGR_PLLMUL_9 | RCC_CFGR_SW_PLL | RCC_CFGR_ADCPRE_DIV_6 | RCC_CFGR_HPRE_DIV_2;
-  
-  RCC->APB2ENR |= RCC_GPIOA_ENABLE;
-  RCC->APB2ENR |= RCC_GPIOB_ENABLE;
-  RCC->APB2ENR |= RCC_GPIOC_ENABLE;
-  RCC->APB2ENR |= RCC_ADC1_ENABLE;
-  RCC->APB2ENR |= RCC_ADC2_ENABLE;
-  RCC->APB2ENR |= RCC_UART1_ENABLE;
-  RCC->APB1ENR |= RCC_TIMER2_ENABLE;
+  RCC->CFGR =
+    RCC_CFGR_PLLSRC_HSE |
+    RCC_CFGR_PLLMUL_9 |
+    RCC_CFGR_SW_PLL |
+    RCC_CFGR_ADCPRE_DIV_8 |
+    RCC_CFGR_HPRE_DIV_2;
+
+  RCC->APB1ENR |= RCC_APB1ENR_TIM2EN;
+
+  RCC->APB2ENR |= RCC_APB2ENR_IOPAEN;
+  RCC->APB2ENR |= RCC_APB2ENR_IOPBEN;
+  RCC->APB2ENR |= RCC_APB2ENR_IOPCEN;
+  RCC->APB2ENR |= RCC_APB2ENR_ADC1EN;
+  RCC->APB2ENR |= RCC_APB2ENR_ADC2EN;
+  RCC->APB2ENR |= RCC_APB2ENR_USART1EN;
 }
 
 // This needs to be called before the ADC can be accessed.
-static inline void AdcInit(GPIO_t* gpio, int port) {
-  EnableNvic(ADC_IRQ_NUMBER);
+static inline void AdcInit(GPIO_t* gpio, int port, int do_interrupt) {
+  if (do_interrupt) {
+    EnableNvic(ADC_IRQ_NUMBER);
+  }
+  if (do_interrupt) {
+    // Trigger an interrupt at the end of a conversion.
+    ADC1->CR1 |= ADC_CR1_EOCIE;
+  } else {
+    ADC1->CR2 |= ADC_CR2_CONT;
+    ADC1->CR2 |= ADC_CR2_DMA;
+    ADC1->CR2 |= ADC_CR2_SWSTART | ADC_CR2_EXTTRIG;
+  }
+
   ADC1->CR2 |= ADC_CR2_ADON | ADC_CR2_TSVREFE;
   BusyWaitMicroseconds(30 * 1000);
   ADC1->CR2 |= ADC_CR2_CAL;
   while (ADC1->CR2 & ADC_CR2_CAL) {
   }
-  // Trigger an interrupt at the end of a conversion.
-  //ADC1->CR1 |= ADC_CR1_EOCIE;
+
+  ADC1->CR2 |= ADC_CR2_ADON;
+  
   SetGpioMode(gpio, port, GPIO_MODE_INPUT_ANALOG);
 }
 
@@ -91,11 +114,11 @@ static inline void AdcDmaOn(void* dma_buffer, int dma_buffer_count) {
     DMA_CCR_TEIE |
     DMA_CCR_DIR_FROM_PERIPHERAL |
     DMA_CCR_CIRC |
+    DMA_CCR_MINC |
     DMA_CCR_PSIZE_16 |
     DMA_CCR_MSIZE_16 |
     DMA_CCR_PL_LOW;
   DMA1->CCR1 |= DMA_CCR_EN;
-  ADC1->CR2 |= ADC_CR2_DMA;
 }
 
 static inline void AdcOn(void) {

include/debug_log.h

@@ -37,14 +37,21 @@ static inline void DebugLogInt32(int32_t i) {
   char number_string[kFastToBufferSize];
   number_string[0] = 'b';
   number_string[1] = 0;
-  FastInt32ToBufferLeft(i, number_string);
+  FastInt32ToBufferLeft(i, number_string, 10);
   DebugLog(number_string);
 }
 
 // Writes out an unsigned 32-bit number to the debug console.
 static inline void DebugLogUInt32(uint32_t i) {
   char number_string[kFastToBufferSize];
-  FastUInt32ToBufferLeft(i, number_string);
+  FastUInt32ToBufferLeft(i, number_string, 10);
+  DebugLog(number_string);
+}
+
+// Writes out an unsigned 32-bit number to the debug console as hex.
+static inline void DebugLogHex(uint32_t i) {
+  char number_string[kFastToBufferSize];
+  FastUInt32ToBufferLeft(i, number_string, 16);
   DebugLog(number_string);
 }
 

include/led.h

@@ -23,7 +23,7 @@ limitations under the License.
 // This needs to be called before the LED can be accessed.
 static inline void LedInit() {
   // Enable GPIOC.
-  RCC->APB2ENR |= RCC_GPIOC_ENABLE;
+  RCC->APB2ENR |= RCC_APB2ENR_IOPCEN;
 
   // Set up speed and configuration.
   const int shift = (LED_PORT - 8) * 4;

include/stm32_specifics.h

@@ -145,22 +145,6 @@ typedef struct {
 #define DMA1 ((DMA_t*)DMA1_BASE)
 #define DMA2 ((DMA_t*)DMA2_BASE)
 
-// Register access values.
-#define RCC_GPIOA_ENABLE (0x4)
-#define RCC_GPIOB_ENABLE (0x8)
-#define RCC_GPIOC_ENABLE (0x10)
-#define RCC_ADC1_ENABLE (0x200)
-#define RCC_ADC2_ENABLE (0x400)
-#define RCC_TIMER1_ENABLE (0x800)
-#define RCC_UART1_ENABLE (0x4000)
-
-#define RCC_TIMER2_ENABLE (0x1)
-#define RCC_TIMER3_ENABLE (0x2)
-#define RCC_TIMER4_ENABLE (0x4)
-#define RCC_UART2_ENABLE (0x20000)
-#define RCC_UART3_ENABLE (0x40000)
-#define RCC_USB_ENABLE (0x800000)
-
 // GPIO settings.
 #define GPIO_MODE_OUT_2 (0x2)
 #define GPIO_CONF_GP_UD (0x0)
@@ -282,6 +266,51 @@ typedef struct {
 #define RCC_AHBENR_FSMCEN (1 << 8)
 #define RCC_AHBENR_SDIOEN (1 << 10)
 
+// Reset and Clock Control APB1 Peripheral Clock Enable Register flag values.
+#define RCC_APB1ENR_TIM2EN (1 << 0)
+#define RCC_APB1ENR_TIM3EN (1 << 1)
+#define RCC_APB1ENR_TIM4EN (1 << 2)
+#define RCC_APB1ENR_TIM5EN (1 << 3)
+#define RCC_APB1ENR_TIM6EN (1 << 4)
+#define RCC_APB1ENR_TIM7EN (1 << 5)
+#define RCC_APB1ENR_TIM12EN (1 << 6)
+#define RCC_APB1ENR_TIM13EN (1 << 7)
+#define RCC_APB1ENR_TIM14EN (1 << 8)
+#define RCC_APB1ENR_WWDGEN (1 << 11)
+#define RCC_APB1ENR_SPI2EN (1 << 14)
+#define RCC_APB1ENR_SPI3EN (1 << 15)
+#define RCC_APB1ENR_USART2EN (1 << 17)
+#define RCC_APB1ENR_USART3EN (1 << 18)
+#define RCC_APB1ENR_USART4EN (1 << 19)
+#define RCC_APB1ENR_USART5EN (1 << 20)
+#define RCC_APB1ENR_I2C1EN (1 << 21)
+#define RCC_APB1ENR_I2C2EN (1 << 22)
+#define RCC_APB1ENR_USBEN (1 << 23)
+#define RCC_APB1ENR_CANEN (1 << 25)
+#define RCC_APB1ENR_BKPEN (1 << 27)
+#define RCC_APB1ENR_PWREN (1 << 28)
+#define RCC_APB1ENR_DACEN (1 << 29)
+
+// Reset and Clock Control APB2 Peripheral Clock Enable Register flag values.
+#define RCC_APB2ENR_AFIOEN (1 << 0)
+#define RCC_APB2ENR_IOPAEN (1 << 2)
+#define RCC_APB2ENR_IOPBEN (1 << 3)
+#define RCC_APB2ENR_IOPCEN (1 << 4)
+#define RCC_APB2ENR_IOPDEN (1 << 5)
+#define RCC_APB2ENR_IOPEEN (1 << 6)
+#define RCC_APB2ENR_IOPFEN (1 << 7)
+#define RCC_APB2ENR_IOPGEN (1 << 8)
+#define RCC_APB2ENR_ADC1EN (1 << 9)
+#define RCC_APB2ENR_ADC2EN (1 << 10)
+#define RCC_APB2ENR_TIM1EN (1 << 11)
+#define RCC_APB2ENR_SPI1EN (1 << 12)
+#define RCC_APB2ENR_TIM8EN (1 << 13)
+#define RCC_APB2ENR_USART1EN (1 << 14)
+#define RCC_APB2ENR_ADC3EN (1 << 15)
+#define RCC_APB2ENR_TIM91EN (1 << 19)
+#define RCC_APB2ENR_TIM10EN (1 << 20)
+#define RCC_APB2ENR_TIM11EN (1 << 21)
+
 // DMA Configuration Register flag values.
 #define DMA_CCR_EN (1 << 0)
 #define DMA_CCR_TCIE (1 << 1)

include/strings.h

@@ -30,28 +30,28 @@ static inline char* ReverseStringInPlace(char* start, char* end) {
 }
 
 // Populates the provided buffer with an ASCII representation of the number.
-static inline char* FastUInt32ToBufferLeft(uint32_t i, char* buffer) {
+static inline char* FastUInt32ToBufferLeft(uint32_t i, char* buffer, int base) {
   char* start = buffer;
   do {
-    *buffer++ = ((i % 10) + '0');
-    i /= 10;
+    *buffer++ = ((i % base) + '0');
+    i /= base;
   } while (i > 0);
   *buffer = 0;
   ReverseStringInPlace(start, buffer);
   return buffer;
 }
 
 // All input buffers to the number conversion functions must be this long.
-static const int kFastToBufferSize = 32;
+static const int kFastToBufferSize = 48;
 
 // Populates the provided buffer with an ASCII representation of the number.
-static inline char* FastInt32ToBufferLeft(int32_t i, char* buffer) {
+static inline char* FastInt32ToBufferLeft(int32_t i, char* buffer, int base) {
   uint32_t u = i;
   if (i < 0) {
     *buffer++ = '-';
     u = -u;
   }
-  return FastUInt32ToBufferLeft(u, buffer);
+  return FastUInt32ToBufferLeft(u, buffer, base);
 }
 
 // Appends a string to a string, in-place. You need to pass in the maximum string
@@ -72,16 +72,16 @@ static inline char* StrCatStr(char* main, int main_max_length, char* to_append)
 }
 
 // Converts a number to a string and appends it to another.
-static inline char* StrCatInt32(char* main, int main_max_length, int32_t number) {
+static inline char* StrCatInt32(char* main, int main_max_length, int32_t number, int base) {
   char number_string[kFastToBufferSize];
-  FastInt32ToBufferLeft(number, number_string);
+  FastInt32ToBufferLeft(number, number_string, base);
   StrCatStr(main, main_max_length, number_string);
 }
 
 // Converts a number to a string and appends it to another.
-static inline char* StrCatUInt32(char* main, int main_max_length, uint32_t number) {
+static inline char* StrCatUInt32(char* main, int main_max_length, uint32_t number, int base) {
   char number_string[kFastToBufferSize];
-  FastUInt32ToBufferLeft(number, number_string);
+  FastUInt32ToBufferLeft(number, number_string, base);
   StrCatStr(main, main_max_length, number_string);
 }