Ignore:
Timestamp:
09/13/00 19:42:20 (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
63c5ce45
Parents:
3db37a7c
Message:

2000-09-13 Joel Sherrill <joel@…>

  • Makefile.am, bsp_specs, configure.in, console/Makefile.am, include/Makefile.am, irq/Makefile.am, irq/irq.c, start/Makefile.am, startup/Makefile.am, startup/exit.c, wrapup/Makefile.am: Made to conform to current practice concerning automake and autoconf. Corrected minor warnings.
Location:
c/src/lib/libbsp/arm/vegaplus/irq
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am

    r3db37a7c r8b9acbf0  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    1010
    1111C_FILES = irq.c irq_init.c bsp_irq_init.c
     12C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
     13
    1214S_FILES = irq_asm.S bsp_irq_asm.S
     15S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
     16
    1317H_FILES = irq.h
    1418
    15 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    16 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
    17 
    18 irq_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
    19 
    20 $(PROJECT_INCLUDE):
    21         $(mkinstalldirs) $@
    22 
    23 $(PROJECT_INCLUDE)/%.h: %.h
    24         $(INSTALL_DATA) $< $@
    25 
    26 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
     19OBJS = $(C_O_FILES) $(S_O_FILES)
    2720
    2821include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     22include $(top_srcdir)/../../../../../../automake/compile.am
    2923include $(top_srcdir)/../../../../../../automake/lib.am
    3024
     
    3327#
    3428
    35 $(PGM): $(startup_rel_OBJECTS)
     29AM_CPPFLAGS += -I$(srcdir)
     30
     31$(PGM): $(OBJS)
    3632        $(make-rel)
    3733
    38 all: $(PREINSTALL_FILES) $(ARCH) $(irq_rel_OBJECTS) $(PGM)
     34# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
     35
     36all-local: $(ARCH) $(OBJS) $(PGM)
    3937
    4038.PRECIOUS: $(PGM)
    4139
    42 EXTRA_DIST = irq.c bsp_irq_init.c bsp_irq_asm.S
     40EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c irq.h
    4341
    4442include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libbsp/arm/vegaplus/irq/irq.c

    r3db37a7c r8b9acbf0  
    4040{
    4141    rtems_irq_hdl *HdlTable;
     42    rtems_interrupt_level level;
    4243   
    4344    if (!isValidInterrupt(irq->name)) {
     
    4748     * Check if default handler is actually connected. If not issue an error.
    4849     */
    49     HdlTable = VECTOR_TABLE;
     50    HdlTable = (rtems_irq_hdl *) VECTOR_TABLE;
    5051    if (*(HdlTable + irq->name) != default_int_handler) {
    5152      return 0;
     
    8788{
    8889    rtems_irq_hdl *HdlTable;
     90    rtems_interrupt_level level;
    8991 
    9092    if (!isValidInterrupt(irq->name)) {
     
    9496     * Check if the handler is actually connected. If not issue an error.
    9597     */
    96     HdlTable = VECTOR_TABLE;
     98    HdlTable = (rtems_irq_hdl *) VECTOR_TABLE;
    9799    if (*(HdlTable + irq->name) != irq->hdl) {
    98100      return 0;
Note: See TracChangeset for help on using the changeset viewer.