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

2009-03-02 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* Makefile.am, preinstall.am, include/bsp.h, startup/setvec.c: Now
	compiles again but applications do not link.
This commit is contained in:
Joel Sherrill
2009-03-03 00:10:56 +00:00
parent 188a3fc62f
commit f0f8e4deb2
5 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-03-02 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, preinstall.am, include/bsp.h, startup/setvec.c: Now
compiles again but applications do not link.
2008-12-04 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-12-04 Joel Sherrill <joel.sherrill@oarcorp.com>
* bsp_specs: Move -e start from *link to *startfile to avoid warning * bsp_specs: Move -e start from *link to *startfile to avoid warning

5
c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
View File

@@ -8,10 +8,13 @@ include $(top_srcdir)/../../../../automake/compile.am
dist_project_lib_DATA = bsp_specs dist_project_lib_DATA = bsp_specs
include_bspdir = $(includedir)/bsp
include_HEADERS = include/bsp.h include_HEADERS = include/bsp.h
include_HEADERS += ../../shared/include/tm27.h include_HEADERS += ../../shared/include/tm27.h
nodist_include_HEADERS = include/bspopts.h nodist_include_HEADERS = include/bspopts.h
nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h DISTCLEANFILES = include/bspopts.h
include_HEADERS += ../../shared/include/coverhd.h include_HEADERS += ../../shared/include/coverhd.h
@@ -39,9 +42,11 @@ libbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h
libbsp_a_SOURCES += console/console.c libbsp_a_SOURCES += console/console.c
# timer # timer
libbsp_a_SOURCES += timer/timer.c libbsp_a_SOURCES += timer/timer.c
if HAS_MP
# shmsupp # shmsupp
libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
shmsupp/mpisr.c shmsupp/mpisr.c
endif
include $(srcdir)/preinstall.am include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

2
c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h
View File

@@ -129,7 +129,7 @@ altera_avalon_jtag_uart_regs;
/* functions */ /* functions */
nios2_isr_entry set_vector( /* returns old vector */ rtems_isr_entry set_vector( /* returns old vector */
rtems_isr_entry handler, /* isr routine */ rtems_isr_entry handler, /* isr routine */
rtems_vector_number vector, /* vector number */ rtems_vector_number vector, /* vector number */
int type /* RTEMS or RAW intr */ int type /* RTEMS or RAW intr */

9
c/src/lib/libbsp/nios2/nios2_iss/preinstall.am
View File

@@ -32,6 +32,11 @@ $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
@@ -44,6 +49,10 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h

4
c/src/lib/libbsp/nios2/nios2_iss/startup/setvec.c
View File

@@ -27,13 +27,13 @@
#include <rtems.h> #include <rtems.h>
#include <bsp.h> #include <bsp.h>
nios2_isr_entry set_vector( /* returns old vector */ rtems_isr_entry set_vector( /* returns old vector */
rtems_isr_entry handler, /* isr routine */ rtems_isr_entry handler, /* isr routine */
rtems_vector_number vector, /* vector number */ rtems_vector_number vector, /* vector number */
int type /* RTEMS or RAW intr */ int type /* RTEMS or RAW intr */
) )
{ {
nios2_isr_entry previous_isr; rtems_isr_entry previous_isr;
if ( type ) if ( type )
rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr ); rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr );