RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsp/leon3: Fix LEON3_mp_irq definition

Browse Source 
Provide it also if RTEMS_MULTIPROCESSING is defined.
This commit is contained in:
Sebastian Huber
2014-10-23 10:11:59 +02:00
parent 46dde0fcef
commit b4420323ae
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
c/src/lib/libbsp/sparc/leon3/include/bsp.h
View File

@@ -220,12 +220,13 @@ extern void BSP_shared_interrupt_unmask(int irq);
*/ */
extern void BSP_shared_interrupt_mask(int irq); extern void BSP_shared_interrupt_mask(int irq);
#if defined(RTEMS_SMP) || defined(RTEMS_MULTIPROCESSING)
/* Irq used by the shared memory driver and for inter-processor interrupts. /* Irq used by the shared memory driver and for inter-processor interrupts.
* The variable is weakly linked. Redefine the variable in your application * The variable is weakly linked. Redefine the variable in your application
* to override the BSP default. * to override the BSP default.
* See startup/bspsmp.c for the default value.
*/ */
extern const unsigned char LEON3_mp_irq; extern const unsigned char LEON3_mp_irq;
#endif
#ifdef RTEMS_SMP #ifdef RTEMS_SMP
/* Weak table used to implement static interrupt CPU affinity in a SMP /* Weak table used to implement static interrupt CPU affinity in a SMP

5
c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c
View File

@@ -22,11 +22,6 @@
#include <rtems/score/smpimpl.h> #include <rtems/score/smpimpl.h>
#include <stdlib.h> #include <stdlib.h>
/* Irq used by shared memory driver and for inter-processor interrupts.
* Can be overridden by being defined in the application.
*/
const unsigned char LEON3_mp_irq __attribute__((weak)) = 14;
#if !defined(__leon__) || defined(RTEMS_PARAVIRT) #if !defined(__leon__) || defined(RTEMS_PARAVIRT)
uint32_t _CPU_SMP_Get_current_processor( void ) uint32_t _CPU_SMP_Get_current_processor( void )
{ {

7
c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
View File

@@ -21,6 +21,13 @@
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#include <bsp/bootcard.h> #include <bsp/bootcard.h>
#if defined(RTEMS_SMP) || defined(RTEMS_MULTIPROCESSING)
/* Irq used by shared memory driver and for inter-processor interrupts.
* Can be overridden by being defined in the application.
*/
const unsigned char LEON3_mp_irq __attribute__((weak)) = 14;
#endif
/* /*
* Tells us if data cache snooping is available * Tells us if data cache snooping is available
*/ */