C++ build fixed, C dropped
This commit is contained in:
parent
c439c48643
commit
f26710a667
23 changed files with 50 additions and 1062 deletions
|
@ -16,6 +16,11 @@
|
|||
*
|
||||
******************************************************************************
|
||||
*/
|
||||
|
||||
/* This generated C file is symlinked as C++ and excluded from the build
|
||||
* USE_CPLUSPLUS macro is defined externally (Preprocessor Settings or Makefile)
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
|
@ -281,7 +286,7 @@ void DMA1_Stream4_IRQHandler(void)
|
|||
#ifdef USE_CPLUSPLUS
|
||||
f4ll::ConsoleHandler::HandleTxDmaIrq(&f4ll::ConsoleHandler::Instance());
|
||||
#else
|
||||
HandleConsoleUsartTxDmaIrq(&g_ConsoleTxDmaInfo, UART4);
|
||||
HandleConsoleTxDmaIrq(&g_ConsoleTxDmaInfo, UART4);
|
||||
#endif
|
||||
/* USER CODE END DMA1_Stream4_IRQn 0 */
|
||||
|
||||
|
@ -399,7 +404,7 @@ void UART4_IRQHandler(void)
|
|||
#ifdef USE_CPLUSPLUS
|
||||
f4ll::ConsoleHandler::HandleUsartIrq(&f4ll::ConsoleHandler::Instance());
|
||||
#else
|
||||
HandleConsoleUsartIrq(UART4);
|
||||
Con_HandleUsartIrq(UART4);
|
||||
#endif
|
||||
/* USER CODE END UART4_IRQn 0 */
|
||||
/* USER CODE BEGIN UART4_IRQn 1 */
|
||||
|
@ -452,7 +457,7 @@ void DMA2_Stream3_IRQHandler(void)
|
|||
#ifdef USE_CPLUSPLUS
|
||||
f4ll::MemcpyDma::Instance().DmaTransferCompleted();
|
||||
#else
|
||||
HandleMemcpyDmaIrq();
|
||||
Mcd_HandleDmaIrq();
|
||||
#endif
|
||||
/* USER CODE END DMA2_Stream3_IRQn 0 */
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue