Corrected compilation problems.

This commit is contained in:
Joel Sherrill
1998-06-16 19:06:35 +00:00
parent 8bf609527b
commit fe52766e81
2 changed files with 21 additions and 13 deletions

View File

@@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
PGM=${ARCH}/css_iface.rel PGM=${ARCH}/css_iface.rel
# C source names, if any, go here -- minus the .c # C source names, if any, go here -- minus the .c
C_PIECES= C_PIECES=css_iface
C_FILES=$(C_PIECES:%=%.c) C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
@@ -32,7 +32,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg
# (OPTIONAL) Add local stuff here using += # (OPTIONAL) Add local stuff here using +=
# #
DEFINES += DEFINES += -I $(srcdir)/../include/dy4_supplied
CPPFLAGS += CPPFLAGS +=
CFLAGS += CFLAGS +=

View File

@@ -1,20 +1,28 @@
#include <bsp.h>
#include <Css.h> #include <Css.h>
#include <dmv170.h>
#include <assert.h>
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_unsigned32 Css_Id(
rtems_vector_number vector /* vector number */ rtems_vector_number vector /* vector number */
) )
{ {
rtems_unsigned32 id; rtems_unsigned32 id = 0;
switch ( vector ) { switch ( vector ) {
case DMV170_DUART_IRQ: case DMV170_DUART_IRQ:
case DMV170_ETHERNET_IRQ:
case DMV170_SCSI_IRQ:
case DMV170_SCC_IRQ:
id = CSS_DARF_INT; id = CSS_DARF_INT;
break; break;
case DMV170_MEZZANINE_IRQ: case DMV170_MEZZANINE_IRQ_0:
id = CSS_MAXPACK_INT; id = CSS_MAXPACK_INT;
break; break;
@@ -42,7 +50,7 @@ rtems_vector_number Vector_id(
rtems_unsigned32 id rtems_unsigned32 id
) )
{ {
rtems_vector_number vector; rtems_vector_number vector = 0;
switch ( id ) { switch ( id ) {
case CSS_ACFAIL_INT: case CSS_ACFAIL_INT:
@@ -76,10 +84,10 @@ rtems_vector_number Vector_id(
vector = DMV170_PERIPHERAL_IRQ; vector = DMV170_PERIPHERAL_IRQ;
break; break;
case CSS_MAXPACK_INT: case CSS_MAXPACK_INT:
vector = DMV170_MEZZANINE_IRQ_0;assert(0); assert(0);
break; break;
case CSS_SCV_VME_INT: case CSS_SCV_VME_INT:
vector = DMV170_MEZZANINE_IRQ_1;assert(0); assert(0);
break; break;
case CSS_RTC_INT: case CSS_RTC_INT:
vector = DMV170_RTC_IRQ; vector = DMV170_RTC_IRQ;
@@ -96,12 +104,12 @@ void enable_card_interrupt(
rtems_unsigned32 Id; rtems_unsigned32 Id;
Id = Css_Id(vector); Id = Css_Id(vector);
Enable_int(Id); Enable_int(Id, TRUE);
} }
rtems_vector_number Get_interrupt() rtems_vector_number Get_interrupt()
{ {
rtems_vector_number vector; rtems_vector_number vector = 0;
rtems_unsigned32 id; rtems_unsigned32 id;
if ( Get_int_status(CSS_ACFAIL_INT) ) if ( Get_int_status(CSS_ACFAIL_INT) )
@@ -129,7 +137,7 @@ rtems_vector_number Get_interrupt()
assert(0); assert(0);
} }
else if ( Get_int_status( CSS_SCV_VME_INT) ) { else if ( Get_int_status( CSS_SCV_VME_INT) ) {
vector = DMV170_MEZZANINE_IRQ_1; vector = DMV170_MEZZANINE_IRQ_0;
assert(0); assert(0);
} }
else if ( Get_int_status( CSS_RTC_INT) ) else if ( Get_int_status( CSS_RTC_INT) )