summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/arm_bare_bsp
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/arm/arm_bare_bsp
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/arm/arm_bare_bsp')
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h12
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h4
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_asm.S26
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c2
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c8
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h12
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S44
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c22
-rw-r--r--c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c2
9 files changed, 66 insertions, 66 deletions
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h b/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h
index 119c7c133c..761b5f3604 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------+
-| bsp.h - ARM BSP
+| bsp.h - ARM BSP
+--------------------------------------------------------------------------+
| This include file contains definitions related to the ARM BSP.
+--------------------------------------------------------------------------+
@@ -10,7 +10,7 @@
| The license and distribution terms for this file may be
| found in found in the file LICENSE in this distribution or at
| http://www.rtems.com/license/LICENSE.
-|
+|
| $Id$
+--------------------------------------------------------------------------*/
@@ -28,7 +28,7 @@ extern "C" {
#include <rtems/iosupp.h>
#include <rtems/console.h>
#include <rtems/clockdrv.h>
-
+
/*
* Define the interrupt mechanism for Time Test 27
*
@@ -38,11 +38,11 @@ extern "C" {
#define MUST_WAIT_FOR_INTERRUPT 0
-#define Install_tm27_vector( handler )
+#define Install_tm27_vector( handler )
-#define Cause_tm27_intr()
+#define Cause_tm27_intr()
-#define Clear_tm27_intr()
+#define Clear_tm27_intr()
#define Lower_tm27_intr()
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h b/c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h
index ca720a04f2..3b11c3856f 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h
@@ -12,10 +12,10 @@
#ifndef __REGS_H__
-#define __REGS_H__
+#define __REGS_H__
/*
- * VARIABLE DECLARATION
+ * VARIABLE DECLARATION
*/
#ifndef __asm__
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_asm.S b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_asm.S
index 7ff7abb785..311578d50e 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_asm.S
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_asm.S
@@ -15,33 +15,33 @@
#define __asm__
#include <registers.h>
-
-/*
- * Function to obtain, execute an IT handler and acknowledge the IT
+
+/*
+ * Function to obtain, execute an IT handler and acknowledge the IT
*/
.globl ExecuteITHandler
-
-ExecuteITHandler :
+
+ExecuteITHandler :
/*
- * Here is the code to execute the appropriate INT handler
+ * Here is the code to execute the appropriate INT handler
*/
-
+
mov pc, r0
-#if 0
-/*
- * Function to acknowledge the IT controller
+#if 0
+/*
+ * Function to acknowledge the IT controller
*/
.globl AckControler
-
-AckControler:
+
+AckControler:
/*
* Here is the code to acknowledge the PIC
*/
-
+
b ReturnFromAck /* return to ISR handler */
#endif
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c
index c981def87b..f307a4171c 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c
@@ -23,5 +23,5 @@ void BSP_rtems_irq_mngt_init() {
* Here is the code to initialize the INT for
* the specified BSP
*/
-
+
}
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c
index 5b662fb1ee..7a0c222110 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c
@@ -40,7 +40,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
{
rtems_irq_hdl *HdlTable;
rtems_interrupt_level level;
-
+
if (!isValidInterrupt(irq->name)) {
return 0;
}
@@ -51,7 +51,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
if (*(HdlTable + irq->name) != default_int_handler) {
return 0;
}
-
+
_CPU_ISR_Disable(level);
/*
@@ -74,7 +74,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{
rtems_irq_hdl *HdlTable;
rtems_interrupt_level level;
-
+
if (!isValidInterrupt(irq->name)) {
return 0;
}
@@ -97,7 +97,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
* restore the default irq value
*/
*(HdlTable + irq->name) = default_int_handler;
-
+
_CPU_ISR_Enable(level);
return 1;
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h
index 50e35fe0bc..d773e43161 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h
@@ -22,7 +22,7 @@ extern "C" {
/*
* Include some preprocessor value also used by assember code
*/
-
+
#include <rtems.h>
extern void default_int_handler();
@@ -39,9 +39,9 @@ typedef enum {
} rtems_irq_symbolic_name;
/* define that can be useful (the values are just examples) */
-#define INTMASK 0x01
+#define INTMASK 0x01
#define VECTOR_TABLE 0x00
-
+
/*
* Type definition for RTEMS managed interrupts
*/
@@ -71,9 +71,9 @@ typedef struct __rtems_irq_connect_data__ {
* It is usually called immediately AFTER connecting the interrupt handler.
* RTEMS may well need such a function when restoring normal interrupt
* processing after a debug session.
- *
+ *
*/
- rtems_irq_enable on;
+ rtems_irq_enable on;
/*
* function for disabling interrupts at device level (ONLY!).
* The code will disable it at i8259s level. RATIONALE : anyway
@@ -143,7 +143,7 @@ void BSP_rtems_irq_mngt_init();
* 4) perform rescheduling when necessary,
* 5) restore the C scratch registers...
* 6) restore initial execution flow
- *
+ *
*/
int BSP_install_rtems_irq_handler (const rtems_irq_connect_data*);
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S b/c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S
index c68fcfb076..6e9db56afe 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S
@@ -14,7 +14,7 @@
.equ IRQ_Stack, 0x100
.equ FIQ_Stack, 0x200
.equ SVC_Stack, 0x300
-
+
/* Some standard definitions...*/
.equ Mode_USR, 0x10
@@ -33,20 +33,20 @@
.text
.globl _start
-
+
_start:
/*
* Here is the code to initialize the low-level BSP environment
* (Chip Select, PLL, ....?)
-
+
/* Copy data from FLASH to RAM */
LDR r0, =_initdata /* load address of region */
LDR r1, =0x400000 /* execution address of region */
LDR r2, =_edata /* copy execution address into r2 */
-copy:
+copy:
CMP r1, r2 /* loop whilst r1 < r2 */
LDRLO r3, [r0], #4
STRLO r3, [r1], #4
@@ -55,15 +55,15 @@ copy:
/* zero the bss */
LDR r1, =__bss_end__ /* get end of ZI region */
LDR r0, =__bss_start__ /* load base address of ZI region */
-zi_init:
+zi_init:
MOV r2, #0
CMP r0, r1 /* loop whilst r0 < r1 */
STRLOT r2, [r0], #4
- BLO zi_init
+ BLO zi_init
+
-
/* Load basic ARM7 interrupt table */
-VectorInit:
+VectorInit:
MOV R8, #0
ADR R9, Vector_Init_Block
LDMIA R9!, {R0-R7} /* Copy the Vectors (8 words) */
@@ -75,10 +75,10 @@ VectorInit:
/*******************************************************
standard exception vectors table
- *** Must be located at address 0
-********************************************************/
+ *** Must be located at address 0
+********************************************************/
-Vector_Init_Block:
+Vector_Init_Block:
LDR PC, Reset_Addr
LDR PC, Undefined_Addr
LDR PC, SWI_Addr
@@ -89,36 +89,36 @@ Vector_Init_Block:
LDR PC, FIQ_Addr
.globl Reset_Addr
-Reset_Addr: .long _start
+Reset_Addr: .long _start
Undefined_Addr: .long Undefined_Handler
SWI_Addr: .long SWI_Handler
Prefetch_Addr: .long Prefetch_Handler
Abort_Addr: .long Abort_Handler
- .long 0
+ .long 0
IRQ_Addr: .long IRQ_Handler
FIQ_Addr: .long FIQ_Handler
-
+
/* The following handlers do not do anything useful */
.globl Undefined_Handler
-Undefined_Handler:
+Undefined_Handler:
B Undefined_Handler
.globl SWI_Handler
-SWI_Handler:
- B SWI_Handler
+SWI_Handler:
+ B SWI_Handler
.globl Prefetch_Handler
-Prefetch_Handler:
+Prefetch_Handler:
B Prefetch_Handler
.globl Abort_Handler
-Abort_Handler:
+Abort_Handler:
B Abort_Handler
.globl IRQ_Handler
-IRQ_Handler:
+IRQ_Handler:
B IRQ_Handler
.globl FIQ_Handler
-FIQ_Handler:
+FIQ_Handler:
B FIQ_Handler
-init2 :
+init2 :
/* --- Initialise stack pointer registers
Set up the ABORT stack pointer last and stay in SVC mode */
MOV r0, #(Mode_ABORT | I_Bit | F_Bit) /* No interrupts */
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c
index a5e4099bcd..ecef2a0d96 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------+
| This file contains the ARM BSP startup package. It includes application,
| board, and monitor specific initialization and configuration. The generic CPU
-| dependent initialization has been performed before this routine is invoked.
+| dependent initialization has been performed before this routine is invoked.
+--------------------------------------------------------------------------+
|
| Copyright (c) 2000 Canon Research Centre France SA.
@@ -30,11 +30,11 @@
volatile unsigned long *Regs = (unsigned long*)0xdeadbeef; /* Chip registers */
extern uint32_t _end; /* End of BSS. Defined in 'linkcmds'. */
-/*
- * Size of heap if it is 0 it will be dynamically defined by memory size,
- * otherwise the value should be changed by binary patch
+/*
+ * Size of heap if it is 0 it will be dynamically defined by memory size,
+ * otherwise the value should be changed by binary patch
*/
-uint32_t _heap_size = 0;
+uint32_t _heap_size = 0;
/* Size of stack used during initialization. Defined in 'start.s'. */
extern uint32_t _stack_size;
@@ -67,7 +67,7 @@ void bsp_postdriver_hook(void);
| since drivers are not yet initialized.
| Global Variables: None.
| Arguments: None.
-| Returns: Nothing.
+| Returns: Nothing.
+--------------------------------------------------------------------------*/
void bsp_pretasking_hook(void)
{
@@ -76,9 +76,9 @@ void bsp_pretasking_hook(void)
{
_heap_size = 0x420000 - rtemsFreeMemStart;
}
-
+
bsp_libc_init((void *)rtemsFreeMemStart, _heap_size, 0);
-
+
rtemsFreeMemStart += _heap_size; /* HEAP_SIZE in KBytes */
@@ -89,14 +89,14 @@ void bsp_pretasking_hook(void)
#endif /* RTEMS_DEBUG */
} /* bsp_pretasking_hook */
-
+
/*-------------------------------------------------------------------------+
| Function: bsp_start
| Description: Called before main is invoked.
| Global Variables: None.
| Arguments: None.
-| Returns: Nothing.
+| Returns: Nothing.
+--------------------------------------------------------------------------*/
void bsp_start_default( void )
{
@@ -116,7 +116,7 @@ void bsp_start_default( void )
/* Place RTEMS workspace at beginning of free memory. */
BSP_Configuration.work_space_start = (void *)rtemsFreeMemStart;
-
+
rtemsFreeMemStart += BSP_Configuration.work_space_size;
/*
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c
index 447a34301e..a99faeb9ba 100644
--- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c
+++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------+
-| exit.c - ARM BSP
+| exit.c - ARM BSP
+--------------------------------------------------------------------------+
| Routines to shutdown and reboot the BSP.
+--------------------------------------------------------------------------+