From fe52766e817dde27e49df13f26b27470fc784816 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Jun 1998 19:06:35 +0000 Subject: Corrected compilation problems. --- .../libbsp/powerpc/dmv177/css_iface/Makefile.in | 4 +-- .../libbsp/powerpc/dmv177/css_iface/css_iface.c | 30 ++++++++++++++-------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/dmv177/css_iface/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/css_iface/Makefile.in index a2beb5a285..3b653baecd 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/css_iface/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/css_iface/Makefile.in @@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ PGM=${ARCH}/css_iface.rel # C source names, if any, go here -- minus the .c -C_PIECES= +C_PIECES=css_iface C_FILES=$(C_PIECES:%=%.c) C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) @@ -32,7 +32,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg # (OPTIONAL) Add local stuff here using += # -DEFINES += +DEFINES += -I $(srcdir)/../include/dy4_supplied CPPFLAGS += CFLAGS += diff --git a/c/src/lib/libbsp/powerpc/dmv177/css_iface/css_iface.c b/c/src/lib/libbsp/powerpc/dmv177/css_iface/css_iface.c index f46782f2b0..10a60aca48 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/css_iface/css_iface.c +++ b/c/src/lib/libbsp/powerpc/dmv177/css_iface/css_iface.c @@ -1,20 +1,28 @@ +#include #include +#include +#include + +css_jump_table_struct *W_Css_jump_table; +#define JUMP_TABLE_ADDRESS ((void **) 0xf0f030a0) + +void Init_Css() +{ + W_Css_jump_table = *JUMP_TABLE_ADDRESS; +} rtems_unsigned32 Css_Id( rtems_vector_number vector /* vector number */ ) { - rtems_unsigned32 id; + rtems_unsigned32 id = 0; switch ( vector ) { case DMV170_DUART_IRQ: - case DMV170_ETHERNET_IRQ: - case DMV170_SCSI_IRQ: - case DMV170_SCC_IRQ: id = CSS_DARF_INT; break; - case DMV170_MEZZANINE_IRQ: + case DMV170_MEZZANINE_IRQ_0: id = CSS_MAXPACK_INT; break; @@ -42,7 +50,7 @@ rtems_vector_number Vector_id( rtems_unsigned32 id ) { - rtems_vector_number vector; + rtems_vector_number vector = 0; switch ( id ) { case CSS_ACFAIL_INT: @@ -76,10 +84,10 @@ rtems_vector_number Vector_id( vector = DMV170_PERIPHERAL_IRQ; break; case CSS_MAXPACK_INT: - vector = DMV170_MEZZANINE_IRQ_0;assert(0); + assert(0); break; case CSS_SCV_VME_INT: - vector = DMV170_MEZZANINE_IRQ_1;assert(0); + assert(0); break; case CSS_RTC_INT: vector = DMV170_RTC_IRQ; @@ -96,12 +104,12 @@ void enable_card_interrupt( rtems_unsigned32 Id; Id = Css_Id(vector); - Enable_int(Id); + Enable_int(Id, TRUE); } rtems_vector_number Get_interrupt() { - rtems_vector_number vector; + rtems_vector_number vector = 0; rtems_unsigned32 id; if ( Get_int_status(CSS_ACFAIL_INT) ) @@ -129,7 +137,7 @@ rtems_vector_number Get_interrupt() assert(0); } else if ( Get_int_status( CSS_SCV_VME_INT) ) { - vector = DMV170_MEZZANINE_IRQ_1; + vector = DMV170_MEZZANINE_IRQ_0; assert(0); } else if ( Get_int_status( CSS_RTC_INT) ) -- cgit v1.2.3