summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i960
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-04-21 16:01:48 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-04-21 16:01:48 +0000
commitf05b2ac0bc4626e854afc6e6a5d1b88071adbd7c (patch)
tree4150010cec9b6b51100f183b435955cd847679b4 /c/src/lib/libbsp/i960
parentRemove stray white spaces. (diff)
downloadrtems-f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c.tar.bz2
Remove duplicate white lines.
Diffstat (limited to 'c/src/lib/libbsp/i960')
-rw-r--r--c/src/lib/libbsp/i960/cvme961/clock/ckinit.c1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/console/console.c1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/timer/timer.c1
-rw-r--r--c/src/lib/libbsp/i960/i960sim/clock/clockdrv.c1
-rw-r--r--c/src/lib/libbsp/i960/i960sim/console/mon-syscalls.S2
-rw-r--r--c/src/lib/libbsp/i960/i960sim/start/start.c1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/console/console.c3
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/console/serial.c11
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S3
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c3
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c3
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h4
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.c1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/prcb.c1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c3
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/rom_prcb.c1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/setvec.c1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/timer/timer.c5
22 files changed, 0 insertions, 50 deletions
diff --git a/c/src/lib/libbsp/i960/cvme961/clock/ckinit.c b/c/src/lib/libbsp/i960/cvme961/clock/ckinit.c
index 99ec6a34e6..d47c3450a2 100644
--- a/c/src/lib/libbsp/i960/cvme961/clock/ckinit.c
+++ b/c/src/lib/libbsp/i960/cvme961/clock/ckinit.c
@@ -38,7 +38,6 @@ void Clock_exit( void );
rtems_device_major_number rtems_clock_major = ~0;
rtems_device_minor_number rtems_clock_minor;
-
/* this is later in the file to avoid it being inlined */
rtems_isr Clock_isr( rtems_vector_number vector );
diff --git a/c/src/lib/libbsp/i960/cvme961/console/console.c b/c/src/lib/libbsp/i960/cvme961/console/console.c
index ccf5df7258..958d4e1638 100644
--- a/c/src/lib/libbsp/i960/cvme961/console/console.c
+++ b/c/src/lib/libbsp/i960/cvme961/console/console.c
@@ -86,7 +86,6 @@ char inbyte( void )
return ch;
}
-
/* outbyte
*
* This routine transmits a character out the console using NINDY.
diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c b/c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c
index 6be8343522..ae29aa31dc 100644
--- a/c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c
+++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/getcfg.c
@@ -50,7 +50,6 @@
#define INTERRUPT 1 /* CVME961 target supports both */
#define POLLING 0 /* polling and interrupt modes */
-
shm_config_table BSP_shm_cfgtbl;
void Shm_Get_configuration(
diff --git a/c/src/lib/libbsp/i960/cvme961/timer/timer.c b/c/src/lib/libbsp/i960/cvme961/timer/timer.c
index 6cfd1c762e..a3da5e810f 100644
--- a/c/src/lib/libbsp/i960/cvme961/timer/timer.c
+++ b/c/src/lib/libbsp/i960/cvme961/timer/timer.c
@@ -25,7 +25,6 @@
* $Id$
*/
-
#include <rtems.h>
#include <bsp.h>
#include <rtems/zilog/z8536.h>
diff --git a/c/src/lib/libbsp/i960/i960sim/clock/clockdrv.c b/c/src/lib/libbsp/i960/i960sim/clock/clockdrv.c
index c49150fba6..f61b66e42d 100644
--- a/c/src/lib/libbsp/i960/i960sim/clock/clockdrv.c
+++ b/c/src/lib/libbsp/i960/i960sim/clock/clockdrv.c
@@ -14,7 +14,6 @@
#define Clock_driver_support_install_isr( _new, _old ) \
do { _old = 0; } while(0)
-
#define Clock_driver_support_initialize_hardware()
#define Clock_driver_support_shutdown_hardware()
diff --git a/c/src/lib/libbsp/i960/i960sim/console/mon-syscalls.S b/c/src/lib/libbsp/i960/i960sim/console/mon-syscalls.S
index e844274fc8..0c6dc97f66 100644
--- a/c/src/lib/libbsp/i960/i960sim/console/mon-syscalls.S
+++ b/c/src/lib/libbsp/i960/i960sim/console/mon-syscalls.S
@@ -11,8 +11,6 @@
#define ENTRY(name) \
_ENTRY(_C_LABEL(name))
-
-
ENTRY(_sys_exit)
lda 257,g13
calls g13
diff --git a/c/src/lib/libbsp/i960/i960sim/start/start.c b/c/src/lib/libbsp/i960/i960sim/start/start.c
index d6b0f9aafe..2b7a83e64c 100644
--- a/c/src/lib/libbsp/i960/i960sim/start/start.c
+++ b/c/src/lib/libbsp/i960/i960sim/start/start.c
@@ -32,7 +32,6 @@ void _start(void)
__asm__ volatile ("mov %0,sp" : : "d" (ptr + STACK_ALIGN));
__asm__ volatile ("mov %0,fp" : : "d" (ptr));
-
init_Cregs();
boot_card();
_sys_exit(0);
diff --git a/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c b/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c
index 8afdc4a320..f51421af68 100644
--- a/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c
+++ b/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c
@@ -58,7 +58,6 @@ void Install_clock(
volatile unsigned int *imsk = (unsigned int *) IMSK_ADDR;
void clockHandler();
-
Clock_driver_ticks = 0;
Reload_Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
Clock_isrs = Reload_Clock_isrs;
diff --git a/c/src/lib/libbsp/i960/rxgen960/console/console.c b/c/src/lib/libbsp/i960/rxgen960/console/console.c
index 9e24c8c7a1..959a91deae 100644
--- a/c/src/lib/libbsp/i960/rxgen960/console/console.c
+++ b/c/src/lib/libbsp/i960/rxgen960/console/console.c
@@ -42,7 +42,6 @@ rtems_device_driver console_initialize(
if ( console_pmr_init(*(uint32_t*)arg) )
return RTEMS_INVALID_NUMBER;
-
status = rtems_io_register_name(
"/dev/console",
major,
@@ -55,7 +54,6 @@ rtems_device_driver console_initialize(
return RTEMS_SUCCESSFUL;
}
-
/* is_character_ready
*
* This routine returns TRUE if a character is available.
@@ -120,7 +118,6 @@ void outbyte( unsigned int minor,
outbyte( minor, '\r' );
}
-
/*
* Open entry point
*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/console/serial.c b/c/src/lib/libbsp/i960/rxgen960/console/serial.c
index 9f1af9acec..2a1b061efe 100644
--- a/c/src/lib/libbsp/i960/rxgen960/console/serial.c
+++ b/c/src/lib/libbsp/i960/rxgen960/console/serial.c
@@ -5,7 +5,6 @@
#include "serial.h"
#include "rtems.h"
-
typedef unsigned char uchar ; /* Abbreviations */
typedef unsigned short ushort ;
typedef unsigned long ulong ;
@@ -22,8 +21,6 @@ static struct{
char in_line[128];
}cons_input[MAX_CONSOLE];
-
-
/* This uses the message out and in buffers as serial emulator.
Pretty stupid eh?
*/
@@ -35,12 +32,9 @@ static struct{
static volatile unsigned int * uart = { uart1 };
static volatile unsigned int * uart_rx = { uart1_rx };
-
extern void display_msg(void);
/*extern int sprintf();*/
-
-
int
console_uartinit(unsigned int BAUDRate)
{
@@ -51,7 +45,6 @@ console_uartinit(unsigned int BAUDRate)
return(0);
}
-
/* Introduce a new console channel */
console_new(char * name)
{
@@ -72,8 +65,6 @@ console_new(char * name)
#endif
}
-
-
/***********************************************************************
*** Transmit character to host.
*** put the console ID in upper byte
@@ -127,7 +118,6 @@ wait:
}
-
/*
* putnum -- print a 32 bit number in hex
*/
@@ -305,7 +295,6 @@ int console_sps_getc()
return ch;
}
-
void cons_isr()
{
unsigned int i, chin, consinx, st;
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 de62be173d..a5fd26816c 100644
--- a/c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S
+++ b/c/src/lib/libbsp/i960/rxgen960/start/rxgen_romld.S
@@ -108,8 +108,6 @@ _romExit :
// fmark
b _romExit
-
-
SYM(led_array):
.byte 99
.byte 1
@@ -125,7 +123,6 @@ SYM(led_array):
.byte 0xb
.byte 0xc
-
/* just to compile and link application XXX JOEL */
.globl _faultStart
.globl _faultEnd
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S b/c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S
index 82a9566b01..2a9327b54f 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/asmstub.S
@@ -85,7 +85,6 @@ _asm_imask:
/* alterbit g0, sf1, sf1 XXX JRS */
ret
-
########################################################################
#
# PURPOSE: get the value of the interrupt mask register
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
index 17e1b99ca8..de6651669c 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
@@ -77,14 +77,12 @@ bsp_pretasking_hook(void)
bsp_libc_init((void *) heap_start, 64 * 1024, 0);
-
#ifdef RTEMS_DEBUG
rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
#endif
*(unsigned char *)(0x120f) = 0xf;
}
-
/* we need to have the top of memory remembered later to start libc_init with
the correct values
*/
@@ -132,7 +130,6 @@ bsp_start(void)
BSP_Configuration.work_space_start = (void *) top_of_used_memory;
top_of_used_memory += (BSP_Configuration.work_space_size + 0x1000);
-
*(unsigned char *)(0x120f) = 0x0a;
return 0;
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c
index 826e569cde..266f4e878a 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.c
@@ -18,7 +18,6 @@
#define IMAP2 0xA90000
#define ICON (VECTOR_CACHE | MSK_UNCHNG | I_ENABLE)
-
/* Bus configuration */
#define RP_CONFIG_REGS I960RP_BUS_WIDTH_32
#define FLASH I960RP_BUS_WIDTH_8
@@ -44,8 +43,6 @@
/*Bus Control Initial value */
#define BCON CONF_TBL_VALID
-
-
ControlTblEntry controlTbl[] = {
/* --group 0 -- */
0,
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h
index 416164a957..5c40d75430 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/cntrltbl.h
@@ -32,8 +32,6 @@ extern ControlTblEntry rom_controlTbl[];
#define VECTOR_CACHE (0x1<<13)
-
-
/* BreakPoint Control Register Initial.
*/
#define BPCON 0
@@ -43,8 +41,6 @@ extern ControlTblEntry rom_controlTbl[];
#define PROTECT_RAM 0x2
#define PROTECT_RAM_SUP 0x4
-
-
#endif
/*-------------*/
/* End of file */
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.c b/c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.c
index b14c59fcdb..510ecc556e 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/intrtbl.c
@@ -10,7 +10,6 @@
#include "intrtbl.h"
/*-------------------------------------*/
-
/* Interrupt Table. Dedicated Interrupts are cached.
* So NMI handler has to be defined here.
*/
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/prcb.c b/c/src/lib/libbsp/i960/rxgen960/startup/prcb.c
index b14512cc79..49eeb6c247 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/prcb.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/prcb.c
@@ -38,7 +38,6 @@
*/
#define REG_CACHE_CONFIG 0x000
-
struct PRCB ram_prcb = {
& faultTbl[0], /* Fault Table Base */
& controlTbl[0], /* Control Table Base */
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 b9811f65bf..a9f3aea9fa 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_cntrltbl.c
@@ -18,7 +18,6 @@
#define IMAP2 0xA90000
#define ICON (VECTOR_CACHE | MSK_UNCHNG | I_ENABLE)
-
/* Bus configuration */
#define RP_CONFIG_REGS I960RP_BUS_WIDTH_32
#define FLASH I960RP_BUS_WIDTH_8
@@ -44,8 +43,6 @@
/*Bus Control Initial value */
#define BCON CONF_TBL_VALID
-
-
ControlTblEntry rom_controlTbl[] = {
/* --group 0 -- */
0,
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 becc0b6843..b5e9d3ef52 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_ibr.c
@@ -14,7 +14,6 @@
/*-------------------------------------*/
extern void romStart(void);
-
struct IBR rom_ibr = {
{((REGION_BOOT_CONFIG) & 0xff), /* Initial Bus Configuration */
((REGION_BOOT_CONFIG) >> 8) & 0xff,
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 0f11c884d8..eb45aa108b 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/rom_prcb.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/rom_prcb.c
@@ -39,7 +39,6 @@ extern SystemTbl nulsystemTbl;
*/
#define REG_CACHE_CONFIG 0x200
-
struct PRCB rom_prcb = {
& faultTbl[0], /* Fault Table Base */
& rom_controlTbl[0], /* Control Table Base */
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/setvec.c b/c/src/lib/libbsp/i960/rxgen960/startup/setvec.c
index 8d07d688a5..e017e81a70 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/setvec.c
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/setvec.c
@@ -111,7 +111,6 @@ i960_isr_entry set_vector( /* returns old vector */
volatile unsigned int *ipnd = (unsigned int *) IPND_ADDR;
volatile unsigned int *imsk = (unsigned int *) IMSK_ADDR;
-
cached_intr_tbl = (i960_isr_entry *) 0;
intr_tbl = (i960_isr_entry *) Prcb->intr_tbl;
diff --git a/c/src/lib/libbsp/i960/rxgen960/timer/timer.c b/c/src/lib/libbsp/i960/rxgen960/timer/timer.c
index e4f8a7d63b..1b99f73dcb 100644
--- a/c/src/lib/libbsp/i960/rxgen960/timer/timer.c
+++ b/c/src/lib/libbsp/i960/rxgen960/timer/timer.c
@@ -25,12 +25,10 @@
* $Id$
*/
-
#include <bsp.h>
#include <stdlib.h>
#include <rtems/libio.h>
-
#define TIMER_VECTOR 34
int Ttimer_val;
@@ -58,7 +56,6 @@ void Timer_initialize()
*tmr1 = BUS_CLOCK_1 | TMR_AUTO_RELOAD;
*icon = 0x6000;
-
set_vector( (((unsigned int) timerisr) | 0x2), TIMER_VECTOR, 1 );
*imap2 = (*imap2 & 0xff0fffff) | (((TIMER_VECTOR >> 4) & 0xf) << 20);
@@ -76,8 +73,6 @@ void Timer_initialize()
}
-
-
rtems_isr timerisr(
rtems_vector_number vector
)