forked from Imagelibrary/rtems
Renamed shm.h to shm_driver.h to avoid conflicts with POSIX shm.h.
Renamed file shmsupp/intr.c in some BSPs to shmsupp/cause_intr.c to avoid conflict with rtems/src/intr.c (Classic API Interrupt Manager).
This commit is contained in:
@@ -16,7 +16,7 @@ VPATH = @srcdir@
|
||||
PGM = ${ARCH}/shmsupp.rel
|
||||
|
||||
# C source names, if any, go here -- minus the .c
|
||||
C_PIECES = addrconv getcfg intr lock mpisr
|
||||
C_PIECES = addrconv getcfg cause_intr lock mpisr
|
||||
C_FILES = $(C_PIECES:%=%.c)
|
||||
C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
*/
|
||||
|
||||
#include <bsp.h>
|
||||
#include <shm.h>
|
||||
#include <shm_driver.h>
|
||||
|
||||
void *Shm_Convert_address(
|
||||
void *addr
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
*/
|
||||
|
||||
#include <bsp.h>
|
||||
#include <shm.h>
|
||||
#include <shm_driver.h>
|
||||
#include <sys/types.h> /* pid_t */
|
||||
|
||||
void Shm_Cause_interrupt_unix(
|
||||
@@ -25,7 +25,7 @@
|
||||
*/
|
||||
|
||||
#include <bsp.h>
|
||||
#include <shm.h>
|
||||
#include <shm_driver.h>
|
||||
#include <sys/types.h> /* pid_t */
|
||||
|
||||
shm_config_table BSP_shm_cfgtbl;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
|
||||
#include <bsp.h>
|
||||
#include <shm.h>
|
||||
#include <shm_driver.h>
|
||||
|
||||
/*
|
||||
* Shm_Initialize_lock
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include <bsp.h>
|
||||
#include <shm.h>
|
||||
#include <shm_driver.h>
|
||||
|
||||
void Shm_setvec( void )
|
||||
{
|
||||
|
||||
@@ -27,7 +27,7 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES)
|
||||
CPU_PIECES =
|
||||
|
||||
GENERIC_MP_REL_PIECES_yes_V = shmdr
|
||||
GENERIC_MP_REL_PIECES = $(GENERIC_MP_REL_$(HAS_MP)_V)
|
||||
GENERIC_MP_REL_PIECES = $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
|
||||
GENERIC_PIECES = $(GENERIC_MP_REL_PIECES)
|
||||
|
||||
# bummer; have to use $foreach since % pattern subst rules only replace 1x
|
||||
|
||||
Reference in New Issue
Block a user