From d16e95006f7a8ae8a62506dace8809acfc646efb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Apr 2002 13:07:55 +0000 Subject: 2002-04-20 Ralf Corsepius * startup/nulsystbl.c: Fix braces. * startup/Makefile.am: Remove types.h. * startup/types.h: Remove. --- c/src/lib/libbsp/i960/rxgen960/ChangeLog | 6 ++++ c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am | 5 ++- c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c | 6 ++-- c/src/lib/libbsp/i960/rxgen960/startup/types.h | 38 ---------------------- 4 files changed, 12 insertions(+), 43 deletions(-) (limited to 'c/src/lib/libbsp/i960') diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog index 9a88dd5432..30ed46e816 100644 --- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog +++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog @@ -1,3 +1,9 @@ +2002-04-20 Ralf Corsepius + + * startup/nulsystbl.c: Fix braces. + * startup/Makefile.am: Remove types.h. + * startup/types.h: Remove. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am index 6dc944a4ac..f9067796ba 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am @@ -16,7 +16,7 @@ C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c cntrltbl.c \ noinst_HEADERS = asmfault.h asmstub.h cntrltbl.h fault.h faultret.h flttbl.h \ frmstr.h i960.h ihandler.h intrtbl.h main.h memchnl.h pmc901_memmap.h \ - prcb.h rom_ibr.h rommon.h sctns.h systbl.h time.h types.h + prcb.h rom_ibr.h rommon.h sctns.h systbl.h time.h S_FILES = asmfault.S asmstub.S ihandler.S @@ -49,7 +49,6 @@ EXTRA_DIST = asmfault.S asmfault.h asmstub.S asmstub.h bspstart.c cntrltbl.c \ frmstr.c frmstr.h i960.h ihandler.S ihandler.h intrtbl.c intrtbl.h \ kkprintf.c linkcmds main.h memchnl.h nmi.c nulsystbl.c pmc901_memmap.h \ prcb.c prcb.h rom.ld rom_cntrltbl.c rom_ibr.c rom_ibr.h rom_prcb.c \ - rommon.h rxgen_romld.S sctns.c sctns.h setvec.c systbl.c systbl.h time.h \ - types.h + rommon.h rxgen_romld.S sctns.c sctns.h setvec.c systbl.c systbl.h time.h include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c index e8bf682859..eaff3b24f0 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c +++ b/c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c @@ -15,9 +15,10 @@ * to ram */ SystemTbl nulsystemTbl = { - 0, 0, 0, /* Reserved */ + { 0, 0, 0 }, /* Reserved */ svrStackPtr, /* Supervisor Stack Pointer Base */ - 0, 0, 0, 0, 0, 0, 0, 0, /* Preserved */ + { 0, 0, 0, 0, 0, 0, 0, 0 }, /* Preserved */ + { 0, 0, 0, 0, 0, 0, 0, 0, /* 0 - 7 */ 0, 0, 0, 0, 0, 0, 0, 0, /* 8 - 15 */ 0, 0, /* 16 - 17 */ @@ -76,6 +77,7 @@ SystemTbl nulsystemTbl = { 0, /* 112 */ 0, /* 113 */ 0, /* 114 */ + } }; /*-------------*/ /* End of file */ diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/types.h b/c/src/lib/libbsp/i960/rxgen960/startup/types.h index 9f6460435d..e69de29bb2 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/types.h +++ b/c/src/lib/libbsp/i960/rxgen960/startup/types.h @@ -1,38 +0,0 @@ -/* - * $Id$ - */ - -/* Type definitions for our use */ -#ifndef __TYPES_H -#define __TYPES_H -typedef unsigned char u8; -typedef unsigned int u32; -typedef unsigned short u16; -typedef unsigned char uchar; -typedef unsigned int Int32; -typedef unsigned short Int16; -typedef unsigned char Int8; -typedef unsigned int u_int; -typedef unsigned int u_long; -typedef unsigned short u_short; -typedef unsigned char u_char; -#ifndef NULL -#define NULL 0 -#endif -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif -/* - * Definitions of unsigned amounts - */ -#define ub Int8 -#define uw Int16 -#define ul Int64 -#define sl long -#define ui Int32 - - -#endif -- cgit v1.2.3