From 0f8ee10e3fb43129dedef23e92485ca3e48c3dc1 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 20 Oct 2014 09:11:41 -0500 Subject: arm/edb7312: Fix warnings --- c/src/lib/libbsp/arm/edb7312/include/bsp.h | 9 +++++++++ c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S | 6 +++++- c/src/lib/libbsp/arm/edb7312/irq/irq.c | 4 +++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/c/src/lib/libbsp/arm/edb7312/include/bsp.h index 60793c2ca6..00e8d40b50 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h +++ b/c/src/lib/libbsp/arm/edb7312/include/bsp.h @@ -16,6 +16,8 @@ #ifndef _BSP_H #define _BSP_H +#ifndef ASM + #ifdef __cplusplus extern "C" { #endif @@ -57,10 +59,17 @@ int cs8900_driver_attach (struct rtems_bsdnet_ifconfig *config, /** @} */ +/* + * Prototypes for methods called from .S but implemented in C + */ +void edb7312_interrupt_dispatch(rtems_vector_number vector); + /** @} */ #ifdef __cplusplus } #endif +#endif /* !ASM */ + #endif /* _BSP_H */ diff --git a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S index 2cc3b386a5..cabd4195ea 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S +++ b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S @@ -1,6 +1,8 @@ /* * Cirrus EP7312 Intererrupt handler - * + */ + +/* * Copyright (c) 2002 by Jay Monkman * * Copyright (c) 2002 by Charlie Steader @@ -9,7 +11,9 @@ * found in the file LICENSE in this distribution or at * http://www.rtems.org/license/LICENSE. */ + #define __asm__ +#include #include "irq.h" .extern edb7312_interrupt_dispatch diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.c b/c/src/lib/libbsp/arm/edb7312/irq/irq.c index 327edce5f2..8c18ea7abd 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/irq.c +++ b/c/src/lib/libbsp/arm/edb7312/irq/irq.c @@ -1,6 +1,8 @@ /* * Cirrus EP7312 Intererrupt handler - * + */ + +/* * Copyright (c) 2010 embedded brains GmbH. * * Copyright (c) 2002 by Jay Monkman -- cgit v1.2.3