Commit 38d62466 authored by Oliver Horst's avatar Oliver Horst
Browse files

[merge] Integrated 'feature/can-driver' branch

parents 0f164c26 02bc3f56
# SPDX-License-Identifier: MIT
cmake_minimum_required(VERSION 3.7 FATAL_ERROR) cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
target_sources( target_sources(
...@@ -7,4 +5,5 @@ target_sources( ...@@ -7,4 +5,5 @@ target_sources(
# #
PRIVATE PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/uart.c" "${CMAKE_CURRENT_LIST_DIR}/uart.c"
"${CMAKE_CURRENT_LIST_DIR}/can.c"
) )
This diff is collapsed.
...@@ -151,10 +151,13 @@ volatile uint32_t ulInterruptStatus; ...@@ -151,10 +151,13 @@ volatile uint32_t ulInterruptStatus;
void vApplicationIRQHandler( uint32_t ulICCIAR ) void vApplicationIRQHandler( uint32_t ulICCIAR )
{ {
extern const XScuGic_Config XScuGic_ConfigTable[]; const XScuGic_VectorTableEntry *pxVectorTable;
static const XScuGic_VectorTableEntry *pxVectorTable = XScuGic_ConfigTable[ XPAR_SCUGIC_SINGLE_DEVICE_ID ].HandlerTable;
uint32_t ulInterruptID;
const XScuGic_VectorTableEntry *pxVectorEntry; const XScuGic_VectorTableEntry *pxVectorEntry;
uint32_t ulInterruptID;
configASSERT( xInterruptController.Config );
pxVectorTable = xInterruptController.Config->HandlerTable;
/* Interrupts cannot be re-enabled until the source of the interrupt is /* Interrupts cannot be re-enabled until the source of the interrupt is
cleared. The ID of the interrupt is obtained by bitwise ANDing the ICCIAR cleared. The ID of the interrupt is obtained by bitwise ANDing the ICCIAR
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment