summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i960
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-04-21 10:43:04 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-04-21 10:43:04 +0000
commit6128a4aa5e791ed4e0a655bfd346a52d92da7883 (patch)
treeaf53ca3f67ce405b6fbc6c98399c8e0c87e01a9e /c/src/lib/libbsp/i960
parent2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2
Remove stray white spaces.
Diffstat (limited to 'c/src/lib/libbsp/i960')
-rw-r--r--c/src/lib/libbsp/i960/cvme961/clock/ckinit.c20
-rw-r--r--c/src/lib/libbsp/i960/cvme961/console/console.c38
-rw-r--r--c/src/lib/libbsp/i960/cvme961/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/i960/cvme961/startup/bspstart.c10
-rw-r--r--c/src/lib/libbsp/i960/i960sim/console/console-io.c4
-rw-r--r--c/src/lib/libbsp/i960/i960sim/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/i960/i960sim/start/start.c2
-rw-r--r--c/src/lib/libbsp/i960/i960sim/startup/bspstart.c6
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c26
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/console/console.c14
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/console/serial.c30
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S22
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/asmfault.S6
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/asmfault.h2
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S2
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c12
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c8
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h24
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/fault.c76
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/fault.h16
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/faultret.h2
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/flttbl.c36
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/flttbl.h12
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/frmstr.c44
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/ihandler.S6
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/ihandler.h2
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.h6
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/main.h2
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/memchnl.h10
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c26
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/prcb.c22
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/prcb.h36
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c8
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c8
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.h10
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/rom_prcb.c22
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/rommon.h6
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/sctns.c10
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/sctns.h4
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/systbl.c22
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/systbl.h10
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/timer/timer.c12
43 files changed, 320 insertions, 320 deletions
diff --git a/c/src/lib/libbsp/i960/cvme961/clock/ckinit.c b/c/src/lib/libbsp/i960/cvme961/clock/ckinit.c
index e7279e1ebc..99ec6a34e6 100644
--- a/c/src/lib/libbsp/i960/cvme961/clock/ckinit.c
+++ b/c/src/lib/libbsp/i960/cvme961/clock/ckinit.c
@@ -30,11 +30,11 @@ volatile uint32_t Clock_driver_ticks;
/* ticks since initialization */
void Clock_exit( void );
-
+
/*
* These are set by clock driver during its init
*/
-
+
rtems_device_major_number rtems_clock_major = ~0;
rtems_device_minor_number rtems_clock_minor;
@@ -74,19 +74,19 @@ rtems_device_driver Clock_initialize(
)
{
Install_clock( Clock_isr );
-
+
atexit( Clock_exit );
/*
* make major/minor avail to others such as shared memory driver
*/
-
+
rtems_clock_major = major;
rtems_clock_minor = minor;
-
+
return RTEMS_SUCCESSFUL;
}
-
+
rtems_device_driver Clock_control(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -95,15 +95,15 @@ rtems_device_driver Clock_control(
{
uint32_t isrlevel;
rtems_libio_ioctl_args_t *args = pargp;
-
+
if (args == 0)
goto done;
-
+
/*
* This is hokey, but until we get a defined interface
* to do this, it will just be this simple...
*/
-
+
if (args->command == rtems_build_name('I', 'S', 'R', ' '))
{
Clock_isr(CLOCK_VECTOR);
@@ -114,7 +114,7 @@ rtems_device_driver Clock_control(
(void) set_vector( args->buffer, CLOCK_VECTOR, 1 );
rtems_interrupt_enable( isrlevel );
}
-
+
done:
return RTEMS_SUCCESSFUL;
}
diff --git a/c/src/lib/libbsp/i960/cvme961/console/console.c b/c/src/lib/libbsp/i960/cvme961/console/console.c
index 4b046658b4..ccf5df7258 100644
--- a/c/src/lib/libbsp/i960/cvme961/console/console.c
+++ b/c/src/lib/libbsp/i960/cvme961/console/console.c
@@ -32,16 +32,16 @@ rtems_device_driver console_initialize(
)
{
rtems_status_code status;
-
+
status = rtems_io_register_name(
"/dev/console",
major,
(rtems_device_minor_number) 0
);
-
+
if (status != RTEMS_SUCCESSFUL)
rtems_fatal_error_occurred(status);
-
+
return RTEMS_SUCCESSFUL;
}
@@ -107,7 +107,7 @@ void outbyte(
/*
* Open entry point
*/
-
+
rtems_device_driver console_open(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -116,11 +116,11 @@ rtems_device_driver console_open(
{
return RTEMS_SUCCESSFUL;
}
-
+
/*
* Close entry point
*/
-
+
rtems_device_driver console_close(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -129,11 +129,11 @@ rtems_device_driver console_close(
{
return RTEMS_SUCCESSFUL;
}
-
+
/*
* read bytes from the serial port. We only have stdin.
*/
-
+
rtems_device_driver console_read(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -144,12 +144,12 @@ rtems_device_driver console_read(
char *buffer;
int maximum;
int count = 0;
-
+
rw_args = (rtems_libio_rw_args_t *) arg;
-
+
buffer = rw_args->buffer;
maximum = rw_args->count;
-
+
for (count = 0; count < maximum; count++) {
buffer[ count ] = inbyte();
if (buffer[ count ] == '\n' || buffer[ count ] == '\r') {
@@ -157,15 +157,15 @@ rtems_device_driver console_read(
break;
}
}
-
+
rw_args->bytes_moved = count;
return (count >= 0) ? RTEMS_SUCCESSFUL : RTEMS_UNSATISFIED;
}
-
+
/*
* write bytes to the serial port. Stdout and stderr are the same.
*/
-
+
rtems_device_driver console_write(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -176,12 +176,12 @@ rtems_device_driver console_write(
int maximum;
rtems_libio_rw_args_t *rw_args;
char *buffer;
-
+
rw_args = (rtems_libio_rw_args_t *) arg;
-
+
buffer = rw_args->buffer;
maximum = rw_args->count;
-
+
for (count = 0; count < maximum; count++) {
if ( buffer[ count ] == '\n') {
outbyte('\r');
@@ -192,11 +192,11 @@ rtems_device_driver console_write(
rw_args->bytes_moved = maximum;
return 0;
}
-
+
/*
* IO Control entry point
*/
-
+
rtems_device_driver console_control(
rtems_device_major_number major,
rtems_device_minor_number minor,
diff --git a/c/src/lib/libbsp/i960/cvme961/include/bsp.h b/c/src/lib/libbsp/i960/cvme961/include/bsp.h
index 9c892faa0f..d05b0819c8 100644
--- a/c/src/lib/libbsp/i960/cvme961/include/bsp.h
+++ b/c/src/lib/libbsp/i960/cvme961/include/bsp.h
@@ -135,7 +135,7 @@ BSP_EXTERN i960ca_control_table *Ctl_tbl;
/*
* NOTE: Use the standard Console driver entry
*/
-
+
/*
* NOTE: Use the standard Clock driver entry
*/
diff --git a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
index 9b8b9b6daa..5a5bd86d32 100644
--- a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
+++ b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
@@ -21,7 +21,7 @@
#include <bsp.h>
#include <rtems/libio.h>
#include <rtems/libcsupport.h>
-
+
/*
* The original table from the application and our copy of it with
* some changes.
@@ -38,7 +38,7 @@ char *rtems_progname;
/*
* Use the shared implementations of the following routines
*/
-
+
void bsp_postdriver_hook(void);
void bsp_libc_init( void *, uint32_t, int );
@@ -55,7 +55,7 @@ void bsp_libc_init( void *, uint32_t, int );
* not yet initialized.
*
*/
-
+
void bsp_pretasking_hook(void)
{
extern int end;
@@ -66,12 +66,12 @@ void bsp_pretasking_hook(void)
heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
bsp_libc_init((void *) heap_start, 64 * 1024, 0);
-
+
#ifdef RTEMS_DEBUG
rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
#endif
}
-
+
/*
* bsp_start
*
diff --git a/c/src/lib/libbsp/i960/i960sim/console/console-io.c b/c/src/lib/libbsp/i960/i960sim/console/console-io.c
index 853d133255..1f17fad4cb 100644
--- a/c/src/lib/libbsp/i960/i960sim/console/console-io.c
+++ b/c/src/lib/libbsp/i960/i960sim/console/console-io.c
@@ -47,7 +47,7 @@ void console_outbyte_polled(
}
/*
- * console_inbyte_nonblocking
+ * console_inbyte_nonblocking
*
* This routine polls for a character.
*/
@@ -61,7 +61,7 @@ int console_inbyte_nonblocking(
char c;
status = _sys_read (0, &c, 1, &nread);
- if ( status == 0 )
+ if ( status == 0 )
return c;
return -1;
}
diff --git a/c/src/lib/libbsp/i960/i960sim/include/bsp.h b/c/src/lib/libbsp/i960/i960sim/include/bsp.h
index d02c20f3fd..cab30a0c0e 100644
--- a/c/src/lib/libbsp/i960/i960sim/include/bsp.h
+++ b/c/src/lib/libbsp/i960/i960sim/include/bsp.h
@@ -68,7 +68,7 @@ extern rtems_configuration_table BSP_Configuration;
/*
* NOTE: Use the standard Console driver entry
*/
-
+
/*
* NOTE: Use the standard Clock driver entry
*/
diff --git a/c/src/lib/libbsp/i960/i960sim/start/start.c b/c/src/lib/libbsp/i960/i960sim/start/start.c
index 590e3eb8ed..d6b0f9aafe 100644
--- a/c/src/lib/libbsp/i960/i960sim/start/start.c
+++ b/c/src/lib/libbsp/i960/i960sim/start/start.c
@@ -4,7 +4,7 @@ char **environ = __env;
#define ENABLE_TRACE_MASK 1
#define STACK_ALIGN 64
-__inline static void
+__inline static void
init_Cregs (void)
{
/* set register values gcc like */
diff --git a/c/src/lib/libbsp/i960/i960sim/startup/bspstart.c b/c/src/lib/libbsp/i960/i960sim/startup/bspstart.c
index 8469fe710d..60ac79070a 100644
--- a/c/src/lib/libbsp/i960/i960sim/startup/bspstart.c
+++ b/c/src/lib/libbsp/i960/i960sim/startup/bspstart.c
@@ -36,7 +36,7 @@ char *rtems_progname;
/*
* Use the shared implementations of the following routines
*/
-
+
void bsp_postdriver_hook(void);
void bsp_libc_init( void *, uint32_t, int );
@@ -53,7 +53,7 @@ void bsp_libc_init( void *, uint32_t, int );
* not yet initialized.
*
*/
-
+
void bsp_pretasking_hook(void)
{
extern int HeapBase;
@@ -69,7 +69,7 @@ void bsp_pretasking_hook(void)
#endif
}
-
+
/*
* bsp_start
*
diff --git a/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c b/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c
index e5e5537965..8afdc4a320 100644
--- a/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c
+++ b/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c
@@ -1,6 +1,6 @@
/* Clock_init()
*
- * This routine initializes the i960RP onboard timer
+ * This routine initializes the i960RP onboard timer
* The tick frequency is 1 millisecond; assuming 33MHz core
*
* Input parameters: NONE
@@ -34,11 +34,11 @@ volatile uint32_t Clock_driver_ticks;
unsigned int clock_isr_global[16]; /* place to store global regs */
void Clock_exit( void );
-
+
/*
* These are set by clock driver during its init
*/
-
+
rtems_device_major_number rtems_clock_major = ~0;
rtems_device_minor_number rtems_clock_minor;
@@ -72,14 +72,14 @@ void Install_clock(
Old_ticker = set_vector( (((unsigned int) clock_isr) | 0x2), CLOCK_VECTOR, 1 );
/* initialize the i960RP timer 0 here */
-
+
/* set the timer countdown (Assume 33MHz operation) */
*trr0 = 30 * BSP_Configuration.microseconds_per_tick ;
*tcr0 = 30 * BSP_Configuration.microseconds_per_tick ;
/*
kkprintf("Load the timers with %x\n", 30 * BSP_Configuration.microseconds_per_tick / Reload_Clock_isrs);
*/
-
+
*tmr0 = BUS_CLOCK_1 | TMR_AUTO_RELOAD | TMR_ENABLE;
/* Unmask the interrupts */
*ipnd &= ~(1 << 12);
@@ -105,19 +105,19 @@ rtems_device_driver Clock_initialize(
)
{
Install_clock( Clock_isr );
-
+
atexit( Clock_exit );
/*
* make major/minor avail to others such as shared memory driver
*/
-
+
rtems_clock_major = major;
rtems_clock_minor = minor;
-
+
return RTEMS_SUCCESSFUL;
}
-
+
rtems_device_driver Clock_control(
rtems_device_major_number major,
rtems_device_minor_number minor,
@@ -126,15 +126,15 @@ rtems_device_driver Clock_control(
{
uint32_t isrlevel;
rtems_libio_ioctl_args_t *args = pargp;
-
+
if (args == 0)
goto done;
-
+
/*
* This is hokey, but until we get a defined interface
* to do this, it will just be this simple...
*/
-
+
if (args->command == rtems_build_name('I', 'S', 'R', ' '))
{
Clock_isr(CLOCK_VECTOR);
@@ -145,7 +145,7 @@ rtems_device_driver Clock_control(
(void) set_tmr_vector( args->buffer, CLOCK_VECTOR, 0 );
rtems_interrupt_enable( isrlevel );
}
-
+
done:
return RTEMS_SUCCESSFUL;
}
diff --git a/c/src/lib/libbsp/i960/rxgen960/console/console.c b/c/src/lib/libbsp/i960/rxgen960/console/console.c
index fd5124c6bf..9e24c8c7a1 100644
--- a/c/src/lib/libbsp/i960/rxgen960/console/console.c
+++ b/c/src/lib/libbsp/i960/rxgen960/console/console.c
@@ -38,20 +38,20 @@ rtems_device_driver console_initialize(
)
{
rtems_status_code status;
-
+
if ( console_pmr_init(*(uint32_t*)arg) )
return RTEMS_INVALID_NUMBER;
-
+
status = rtems_io_register_name(
"/dev/console",
major,
(rtems_device_minor_number) 0
);
-
+
if (status != RTEMS_SUCCESSFUL)
rtems_fatal_error_occurred(status);
-
+
return RTEMS_SUCCESSFUL;
}
@@ -133,7 +133,7 @@ rtems_device_driver console_open(
{
return RTEMS_SUCCESSFUL;
}
-
+
/*
* Close entry point
*/
@@ -161,7 +161,7 @@ rtems_device_driver console_read(
uint8_t *buffer;
uint32_t maximum;
uint32_t count = 0;
-
+
rw_args = (rtems_libio_rw_args_t *) arg;
buffer = rw_args->buffer;
@@ -191,7 +191,7 @@ rtems_device_driver console_read(
}
/*
- * write bytes to the serial port. Stdout and stderr are the same.
+ * write bytes to the serial port. Stdout and stderr are the same.
*/
rtems_device_driver console_write(
diff --git a/c/src/lib/libbsp/i960/rxgen960/console/serial.c b/c/src/lib/libbsp/i960/rxgen960/console/serial.c
index bebeca997d..9f1af9acec 100644
--- a/c/src/lib/libbsp/i960/rxgen960/console/serial.c
+++ b/c/src/lib/libbsp/i960/rxgen960/console/serial.c
@@ -10,10 +10,10 @@ typedef unsigned char uchar ; /* Abbreviations */
typedef unsigned short ushort ;
typedef unsigned long ulong ;
int DBGConsole_make_sync = 0;
-#define CONSOLE_CHANNELS 1
+#define CONSOLE_CHANNELS 1
#define MAX_CONSOLE 4
-static int consoles[MAX_CONSOLE];
+static int consoles[MAX_CONSOLE];
static int active_consoles = 0;
static struct{
rtems_id sem;
@@ -25,7 +25,7 @@ static struct{
/* This uses the message out and in buffers as serial emulator.
- Pretty stupid eh?
+ Pretty stupid eh?
*/
#define uart1 ((volatile unsigned char *)0x1318)
@@ -51,7 +51,7 @@ console_uartinit(unsigned int BAUDRate)
return(0);
}
-
+
/* Introduce a new console channel */
console_new(char * name)
{
@@ -71,13 +71,13 @@ console_new(char * name)
rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &consoles[active_consoles] );
#endif
}
-
+
/***********************************************************************
*** Transmit character to host.
*** put the console ID in upper byte
- ***
+ ***
***********************************************************************/
int console_sps_putc(int cc)
@@ -138,10 +138,10 @@ wait:
char buffer[9];
int count;
int digit;
-
+
for (count = 7 ; count >= 0 ; count--) {
digit = (num >> (count * 4)) & 0xf;
-
+
if (digit <= 9)
console_sps_putc( (char) ('0' + digit));
else
@@ -161,7 +161,7 @@ wait:
int j = 0;
int val = 0;
int digit = 0;
-
+
console_sps_putc(13);
console_sps_putc(10);
putnum((unsigned int) addr);
@@ -176,7 +176,7 @@ wait:
digit = (val & 0xf0) >> 4;
val <<= 4;
- if (digit < 10)
+ if (digit < 10)
{
console_sps_putc(digit + '0');
}
@@ -218,7 +218,7 @@ wait:
unsigned int *satucmd = (unsigned int *) 0x1298;
unsigned int *soccar = (unsigned int *) 0x12a8;
unsigned int *soccdp = (unsigned int *) 0x12b0;
-
+
*satucmd = 4;
console_sps_putc(13);
@@ -236,7 +236,7 @@ wait:
digit = (val & 0xf000) >> 12;
val <<= 4;
- if (digit < 10)
+ if (digit < 10)
{
console_sps_putc(digit + '0');
}
@@ -269,7 +269,7 @@ wait:
#ifdef CONSOLE_CHANNELS
int console_sps_getc()
{
-
+
int consinx;
int rtid, i;
unsigned int level, level2;
@@ -304,7 +304,7 @@ int console_sps_getc()
rtems_interrupt_enable(level);
return ch;
}
-
+
void cons_isr()
{
@@ -323,7 +323,7 @@ void cons_isr()
release:
*uart_rx = 0;
}
-
+
#else
volatile int console_foo = 0;
int console_sps_getc()
diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
index d4014087b7..cec76ce3fb 100644
--- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
+++ b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
@@ -134,7 +134,7 @@ BSP_EXTERN i960_control_table *Ctl_tbl;
/*
* NOTE: Use the standard Console driver entry
*/
-
+
/*
* NOTE: Use the standard Clock driver entry
*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S b/c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S
index 682841581f..de62be173d 100644
--- a/c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S
+++ b/c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S
@@ -11,11 +11,11 @@
.globl _start
.globl _romFaultStart
.globl _led_array
- .text
+ .text
start: /* JRS */
_start: /* JRS */
-SYM(romStart ):
-SYM(_romStart ):
+SYM(romStart ):
+SYM(_romStart ):
# This line is to make compiler happy.
mov 0, g14
ldconst 0x120f,r10 # BIST register
@@ -50,8 +50,8 @@ SYM(_romStart ):
# This point will never be reached.
*/
-SYM(_pmc_start) :
-SYM(pmc_start) :
+SYM(_pmc_start) :
+SYM(pmc_start) :
ldconst 0x120f,r10 # BIST register
ldconst 0x4,r3
stob r3,0(r10) //# 4->LED
@@ -62,7 +62,7 @@ SYM(pmc_start) :
*/
ldconst _svrStackPtr, fp
- lda 16*4(fp), sp
+ lda 16*4(fp), sp
ldconst 0x5,r3
stob r3,0(r10) //# 5->LED
@@ -78,8 +78,8 @@ SYM(pmc_start) :
/* # if _romMain ever returns ... */
b _romExit
-SYM(romFaultStart) :
-SYM(_romFaultStart) :
+SYM(romFaultStart) :
+SYM(_romFaultStart) :
mov 0, g14
@@ -90,7 +90,7 @@ SYM(_romFaultStart) :
# _svrStackPtr is defined directly in rom.ld.
*/
ldconst _svrStackPtr, fp
- lda 16*4(fp), sp
+ lda 16*4(fp), sp
/*
# Set processor priority to zero.
*/
@@ -100,7 +100,7 @@ SYM(_romFaultStart) :
// # Now to real code
// Fix this up callx _romFaultMain
callx _rx_boot_card
-// # if _romMain ever returns ...
+// # if _romMain ever returns ...
b _romExit
_romExit :
@@ -146,7 +146,7 @@ SYM(led_array):
.globl _bssStart_1
.globl _bssEnd_1
.globl _intStackPtr
-
+
_faultStart:
_faultEnd:
_faultCheckSum:
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/asmfault.S b/c/src/lib/libbsp/i960/rxgen960/startup/asmfault.S
index 04a90d4476..3b452f8340 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/asmfault.S
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/asmfault.S
@@ -4,7 +4,7 @@
/*
* asmfault.s
- * Last change : 31. 1.95
+ * Last change : 31. 1.95
*/
.text
@@ -21,7 +21,7 @@ _faultHndlEntry :
ldconst _faultBuffer, r3
/* Save global registers. */
stq g0, 64+0(r3)
- stq g4, 64+16(r3)
+ stq g4, 64+16(r3)
stq g8, 64+32(r3)
stt g12, 64+48(r3)
/* Faulted code's fp (g15) is our pfp. */
@@ -38,7 +38,7 @@ _faultHndlEntry :
ldq 32(g3), r4
stq r4, 32(r3)
ldq 48(g3), r4
- stq r4, 48(r3)
+ stq r4, 48(r3)
/* To handling. */
mov fp, g0
mov r3, g1
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/asmfault.h b/c/src/lib/libbsp/i960/rxgen960/startup/asmfault.h
index 2860ed5c1f..e3c406c8ab 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/asmfault.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/asmfault.h
@@ -9,7 +9,7 @@
#ifndef _ASMFAULT_H_
#define _ASMFAULT_H_
- /* Fault handler start point.
+ /* Fault handler start point.
*/
extern void faultHndlEntry(void);
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S b/c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S
index 193f5a7e4d..82a9566b01 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S
@@ -44,7 +44,7 @@ _asm_exit:
.text
_asm_sysctl:
- b _asm_sysctl
+ b _asm_sysctl
sysctl g0, g1, g2
ret
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
index 77609f358c..17e1b99ca8 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
@@ -22,13 +22,13 @@
#include <string.h>
#include <fcntl.h>
#include <stdio.h>
-
+
#define RXGEN960_INIT
#include <bsp.h>
#include <rtems/libio.h>
#include <rtems/libcsupport.h>
-
+
#define HEAP_SIZE 1024*1024*2
/*
@@ -61,7 +61,7 @@ unsigned int top_of_used_memory;
* not yet initialized.
*
*/
-
+
void
bsp_pretasking_hook(void)
{
@@ -83,9 +83,9 @@ bsp_pretasking_hook(void)
#endif
*(unsigned char *)(0x120f) = 0xf;
}
-
-/* we need to have the top of memory remembered later to start libc_init with
+
+/* we need to have the top of memory remembered later to start libc_init with
the correct values
*/
int rx_boot_card( int argc, char **argv, char **environp)
@@ -122,7 +122,7 @@ bsp_start(void)
/* just trying to get along */
Cpu_table.stack_allocate_hook = 0;
Cpu_table.stack_free_hook = 0;
-
+
/*
* Tell libio how many fd's we want and allow it to tweak config
*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c
index c1aa826eb5..826e569cde 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c
@@ -71,18 +71,18 @@ ControlTblEntry controlTbl[] = {
REGION_8_CONFIG,
0,
REGION_A_CONFIG,
- 0,
+ 0,
/* --group 5 -- */
REGION_C_CONFIG,
0,
REGION_BOOT_CONFIG,
- 0,
+ 0,
/* --group 6 -- */
- 0, /* Reserved */
+ 0, /* Reserved */
0,
TC,
BCON
-};
+};
/*-------------*/
/* End of file */
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h
index f4712a8562..416164a957 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h
@@ -9,7 +9,7 @@
#ifndef _CNTRLTBL_H_
#define _CNTRLTBL_H_
- /* Control Table Entry.
+ /* Control Table Entry.
*/
typedef unsigned int ControlTblEntry;
/* Control Table itself.
@@ -18,34 +18,34 @@ extern ControlTblEntry controlTbl[];
extern ControlTblEntry rom_controlTbl[];
/* Interrupt Registers Initial.
- */
+ */
#define IPB0 0
-#define IPB1 0
-#define DAB0 0
-#define DAB1 0
+#define IPB1 0
+#define DAB0 0
+#define DAB1 0
-#define I_DISABLE (0x1<<10)
-#define I_ENABLE 0
+#define I_DISABLE (0x1<<10)
+#define I_ENABLE 0
#define MSK_UNCHNG 0
-#define MSK_CLEAR (0x1<<11)
+#define MSK_CLEAR (0x1<<11)
-#define VECTOR_CACHE (0x1<<13)
+#define VECTOR_CACHE (0x1<<13)
/* BreakPoint Control Register Initial.
*/
-#define BPCON 0
+#define BPCON 0
/* Bus Controller Mode Comstants.
*/
#define CONF_TBL_VALID 0x1
-#define PROTECT_RAM 0x2
+#define PROTECT_RAM 0x2
#define PROTECT_RAM_SUP 0x4
-#endif
+#endif
/*-------------*/
/* End of file */
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/fault.c b/c/src/lib/libbsp/i960/rxgen960/startup/fault.c
index 67b2420345..80fb551a8f 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/fault.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/fault.c
@@ -1,7 +1,7 @@
/*-------------------------------------*/
/* fault.c */
/* Last change : 13. 7.95 */
-/*-------------------------------------*/
+/*-------------------------------------*/
/*
* $Id$
*/
@@ -21,11 +21,11 @@ extern void romFaultStart(void);
*/
typedef struct {
UserFaultHandler hndl; /* Handler itself. */
- int cnt; /* Handler is valid for cnt times. */
-} UserFaultEntry;
+ int cnt; /* Handler is valid for cnt times. */
+} UserFaultEntry;
/* Table itself.
*/
-static UserFaultEntry userFaultTable[] = {
+static UserFaultEntry userFaultTable[] = {
{0, 0}, /* Parallel */
{0, 0}, /* Trace */
{0, 0}, /* Operation */
@@ -73,7 +73,7 @@ int faultOk(int fault)
#if 0
faultCheckSum = faultNewCheckSum();
#endif
- faultCheckSum ++;
+ faultCheckSum ++;
rsl = 1;
}
return rsl;
@@ -90,18 +90,18 @@ void faultBad(int invokedFromRom,
*/
/* memChnlI960Fault();*/
/* Give some panic message.
- */
+ */
faultInfo(invokedFromRom, inst, faultBuffer, type, sbtp);
/* At this point RAM is repaired. Do
* whatever you want.
*/
#if 0
- if (OsfIsUp) {
+ if (OsfIsUp) {
asm_exit(romFaultStart, & ram_prcb);
}
else {
asm_exit(romStart, & ram_prcb);
- }
+ }
# endif
asm_exit(romFaultStart, & ram_prcb);
}
@@ -109,7 +109,7 @@ void faultGood(unsigned int inst, unsigned int * faultBuffer,
unsigned int type, unsigned int sbtp)
{
static unsigned int faultNewCheckSum(void);
-
+
if (userFaultTable[type].hndl != 0 && userFaultTable[type].cnt > 0) {
/* This is done to avoid the situation when
* handler causes a fault and, thus, infinite recursion.
@@ -122,19 +122,19 @@ void faultGood(unsigned int inst, unsigned int * faultBuffer,
#endif
faultCheckSum --;
/* Invoke handler.
- */
+ */
(* userFaultTable[type].hndl)(inst, faultBuffer, type, sbtp);
/* If this returns => fault is bad.
- */
+ */
}
faultBad(0, inst, faultBuffer, type, sbtp);
}
static unsigned int faultNewCheckSum(void)
{
unsigned int * f = faultStart;
- unsigned int * l = faultEnd;
+ unsigned int * l = faultEnd;
unsigned int sum;
-
+
for (sum = 0; f < l; f ++) {
sum += * f;
}
@@ -191,7 +191,7 @@ static void faultInfo(int invokedFromRom,
faultBuffer[G0_REGNUM+6], faultBuffer[G0_REGNUM+7]);
printf("g8=0x%08x g9=0x%08x gA=0x%08x gB=0x%08x\n",
faultBuffer[G0_REGNUM+8], faultBuffer[G0_REGNUM+9],
- faultBuffer[G0_REGNUM+10], faultBuffer[G0_REGNUM+11]);
+ faultBuffer[G0_REGNUM+10], faultBuffer[G0_REGNUM+11]);
printf("gC=0x%08x gD=0x%08x gE=0x%08x gF=0x%08x\n",
faultBuffer[G0_REGNUM+12], faultBuffer[G0_REGNUM+13],
faultBuffer[G0_REGNUM+14], faultBuffer[G0_REGNUM+15]);
@@ -203,21 +203,21 @@ static void faultInfo(int invokedFromRom,
faultBuffer[R0_REGNUM+6], faultBuffer[R0_REGNUM+7]);
printf("r8=0x%08x r9=0x%08x rA=0x%08x rB=0x%08x\n",
faultBuffer[R0_REGNUM+8], faultBuffer[R0_REGNUM+9],
- faultBuffer[R0_REGNUM+10], faultBuffer[R0_REGNUM+11]);
+ faultBuffer[R0_REGNUM+10], faultBuffer[R0_REGNUM+11]);
printf("rC=0x%08x rD=0x%08x rE=0x%08x rF=0x%08x\n",
faultBuffer[R0_REGNUM+12], faultBuffer[R0_REGNUM+13],
- faultBuffer[R0_REGNUM+14], faultBuffer[R0_REGNUM+15]);
+ faultBuffer[R0_REGNUM+14], faultBuffer[R0_REGNUM+15]);
if (invokedFromRom) {
printf("RAM image damaged. No chance to recover\n");
- }
+ }
else {
- printf("RAM image not damaged. Still no recovery\n");
+ printf("RAM image not damaged. Still no recovery\n");
}
-}
+}
static char * faultParallelSbtpStr(unsigned int sbtp)
{
static char buf[10];
-
+
sprintf(buf, "%d", sbtp);
return buf;
}
@@ -231,46 +231,46 @@ static char * faultTraceSbtpStr(unsigned int sbtp)
if (sbtp & 0x2) {
strcat(buf, "Instruction");
notEmpty = 1;
- }
+ }
if (sbtp & 0x4) {
if (notEmpty) strcat(buf, ":");
strcat(buf, "Branch");
notEmpty = 1;
- }
+ }
if (sbtp & 0x8) {
if (notEmpty) strcat(buf, ":");
strcat(buf, "Call");
notEmpty = 1;
- }
+ }
if (sbtp & 0x10) {
if (notEmpty) strcat(buf, ":");
strcat(buf, "Return");
notEmpty = 1;
- }
+ }
if (sbtp & 0x20) {
if (notEmpty) strcat(buf, ":");
strcat(buf, "Prereturn");
notEmpty = 1;
- }
+ }
if (sbtp & 0x40) {
if (notEmpty) strcat(buf, ":");
strcat(buf, "Supervisor");
notEmpty = 1;
- }
+ }
if (sbtp & 0x80) {
if (notEmpty) strcat(buf, ":");
strcat(buf, "Breakpoint");
notEmpty = 1;
- }
+ }
if (! notEmpty) {
strcat(buf, "Unknown");
- }
+ }
return buf;
}
static char * faultOperationSbtpStr(unsigned int sbtp)
{
char * rsl;
-
+
if (sbtp == 0x1) rsl = "Invalid Opcode";
else if (sbtp == 0x2) rsl = "Unimplemented";
else if (sbtp == 0x3) rsl = "Unaligned";
@@ -281,39 +281,39 @@ static char * faultOperationSbtpStr(unsigned int sbtp)
static char * faultArithmeticSbtpStr(unsigned int sbtp)
{
char * rsl;
-
+
if (sbtp == 0x1) rsl = "Integer Overflow";
else if (sbtp == 0x2) rsl = "Arithmetic Zero-Divide";
- else rsl = "Unknown";
+ else rsl = "Unknown";
return rsl;
}
static char * faultReservedSbtpStr(unsigned int sbtp)
{
- return "Unknown";
+ return "Unknown";
}
static char * faultConstraintSbtpStr(unsigned int sbtp)
{
char * rsl;
-
+
if (sbtp == 0x1) rsl = "Constraint Range";
else if (sbtp == 0x2) rsl = "Priveleged";
- else rsl = "Unknown";
+ else rsl = "Unknown";
return rsl;
}
static char * faultProtectionSbtpStr(unsigned int sbtp)
{
char * rsl;
-
+
if (sbtp == 0x1) rsl = "Length";
- else rsl = "Unknown";
+ else rsl = "Unknown";
return rsl;
}
static char * faultTypeSbtpStr(unsigned int sbtp)
{
char * rsl;
-
+
if (sbtp == 0x1) rsl = "Type Mismatch";
- else rsl = "Unknown";
+ else rsl = "Unknown";
return rsl;
}
static char * faultUnknownSbtpStr(unsigned int sbtp)
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/fault.h b/c/src/lib/libbsp/i960/rxgen960/startup/fault.h
index 54fcfd7bae..eb11786979 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/fault.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/fault.h
@@ -10,15 +10,15 @@
#define _FAULT_H_
/* (RAM-based) Fault Handler.
- * Is invoked when there is no chance to repair current state.
+ * Is invoked when there is no chance to repair current state.
*/
extern void faultBad(int invokedFromRom,
- unsigned int inst, unsigned int * faultBuffer,
+ unsigned int inst, unsigned int * faultBuffer,
unsigned int type, unsigned int sbtp);
/* (RAM-based) Fault Handler.
- * Is invoked when there is a chance to repair current state.
+ * Is invoked when there is a chance to repair current state.
*/
-extern void faultGood(unsigned int instr, unsigned int * faultBuffer,
+extern void faultGood(unsigned int instr, unsigned int * faultBuffer,
unsigned int type, unsigned int sbtp);
/* Some addresses that are defined in rom.ld.
*/
@@ -27,7 +27,7 @@ extern unsigned int faultCheckSum;
extern unsigned int faultBuffer[];
extern unsigned int faultStart[];
-extern unsigned int faultEnd[];
+extern unsigned int faultEnd[];
/* Interface for user to register fault handlers of his own.
* Fault names.
*/
@@ -37,10 +37,10 @@ extern unsigned int faultEnd[];
#define ArithmeticFLT 3
#define ConstraintFLT 5
#define ProtectionFLT 7
-#define TypeFLT 9
+#define TypeFLT 9
/* User-registered fault handler.
*/
-typedef void (* UserFaultHandler)(unsigned int inst, unsigned int * faultBuf,
+typedef void (* UserFaultHandler)(unsigned int inst, unsigned int * faultBuf,
unsigned int type, unsigned int sbtp);
/* Register user-defined fault handler. The third argument is
* how many times this fault handler will be valid. This to avoid
@@ -50,7 +50,7 @@ extern int faultRegister(int fault, UserFaultHandler, int cnt);
/* Validate handler for one more time.
*/
extern int faultOk(int fault);
-
+
#endif
/*-------------*/
/* End of file */
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/faultret.h b/c/src/lib/libbsp/i960/rxgen960/startup/faultret.h
index 7f7fe4f205..9c667088bc 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/faultret.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/faultret.h
@@ -10,7 +10,7 @@
#define _FAULTRET_H_
/* Return to the point where fault happened.
- * Fault state keeps all registers.
+ * Fault state keeps all registers.
*/
extern void faultRet(unsigned int * faultState);
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/flttbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/flttbl.c
index d4cc505331..d83dc07eb3 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/flttbl.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/flttbl.c
@@ -1,7 +1,7 @@
/*-------------------------------------*/
/* flttbl.c */
/* Last change : 3.11.94 */
-/*-------------------------------------*/
+/*-------------------------------------*/
/*
* $Id$
*/
@@ -21,10 +21,10 @@
FaultTblEntry faultTbl[] = {
{faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Parallel */
{faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Trace */
- {faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Operation */
- {faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Arithmetic */
- {0, 0}, /* Reserved */
- {faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Constraint */
+ {faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Operation */
+ {faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Arithmetic */
+ {0, 0}, /* Reserved */
+ {faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Constraint */
{0, 0}, /* Reserved */
{faultHndlEntry + LOCAL_FH, LOCAL_FW}, /* Protection */
{0, 0}, /* Reserved */
@@ -40,9 +40,9 @@ void fltTblInit(void)
static unsigned int fltTblCheckSum(void)
{
unsigned int * f = faultStart;
- unsigned int * l = faultEnd;
+ unsigned int * l = faultEnd;
unsigned int sum;
-
+
for (sum = 0; f < l; f ++) {
sum += * f;
}
@@ -68,34 +68,34 @@ void faultTblHandler(unsigned int * fp, unsigned int * faultBuffer)
/* Address of faulting instruction.
*/
- ip = (unsigned int *) fp[-1];
+ ip = (unsigned int *) fp[-1];
/* Type/Subtype word.
*/
/* put address of faulting instruction to console */
kkprintf("Fault: %x\n", ip);
-
- tw = * (struct typeWord *) & fp[-2];
+
+ tw = * (struct typeWord *) & fp[-2];
/* Type and subtype.
*/
type = tw.type;
- sbtp = tw.sbtp;
+ sbtp = tw.sbtp;
/* Arithmetic controls.
*/
- ac = fp[-3];
+ ac = fp[-3];
/* Process controls.
*/
- pc = fp[-4];
+ pc = fp[-4];
/* Global and local registers are in faultBuffer
* already. Save the rest. Change RIP to IP.
*/
faultBuffer[IP_REGNUM] = (unsigned int) ip;
faultBuffer[ACW_REGNUM] = ac;
- faultBuffer[PCW_REGNUM] = pc;
+ faultBuffer[PCW_REGNUM] = pc;
/* Bad instruction itself. We do
* this here since it may be repaired (by copying from PROM).
*/
- inst = * ip;
+ inst = * ip;
/* Now, to handling.
*/
if (faultCheckSum != fltTblCheckSum()) {
@@ -104,15 +104,15 @@ void faultTblHandler(unsigned int * fp, unsigned int * faultBuffer)
* Repair RAM memory which is
* destroyed by silly user.
*/
- copyCodeToRom();
+ copyCodeToRom();
/* And call RAM-based fault handler.
*/
faultBad(1, inst, faultBuffer, type, sbtp);
- }
+ }
else {
/* There exist a chance to recover.
*/
- faultGood(inst, faultBuffer, type, sbtp);
+ faultGood(inst, faultBuffer, type, sbtp);
}
}
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/flttbl.h b/c/src/lib/libbsp/i960/rxgen960/startup/flttbl.h
index 8a3a0a91d2..956d86e686 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/flttbl.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/flttbl.h
@@ -9,9 +9,9 @@
#ifndef _FLTTBL_H_
#define _FLTTBL_H_
- /* FaultTable Entry.
+ /* FaultTable Entry.
*/
-typedef struct {
+typedef struct {
void (* hndl)(void); /* Fault Handle */
unsigned int type; /* Fault Table Type */
} FaultTblEntry;
@@ -21,19 +21,19 @@ typedef struct {
#define SYSTEM_FH 0x10
#define LOCAL_FW 0
-#define SYSTEM_FW 0x027F
+#define SYSTEM_FW 0x027F
/* FaultTable Itself.
*/
extern FaultTblEntry faultTbl[];
/* To initialize fault handling.
*/
-extern void faultTblInit(void);
+extern void faultTblInit(void);
/* Fault handler. Invoked from low-level handler.
*/
extern void faultTblHandler(unsigned int * fp,
unsigned int * faultBuffer);
-
-#endif
+
+#endif
/*-------------*/
/* End of file */
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/frmstr.c b/c/src/lib/libbsp/i960/rxgen960/startup/frmstr.c
index 783dfc4f62..682890e57b 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/frmstr.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/frmstr.c
@@ -102,7 +102,7 @@ int format_string(const char * fmt, ArgType * args, char * buffer)
s = s1;
do {
if (s == 0) break;
- if (* s == 0)
+ if (* s == 0)
break;
s ++;
} while (-- ndigit);
@@ -111,7 +111,7 @@ int format_string(const char * fmt, ArgType * args, char * buffer)
j = 2;
case 'u':
getu:
-
+
if (! lflag) {
geta(& inte, wsize(inte));
goto i_unsignd;
@@ -119,7 +119,7 @@ int format_string(const char * fmt, ArgType * args, char * buffer)
# ifdef DO_LONG
case 'U':
getlu:
-
+
geta((ArgType *) & l, wsize(l));
goto l_unsignd;
case 'B':
@@ -133,21 +133,21 @@ int format_string(const char * fmt, ArgType * args, char * buffer)
goto getlu ;
case 'D':
l_signed:
-
+
geta((ArgType *) & l, wsize(l));
if (l < 0) {
STORE_BYTE(s ++, '-');
l = -l;
}
goto do_l;
-
+
l_unsignd:
if (l && ndigit)
STORE_BYTE(s ++, '0');
do_l:
-
+
s = l_compute(l, j, s);
break;
# endif
@@ -165,14 +165,14 @@ int format_string(const char * fmt, ArgType * args, char * buffer)
inte = - inte;
}
goto do_i;
-
+
i_unsignd:
-
+
if (inte && ndigit)
STORE_BYTE(s ++, '0');
do_i:
-
+
s = i_compute(inte, j, s);
break;
case 'c':
@@ -204,7 +204,7 @@ int format_string(const char * fmt, ArgType * args, char * buffer)
do STORE_BYTE(buffer ++, zfill);
while (-- c);
}
- }
+ }
while (-- j >= 0)
STORE_BYTE(buffer ++, * s1 ++);
while (-- c >= 0)
@@ -268,7 +268,7 @@ static char *l_compute(long l1,int d, char * s)
l2 = ((l1>>1) & ~signbit(l1));
l1 = l2 / (d>>1);
c += (l2%(d>>1))<<1;
- }
+ }
else {
c = l1 % d;
l1 = l1 / d;
@@ -306,7 +306,7 @@ long store_byte(char * cp, long c)
#define INT 0
#define FLOAT 1
-static int new_c(void);
+static int new_c(void);
static void unnew_c(char);
static int _innum(int ** ptr, int type, int len, int size, int * eofptr);
static int _instr(char * ptr, int type, int len, int * eofptr);
@@ -336,13 +336,13 @@ int unformat_string(const char * fmt, int ** argp, const char * buffer)
line = buffer;
linep = (char*)line;
-
+
nmatch = 0;
fileended = 0;
for (;;) switch (ch = * fmt ++) {
- case '\0':
+ case '\0':
return (nmatch);
- case '%':
+ case '%':
if ((ch = * fmt ++) == '%')
goto def;
ptr = 0;
@@ -381,16 +381,16 @@ int unformat_string(const char * fmt, int ** argp, const char * buffer)
break;
case ' ':
case '\n':
- case '\t':
+ case '\t':
while ((ch1 = new_c())==' ' || ch1=='\t' || ch1=='\n')
;
if (ch1 != EOF)
unnew_c(ch1);
break;
default:
-
+
def:
-
+
ch1 = new_c();
if (ch1 != ch) {
if (ch1==EOF)
@@ -400,10 +400,10 @@ int unformat_string(const char * fmt, int ** argp, const char * buffer)
}
}
}
-static int new_c()
+static int new_c()
{
char c;
-
+
if (linep) {
c = * linep ++;
return c;
@@ -421,7 +421,7 @@ static int _innum(int ** ptr, int type, int len, int size, int * eofptr)
{
# ifdef DO_FLOAT
extern double atof();
-# endif
+# endif
char * np;
char numbuf[64];
int c, base;
@@ -571,7 +571,7 @@ static int _instr(char * ptr, int type, int len, int * eofptr)
return 1;
}
return 0;
-}
+}
static const char * _getccl(const char * s)
{
int c, t;
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/ihandler.S b/c/src/lib/libbsp/i960/rxgen960/startup/ihandler.S
index 2ca149ffe1..71802b34f0 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/ihandler.S
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/ihandler.S
@@ -11,11 +11,11 @@
.globl _nmiHandler
.globl _intr5Handler
.globl _intr6Handler
- .globl _clockHandler
+ .globl _clockHandler
- .text
+ .text
-# NMI Handler
+# NMI Handler
_nmiHandler :
ldconst 64, r4
addo sp, r4, sp
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/ihandler.h b/c/src/lib/libbsp/i960/rxgen960/startup/ihandler.h
index e9235fda06..5121fc0155 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/ihandler.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/ihandler.h
@@ -15,7 +15,7 @@ extern void nmiHandler(void);
/* Interrupt Handlers for Dedicated Interrupts.
*/
extern void intr5Handler(void);
-extern void intr6Handler(void);
+extern void intr6Handler(void);
#endif
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.h b/c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.h
index 9fa40d1d4e..196825f2b3 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.h
@@ -17,17 +17,17 @@ typedef void (* IntrHndl)(void);
typedef struct {
unsigned int pendPrty; /* Pending Priorities */
unsigned int pendIntr[8]; /* Pending Interrupts */
- IntrHndl intrHndl[248]; /* Interrupt Handlers */
+ IntrHndl intrHndl[248]; /* Interrupt Handlers */
} InterruptTbl;
/* Interrupt Handler Type.
*/
#define NORMAL_IH 0
-#define IN_CACHE_IH 0x10
+#define IN_CACHE_IH 0x10
/* Interrupt Table Itself.
*/
extern InterruptTbl interruptTbl;
-#endif
+#endif
/*-------------*/
/* End of file */
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/main.h b/c/src/lib/libbsp/i960/rxgen960/startup/main.h
index 08b3c7c09c..e71bdb59aa 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/main.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/main.h
@@ -9,7 +9,7 @@
#ifndef _MAIN_H_
#define _MAIN_H_
- /* ROM monitor main function(s).
+ /* ROM monitor main function(s).
* Gets control from rommon.s.
*/
extern void romMain(void);
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/memchnl.h b/c/src/lib/libbsp/i960/rxgen960/startup/memchnl.h
index 2569226956..554b77006a 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/memchnl.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/memchnl.h
@@ -1,7 +1,7 @@
/*-------------------------------------*/
/* memchnl.h */
/* Last change : 16. 5.95 */
-/*-------------------------------------*/
+/*-------------------------------------*/
/*
* $Id$
*/
@@ -10,7 +10,7 @@
#define _MEMCHNL_H_
/* The following is a dummy for now to be filled in
- as the message passing stuff gets migrated to
+ as the message passing stuff gets migrated to
I20 (or other standard )
*/
@@ -34,15 +34,15 @@ extern void memChnlIotFinished(IOTrCBlk *);
*/
extern void memChnlI960Fault(void);
/* IOT handler procedure.
- */
+ */
typedef void (* IotHandler)(IOTrCBlk *, int tr_req);
/* Register handler to process IOT's.
- */
+ */
extern void memChnlRegisterHndl(IotHandler);
/* Intermediate image buffer.
* Defined in *.ld
*/
-extern unsigned int downloadStart[];
+extern unsigned int downloadStart[];
typedef struct {
int ptr_len;
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c
index a9a3292977..4dc81c02b8 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/nulsystbl.c
@@ -9,9 +9,9 @@
#include "prcb.h"
#include "systbl.h"
/*-------------------------------------*/
- /* System Procedures Table.
+ /* System Procedures Table.
* Dummy version that will live in ROM at all times
- * RP does fetch on it, so must be present here rather than pointing
+ * RP does fetch on it, so must be present here rather than pointing
* to ram
*/
SystemTbl nulsystemTbl = {
@@ -27,7 +27,7 @@ SystemTbl nulsystemTbl = {
0, /* 20 */
0, /* 21 */
0, 0, /* 22 - 23 */
- 0, /* 24 */
+ 0, /* 24 */
0, /* 25 */
0, /* 26 */
0, /* 27 */
@@ -37,8 +37,8 @@ SystemTbl nulsystemTbl = {
0, /* 31 */
0, 0, 0, 0, 0, 0, 0, 0, /* 32 - 39 */
0, /* 40 */
- 0, /* 41 */
- 0, /* 42 */
+ 0, /* 41 */
+ 0, /* 42 */
0, /* 43 */
0, /* 44 */
0, /* 45 */
@@ -50,22 +50,22 @@ SystemTbl nulsystemTbl = {
0, /* 58 */
0, 0, 0, 0, 0, /* 59 - 63 */
0, /* 64 */
- 0, /* 65 */
- 0, 0, 0, 0, 0, 0, /* 66 - 71 */
- 0, /* 72 */
- 0, /* 73 */
+ 0, /* 65 */
+ 0, 0, 0, 0, 0, 0, /* 66 - 71 */
+ 0, /* 72 */
+ 0, /* 73 */
0, /* 74 */
0, /* 75 */
0, /* 76 */
0, /* 77 */
0, 0, /* 78 - 79 */
0, /* 80 */
- 0, /* 81 */
+ 0, /* 81 */
0, 0, 0, 0, 0, 0, /* 82 - 87 */
- 0, /* 88 */
+ 0, /* 88 */
0, 0, 0, 0, 0, 0, 0, /* 89 - 95 */
- 0, /* 96 */
- 0, /* 97 */
+ 0, /* 96 */
+ 0, /* 97 */
0, 0, 0, 0, 0, 0, /* 98 - 103 */
0, /* 104 */
0, /* 105 */
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/prcb.c b/c/src/lib/libbsp/i960/rxgen960/startup/prcb.c
index 1aaefd21d0..b14512cc79 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/prcb.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/prcb.c
@@ -12,8 +12,8 @@
#include "systbl.h"
#include "prcb.h"
/*-------------------------------------*/
- /* RAM based PRocess Control Block
- */
+ /* RAM based PRocess Control Block
+ */
#ifdef DBPRECISE_FAULTS
#define AC (INT_OVFL_DISABLE | PRECISE_FLTS)
#else
@@ -40,17 +40,17 @@
struct PRCB ram_prcb = {
- & faultTbl[0], /* Fault Table Base */
- & controlTbl[0], /* Control Table Base */
- AC, /* AC */
+ & faultTbl[0], /* Fault Table Base */
+ & controlTbl[0], /* Control Table Base */
+ AC, /* AC */
FAULT_CONFIG, /* Fault Configuration Word */
- & interruptTbl, /* Interrupt Table Base */
- & systemTbl, /* System Procedure Table Base */
- 0, /* Reserved */
+ & interruptTbl, /* Interrupt Table Base */
+ & systemTbl, /* System Procedure Table Base */
+ 0, /* Reserved */
& intStackPtr[0], /* Interrupt Stack Pointer */
- INST_CACHE_CONFIG, /* Instruction Cache Config */
- REG_CACHE_CONFIG, /* Reg Cache Config */
-};
+ INST_CACHE_CONFIG, /* Instruction Cache Config */
+ REG_CACHE_CONFIG, /* Reg Cache Config */
+};
/*-------------*/
/* End of file */
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/prcb.h b/c/src/lib/libbsp/i960/rxgen960/startup/prcb.h
index 235341740d..f00b69e894 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/prcb.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/prcb.h
@@ -14,33 +14,33 @@
#include "intrtbl.h"
#include "systbl.h"
- /* PRocess Control Block
- */
-struct PRCB {
- FaultTblEntry * faultTbl; /* Fault Table Base */
- ControlTblEntry * controlTbl; /* Control Table Base */
- unsigned int arithConfig; /* Arithmetic Control Register Image */
+ /* PRocess Control Block
+ */
+struct PRCB {
+ FaultTblEntry * faultTbl; /* Fault Table Base */
+ ControlTblEntry * controlTbl; /* Control Table Base */
+ unsigned int arithConfig; /* Arithmetic Control Register Image */
unsigned int faultConfig; /* Fault Configuration Word Image */
- InterruptTbl * interruptTbl; /* Interrupt Table Base */
- SystemTbl * systemTbl; /* System Procedure Table Base */
- unsigned int reserved; /* Reserved */
+ InterruptTbl * interruptTbl; /* Interrupt Table Base */
+ SystemTbl * systemTbl; /* System Procedure Table Base */
+ unsigned int reserved; /* Reserved */
unsigned int * intStackPtr; /* Interrupt Stack Pointer */
- unsigned int instCacheConfig; /* Instruction Cache Config */
- unsigned int regCacheConfig; /* Register Cache Config */
-};
+ unsigned int instCacheConfig; /* Instruction Cache Config */
+ unsigned int regCacheConfig; /* Register Cache Config */
+};
/* Constants for Arithmetic Control Register.
*/
#define INT_OVFL_ENABLE 0
#define INT_OVFL_DISABLE 0x1000
-#define PRECISE_FLTS 0x8000
-#define IMPRECISE_FLTS 0
+#define PRECISE_FLTS 0x8000
+#define IMPRECISE_FLTS 0
/* Constants for Fault Configuration Word.
*/
#define UNLGND_FAULT_ENABLE 0
-#define UNLGND_FAULT_DISABLE 0x40000000
+#define UNLGND_FAULT_DISABLE 0x40000000
/* Constants for Instruction Cache Configuration Word.
- */
+ */
#define INST_CACHE_ENABLE 0
#define INST_CACHE_DISABLE 0x10000
/* RAM-based Process Control Block.
@@ -49,10 +49,10 @@ extern struct PRCB ram_prcb;
extern struct PRCB rom_prcb;
/* Supervisor Stack. Is defined directly in rom.ld.
*/
-extern unsigned int svrStackPtr[];
+extern unsigned int svrStackPtr[];
/* Interrupt Stack. Is defined directly in rom.ld.
*/
-extern unsigned int intStackPtr[];
+extern unsigned int intStackPtr[];
#endif
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c
index 254618d532..b9811f65bf 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c
@@ -71,18 +71,18 @@ ControlTblEntry rom_controlTbl[] = {
REGION_8_CONFIG,
0,
REGION_A_CONFIG,
- 0,
+ 0,
/* --group 5 -- */
REGION_C_CONFIG,
0,
REGION_BOOT_CONFIG,
- 0,
+ 0,
/* --group 6 -- */
- 0, /* Reserved */
+ 0, /* Reserved */
0,
TC,
BCON
-};
+};
/*-------------*/
/* End of file */
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c b/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c
index d65d0109cd..becc0b6843 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c
@@ -15,14 +15,14 @@
extern void romStart(void);
-struct IBR rom_ibr = {
+struct IBR rom_ibr = {
{((REGION_BOOT_CONFIG) & 0xff), /* Initial Bus Configuration */
- ((REGION_BOOT_CONFIG) >> 8) & 0xff,
+ ((REGION_BOOT_CONFIG) >> 8) & 0xff,
((REGION_BOOT_CONFIG) >> 16) & 0xff,
- ((REGION_BOOT_CONFIG) >> 24) & 0xff},
+ ((REGION_BOOT_CONFIG) >> 24) & 0xff},
romStart, /* Start Point */
& rom_prcb, /* PRCB */
- {-2, /* CheckSum */
+ {-2, /* CheckSum */
0,
0,
0,
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.h b/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.h
index db6317875c..e9d7b6908e 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.h
@@ -14,14 +14,14 @@
#include "intrtbl.h"
#include "systbl.h"
- /* Initial Boot Record.
- */
-struct IBR {
+ /* Initial Boot Record.
+ */
+struct IBR {
unsigned int busConfig[4]; /* Initial Bus Configuration */
void (* start)(void); /* Start Point */
struct PRCB * prcb; /* PRCB */
- unsigned int chckSum[6]; /* CheckSum */
-};
+ unsigned int chckSum[6]; /* CheckSum */
+};
/* Check sum values (defined in *.ld).
*/
extern unsigned int rom_ibr_cksum[];
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rom_prcb.c b/c/src/lib/libbsp/i960/rxgen960/startup/rom_prcb.c
index 663df41096..0f11c884d8 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_prcb.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_prcb.c
@@ -12,8 +12,8 @@
#include "systbl.h"
#include "prcb.h"
/*-------------------------------------*/
- /* RAM based PRocess Control Block
- */
+ /* RAM based PRocess Control Block
+ */
#ifdef DBPRECISE_FAULTS
#define AC (INT_OVFL_DISABLE | PRECISE_FLTS)
#else
@@ -41,17 +41,17 @@ extern SystemTbl nulsystemTbl;
struct PRCB rom_prcb = {
- & faultTbl[0], /* Fault Table Base */
- & rom_controlTbl[0], /* Control Table Base */
- AC, /* AC */
+ & faultTbl[0], /* Fault Table Base */
+ & rom_controlTbl[0], /* Control Table Base */
+ AC, /* AC */
FAULT_CONFIG, /* Fault Configuration Word */
- & interruptTbl, /* Interrupt Table Base */
- & nulsystemTbl, /* System Procedure Table Base */
- 0, /* Reserved */
+ & interruptTbl, /* Interrupt Table Base */
+ & nulsystemTbl, /* System Procedure Table Base */
+ 0, /* Reserved */
& intStackPtr[0], /* Interrupt Stack Pointer */
- INST_CACHE_CONFIG, /* Instruction Cache Config */
- REG_CACHE_CONFIG, /* Reg Cache Config */
-};
+ INST_CACHE_CONFIG, /* Instruction Cache Config */
+ REG_CACHE_CONFIG, /* Reg Cache Config */
+};
/*-------------*/
/* End of file */
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/rommon.h b/c/src/lib/libbsp/i960/rxgen960/startup/rommon.h
index 8cd87a1d5b..da6e44e6a5 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rommon.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/rommon.h
@@ -9,18 +9,18 @@
#ifndef _ROMMON_H_
#define _ROMMON_H_
- /* ROM monitor start point.
+ /* ROM monitor start point.
* Gets control on power on.
*/
extern void romStart(void);
extern void start(void);
/* ROM monitor start point.
* Gets control on a fault.
- */
+ */
extern void romFaultStart(void);
/* ROM monitor start point.
* Gets control on a test command.
- */
+ */
extern void romTestStart(void);
#endif
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/sctns.c b/c/src/lib/libbsp/i960/rxgen960/startup/sctns.c
index d9e9646df4..466995c75b 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/sctns.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/sctns.c
@@ -23,7 +23,7 @@ void ledcyc()
i = 1;
loop:
if (i > 9 )
- i = 1;
+ i = 1;
*(unsigned char *) LED_REG = la[i];
for(t=1; t < 0x10000; t++)
k = m + 33;
@@ -31,7 +31,7 @@ loop:
goto loop;
}
-void copyCodeToRom(void)
+void copyCodeToRom(void)
{
register int errval = 0;
unsigned int * s;
@@ -66,12 +66,12 @@ extern unsigned char * led_array;
goto error;
WRITE_LED(0x4);
for (s = codeRomStart, d = codeRamStart; d < codeRamEnd; s ++, d ++) {
- * d = * s;
+ * d = * s;
}
WRITE_LED(0x5);
for (s = codeRomStart, d = codeRamStart; d < codeRamEnd; s ++, d ++) {
if( * d != * s )
- goto error;
+ goto error;
}
WRITE_LED(0x6);
return;
@@ -83,7 +83,7 @@ error:
for(t=1; t < 0x100000; t++)
*(unsigned char *) LED_REG = led_array[0];
}
-
+
}
void zeroBss(void)
{
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/sctns.h b/c/src/lib/libbsp/i960/rxgen960/startup/sctns.h
index 3ba9cb1308..acf78dcf3b 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/sctns.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/sctns.h
@@ -10,7 +10,7 @@
#define _SCTNS_H_
/* Copy all code into SRAM.
- * Fault Table and Fault Handler stays in EPROM to not be
+ * Fault Table and Fault Handler stays in EPROM to not be
* destroyed by a buggy user program. Beyond that only
* monitor Start point and procedures to copy code
* into RAM will be relocated in ROM.
@@ -28,7 +28,7 @@ extern unsigned int codeRamStart[];
extern unsigned int codeRamEnd[];
extern unsigned int bssStart[];
-extern unsigned int bssEnd[];
+extern unsigned int bssEnd[];
#endif
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/systbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/systbl.c
index b51ff4e86b..d2861d71f9 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/systbl.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/systbl.c
@@ -27,14 +27,14 @@ struct PRCB *sys_get_prcb()
/*asm volatile("lda _ram_prcb, g0" : : ); */
}
- /* System Procedures Table.
+ /* System Procedures Table.
*/
SystemTbl systemTbl = {
{0, 0, 0}, /* Reserved */
svrStackPtr, /* Supervisor Stack Pointer Base */
{0, 0, 0, 0, 0, 0, 0, 0}, /* Preserved */
{0, 0, 0, 0, 0,
- SP(sys_get_prcb + SUPERVISOR_SP),
+ SP(sys_get_prcb + SUPERVISOR_SP),
0, 0, /* 6 - 7 */
0, 0, 0, 0, 0, 0, 0, 0, /* 8 - 15 */
0, 0, /* 16 - 17 */
@@ -43,7 +43,7 @@ SystemTbl systemTbl = {
0, /* 20 */
0, /* 21 */
0, 0, /* 22 - 23 */
- 0, /* 24 */
+ 0, /* 24 */
0, /* 25 */
0, /* 26 */
0, /* 27 */
@@ -53,8 +53,8 @@ SystemTbl systemTbl = {
0, /* 31 */
0, 0, 0, 0, 0, 0, 0, 0, /* 32 - 39 */
0, /* 40 */
- 0, /* 41 */
- 0, /* 42 */
+ 0, /* 41 */
+ 0, /* 42 */
0, /* 43 */
0, /* 44 */
0, /* 45 */
@@ -66,9 +66,9 @@ SystemTbl systemTbl = {
0, /* 58 */
0, 0, 0, 0, 0, /* 59 - 63 */
0, /* 64 */
- 0, /* 65 */
- 0, 0, 0, 0, 0, 0, /* 66 - 71 */
- 0, /* 72 */
+ 0, /* 65 */
+ 0, 0, 0, 0, 0, 0, /* 66 - 71 */
+ 0, /* 72 */
0, /* 73 */
0, /* 74 */
0, /* 75 */
@@ -78,10 +78,10 @@ SystemTbl systemTbl = {
0, /* 80 */
0, /* 81 */
0, 0, 0, 0, 0, 0, /* 82 - 87 */
- 0, /* 88 */
+ 0, /* 88 */
0, 0, 0, 0, 0, 0, 0, /* 89 - 95 */
- 0, /* 96 */
- 0, /* 97 */
+ 0, /* 96 */
+ 0, /* 97 */
0, 0, 0, 0, 0, 0, /* 98 - 103 */
0, /* 104 */
0, /* 105 */
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/systbl.h b/c/src/lib/libbsp/i960/rxgen960/startup/systbl.h
index 0c51851090..ac902cc829 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/systbl.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/systbl.h
@@ -11,27 +11,27 @@
/* System Procedure.
*/
-typedef void (* SysProc)(void);
+typedef void (* SysProc)(void);
/* System Procedures Table.
*/
typedef struct {
unsigned int reserved[3]; /* Reserved */
unsigned int * svrStackPtr; /* Supervisor Stack Pointer Base */
- unsigned int preserved[8]; /* Preserved */
+ unsigned int preserved[8]; /* Preserved */
SysProc sysProc[259]; /* System Procedures Entry Points */
} SystemTbl;
/* Type of System Procedure.
*/
#define LOCAL_SP 0x0
-#define SUPERVISOR_SP 0x2
+#define SUPERVISOR_SP 0x2
/* Cinvert to System Procedure Type.
*/
-#define SP(addr) ((SysProc) (addr))
+#define SP(addr) ((SysProc) (addr))
/* System Procedures Table Itself.
*/
extern SystemTbl systemTbl;
-#endif
+#endif
/*-------------*/
/* End of file */
/*-------------*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/timer/timer.c b/c/src/lib/libbsp/i960/rxgen960/timer/timer.c
index 80289362ef..e4f8a7d63b 100644
--- a/c/src/lib/libbsp/i960/rxgen960/timer/timer.c
+++ b/c/src/lib/libbsp/i960/rxgen960/timer/timer.c
@@ -54,9 +54,9 @@ void Timer_initialize()
#define TMR_AUTO_RELOAD 4
#define TMR_ENABLE 2
#define TMR_TERM_CNT_STAT 1
-
- *tmr1 = BUS_CLOCK_1 | TMR_AUTO_RELOAD;
- *icon = 0x6000;
+
+ *tmr1 = BUS_CLOCK_1 | TMR_AUTO_RELOAD;
+ *icon = 0x6000;
set_vector( (((unsigned int) timerisr) | 0x2), TIMER_VECTOR, 1 );
@@ -64,13 +64,13 @@ void Timer_initialize()
*imap2 = (*imap2 & 0xff0fffff) | (((TIMER_VECTOR >> 4) & 0xf) << 20);
/* initialize the i960RP timer 1 here */
-
+
/* set the timer countdown */
*trr1 = 33 * BSP_Configuration.microseconds_per_tick;
*tcr1 = 33 * BSP_Configuration.microseconds_per_tick;
-
+
*ipnd &= ~(1<<13);
- *imsk |= (1 << 13);
+ *imsk |= (1 << 13);
Ttimer_val = 0;
*tmr1 = BUS_CLOCK_1 | TMR_AUTO_RELOAD | TMR_ENABLE;