From 29025d98bb85b00cb99f7bf616b740198c67c24f Mon Sep 17 00:00:00 2001 From: bsongis Date: Mon, 4 Feb 2013 21:36:09 +0000 Subject: [PATCH] Companion9x 64bits compilation --- src/x9d/pulses_driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/x9d/pulses_driver.cpp b/src/x9d/pulses_driver.cpp index 437e119ad..0b12d2d5c 100644 --- a/src/x9d/pulses_driver.cpp +++ b/src/x9d/pulses_driver.cpp @@ -76,7 +76,7 @@ void init_pxx() DMA2_Stream1->CR = DMA_SxCR_CHSEL_1 | DMA_SxCR_CHSEL_2 | DMA_SxCR_PL_0 | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC | DMA_SxCR_DIR_0 | DMA_SxCR_PFCTRL ; DMA2_Stream1->PAR = (uint32_t) &TIM1->DMAR ; - DMA2_Stream1->M0AR = (uint32_t) &pxxStream[1] ; + DMA2_Stream1->M0AR = CONVERT_PTR(&pxxStream[1]); // DMA2_Stream1->FCR = 0x05 ; //DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0 ; // DMA2_Stream1->NDTR = 100 ; DMA2_Stream1->CR |= DMA_SxCR_EN ; // Enable DMA @@ -156,7 +156,7 @@ extern "C" void TIM1_CC_IRQHandler() { DMA2_Stream1->CR &= ~DMA_SxCR_EN ; // Disable DMA DMA2->LIFCR = DMA_LIFCR_CTCIF1 | DMA_LIFCR_CHTIF1 | DMA_LIFCR_CTEIF1 | DMA_LIFCR_CDMEIF1 | DMA_LIFCR_CFEIF1 ; // Write ones to clear bits - DMA2_Stream1->M0AR = (uint32_t) &pxxStream[1] ; + DMA2_Stream1->M0AR = CONVERT_PTR(&pxxStream[1]); DMA2_Stream1->CR |= DMA_SxCR_EN ; // Enable DMA TIM1->CCR1 = pxxStream[0] ; TIM1->DIER |= TIM_DIER_CC2IE ; // Enable this interrupt