Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 01:05:27 +03:00
Code Issues Wiki Activity

[H7] Remove excess member from timerHardware_s (#8368)

Browse source 
[H7] Remove excess member from timerHardware_s
This commit is contained in:
Michael Keller 2019-06-04 21:14:54 +12:00 • committed by GitHub
commit c28e7cf8e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/drivers/pwm_output_dshot_hal_hal.c
View file

@ -402,8 +402,9 @@ P - High - High -
} else } else
#endif #endif
{ {
dmaInit(timerHardware->dmaIrqHandler, OWNER_MOTOR, RESOURCE_INDEX(motorIndex)); dmaIdentifier_e identifier = dmaGetIdentifier(timerHardware->dmaRef);
dmaSetHandler(timerHardware->dmaIrqHandler, motor_DMA_IRQHandler, NVIC_BUILD_PRIORITY(1, 2), motorIndex); dmaInit(identifier, OWNER_MOTOR, RESOURCE_INDEX(motorIndex));
dmaSetHandler(identifier, motor_DMA_IRQHandler, NVIC_BUILD_PRIORITY(1, 2), motorIndex);
} }
// Start the timer channel now. // Start the timer channel now.

1
src/main/drivers/timer.h
View file

@ -127,7 +127,6 @@ typedef struct timerHardware_s {
#elif defined(STM32H7) #elif defined(STM32H7)
DMA_Stream_TypeDef *dmaRef; DMA_Stream_TypeDef *dmaRef;
uint8_t dmaRequest; uint8_t dmaRequest;
uint8_t dmaIrqHandler; // XXX Should be gone (can be substituted by dmaGetIdentifier)
#else #else
DMA_Channel_TypeDef *dmaRef; DMA_Channel_TypeDef *dmaRef;
#endif #endif

3
src/main/drivers/timer_def.h
View file

@ -723,8 +723,7 @@
DEF_TIM_AF(TCH_## tim ## _ ## chan, pin) \ DEF_TIM_AF(TCH_## tim ## _ ## chan, pin) \
DEF_TIM_DMA_COND(/* add comma */ , \ DEF_TIM_DMA_COND(/* add comma */ , \
DEF_TIM_DMA_STREAM(dmaopt, TCH_## tim ## _ ## chan), \ DEF_TIM_DMA_STREAM(dmaopt, TCH_## tim ## _ ## chan), \
DEF_TIM_DMA_REQUEST(TCH_## tim ## _ ## chan), \ DEF_TIM_DMA_REQUEST(TCH_## tim ## _ ## chan) \
DEF_TIM_DMA_HANDLER(dmaopt, TCH_## tim ## _ ## chan) \
) \ ) \
DEF_TIM_DMA_COND(/* add comma */ , \ DEF_TIM_DMA_COND(/* add comma */ , \
DEF_TIM_DMA_STREAM(upopt, TCH_## tim ## _UP), \ DEF_TIM_DMA_STREAM(upopt, TCH_## tim ## _UP), \