playground-stm32/f407ve_hs_uart
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Interrupt handlers C -> C++

Browse source
This commit is contained in:
Attila Body 2019-11-04 09:57:31 +01:00
parent 9dba241466
commit 4de62c7f74
10 changed files with 105 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Src/stm32f4xx_it.c
View file

@ -16,6 +16,9 @@
*
******************************************************************************
*/
#ifdef __cplusplus
extern "C" {
/* USER CODE END Header */
/* Includes ------------------------------------------------------------------*/
@ -29,7 +32,11 @@
#include "memcpy_dma.h"
#include "globals.h"
#include "diag.h"
#include "ll_testbed.h"
}
#include "globals_cpp.h"
extern "C" {
/* USER CODE END Includes */
@ -215,7 +222,7 @@ void SysTick_Handler(void)
void DMA1_Stream1_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream1_IRQn 0 */
_HandleUsartRxDmaIrq(USART3_OFFSET);
f4ll::LL_HsUsart::HandleRxDmaIrq(g_usarts[USART3_OFFSET]);
/* USER CODE END DMA1_Stream1_IRQn 0 */
/* USER CODE BEGIN DMA1_Stream1_IRQn 1 */
@ -243,7 +250,7 @@ void DMA1_Stream2_IRQHandler(void)
void DMA1_Stream3_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream3_IRQn 0 */
_HandleUsartTxDmaIrq(USART3_OFFSET);
f4ll::LL_HsUsart::HandleTxDmaIrq(g_usarts[USART3_OFFSET]);
/* USER CODE END DMA1_Stream3_IRQn 0 */
/* USER CODE BEGIN DMA1_Stream3_IRQn 1 */
@ -271,7 +278,7 @@ void DMA1_Stream4_IRQHandler(void)
void DMA1_Stream5_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream5_IRQn 0 */
_HandleUsartRxDmaIrq(USART2_OFFSET);
f4ll::LL_HsUsart::HandleRxDmaIrq(g_usarts[USART2_OFFSET]);
/* USER CODE END DMA1_Stream5_IRQn 0 */
/* USER CODE BEGIN DMA1_Stream5_IRQn 1 */
@ -285,7 +292,7 @@ void DMA1_Stream5_IRQHandler(void)
void DMA1_Stream6_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream6_IRQn 0 */
_HandleUsartTxDmaIrq(USART2_OFFSET);
f4ll::LL_HsUsart::HandleTxDmaIrq(g_usarts[USART2_OFFSET]);
/* USER CODE END DMA1_Stream6_IRQn 0 */
/* USER CODE BEGIN DMA1_Stream6_IRQn 1 */
@ -325,7 +332,8 @@ void SPI2_IRQHandler(void)
void USART1_IRQHandler(void)
{
/* USER CODE BEGIN USART1_IRQn 0 */
_HandleUsartIrq(USART1_OFFSET);
f4ll::LL_HsUsart::HandleUsartIrq(g_usarts[USART1_OFFSET]);
// _HandleUsartIrq();
/* USER CODE END USART1_IRQn 0 */
/* USER CODE BEGIN USART1_IRQn 1 */
@ -338,7 +346,7 @@ void USART1_IRQHandler(void)
void USART2_IRQHandler(void)
{
/* USER CODE BEGIN USART2_IRQn 0 */
_HandleUsartIrq(USART2_OFFSET);
f4ll::LL_HsUsart::HandleUsartIrq(g_usarts[USART2_OFFSET]);
/* USER CODE END USART2_IRQn 0 */
/* USER CODE BEGIN USART2_IRQn 1 */
@ -351,7 +359,7 @@ void USART2_IRQHandler(void)
void USART3_IRQHandler(void)
{
/* USER CODE BEGIN USART3_IRQn 0 */
_HandleUsartIrq(USART3_OFFSET);
f4ll::LL_HsUsart::HandleUsartIrq(g_usarts[USART3_OFFSET]);
/* USER CODE END USART3_IRQn 0 */
/* USER CODE BEGIN USART3_IRQn 1 */
@ -391,7 +399,7 @@ void DMA2_Stream0_IRQHandler(void)
void DMA2_Stream1_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream1_IRQn 0 */
_HandleUsartRxDmaIrq(USART6_OFFSET);
f4ll::LL_HsUsart::HandleRxDmaIrq(g_usarts[USART6_OFFSET]);
/* USER CODE END DMA2_Stream1_IRQn 0 */
/* USER CODE BEGIN DMA2_Stream1_IRQn 1 */
@ -405,7 +413,7 @@ void DMA2_Stream1_IRQHandler(void)
void DMA2_Stream2_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream2_IRQn 0 */
_HandleUsartRxDmaIrq(USART1_OFFSET);
f4ll::LL_HsUsart::HandleRxDmaIrq(g_usarts[USART1_OFFSET]);
/* USER CODE END DMA2_Stream2_IRQn 0 */
/* USER CODE BEGIN DMA2_Stream2_IRQn 1 */
@ -434,11 +442,11 @@ void DMA2_Stream3_IRQHandler(void)
void DMA2_Stream4_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream4_IRQn 0 */
//HandleCrcDmaIrq(&g_crcStatus);
f4ll::LL_CrcHandler::Instance().DmaTransferCompleted();
/* USER CODE END DMA2_Stream4_IRQn 0 */
/* USER CODE BEGIN DMA2_Stream4_IRQn 1 */
_HandleCrcDmaIrq();
/* USER CODE END DMA2_Stream4_IRQn 1 */
}
@ -462,7 +470,7 @@ void DMA2_Stream5_IRQHandler(void)
void DMA2_Stream6_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream6_IRQn 0 */
_HandleUsartTxDmaIrq(USART6_OFFSET);
f4ll::LL_HsUsart::HandleTxDmaIrq(g_usarts[USART6_OFFSET]);
/* USER CODE END DMA2_Stream6_IRQn 0 */
/* USER CODE BEGIN DMA2_Stream6_IRQn 1 */
@ -476,7 +484,7 @@ void DMA2_Stream6_IRQHandler(void)
void DMA2_Stream7_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream7_IRQn 0 */
_HandleUsartTxDmaIrq(USART1_OFFSET);
f4ll::LL_HsUsart::HandleTxDmaIrq(g_usarts[USART1_OFFSET]);
/* USER CODE END DMA2_Stream7_IRQn 0 */
/* USER CODE BEGIN DMA2_Stream7_IRQn 1 */
@ -490,7 +498,7 @@ void DMA2_Stream7_IRQHandler(void)
void USART6_IRQHandler(void)
{
/* USER CODE BEGIN USART6_IRQn 0 */
_HandleUsartIrq(USART6_OFFSET);
f4ll::LL_HsUsart::HandleUsartIrq(g_usarts[USART6_OFFSET]);
/* USER CODE END USART6_IRQn 0 */
/* USER CODE BEGIN USART6_IRQn 1 */
@ -499,5 +507,7 @@ void USART6_IRQHandler(void)
/* USER CODE BEGIN 1 */
}
#endif // __cplusplus
/* USER CODE END 1 */
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

1
Src/stm32f4xx_it_.cpp Symbolic link
View file

@ -0,0 +1 @@
stm32f4xx_it.c