summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/mcf5235
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-11-29 14:59:41 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-11-29 14:59:41 +0000
commitd4b4664b99044b888bc178bdbd870edd4404b710 (patch)
tree59d216d0cd5a964ea9b4a4f965d994865f479f7c /c/src/lib/libbsp/m68k/mcf5235
parentWhitespace removal. (diff)
downloadrtems-d4b4664b99044b888bc178bdbd870edd4404b710.tar.bz2
Whitespace removal.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mcf5235')
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/console/console.c20
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/network/network.c28
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/start/start.S22
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/startup/bspgetcpuclockspeed.c4
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c4
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c20
7 files changed, 50 insertions, 50 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5235/console/console.c b/c/src/lib/libbsp/m68k/mcf5235/console/console.c
index ccf7636a8d..c5ddf8f5c5 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/console/console.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/console/console.c
@@ -27,7 +27,7 @@ static int IntUartInterruptWrite (int minor, const char *buf, int len);
static void
_BSP_null_char( char c )
-{
+{
int level;
if (c == '\n')
@@ -155,7 +155,7 @@ IntUartSet(int minor, int baud, int databits, int parity, int stopbits, int hwfl
Description : This provides the hardware-dependent portion of tcsetattr().
value and sets it. At the moment this just sets the baud rate.
- Note: The highest baudrate is 115200 as this stays within
+ Note: The highest baudrate is 115200 as this stays within
an error of +/- 5% at 25MHz processor clock
***************************************************************************/
static int
@@ -385,9 +385,9 @@ IntUartInitialize(void)
/***************************************************************************
Function : IntUartInterruptWrite
- Description : This writes a single character to the appropriate uart
+ Description : This writes a single character to the appropriate uart
channel. This is either called during an interrupt or in the user's task
- to initiate a transmit sequence. Calling this routine enables Tx
+ to initiate a transmit sequence. Calling this routine enables Tx
interrupts.
***************************************************************************/
static int
@@ -494,7 +494,7 @@ IntUartTaskRead(int minor)
/* copy data into local buffer from rx buffer */
while ( ( index < count ) && ( index < RX_BUFFER_SIZE ) )
{
- /* copy data byte */
+ /* copy data byte */
buffer[index] = info->rx_buffer[info->rx_out];
index++;
@@ -521,7 +521,7 @@ IntUartTaskRead(int minor)
/***************************************************************************
Function : IntUartPollRead
- Description : This reads a character from the internal uart. It returns
+ Description : This reads a character from the internal uart. It returns
to the caller without blocking if not character is waiting.
***************************************************************************/
static int
@@ -537,8 +537,8 @@ IntUartPollRead (int minor)
/***************************************************************************
Function : IntUartPollWrite
- Description : This writes out each character in the buffer to the
- appropriate internal uart channel waiting till each one is sucessfully
+ Description : This writes out each character in the buffer to the
+ appropriate internal uart channel waiting till each one is sucessfully
transmitted.
***************************************************************************/
static int
@@ -575,7 +575,7 @@ rtems_device_driver console_initialize(
/* set io modes for the different channels and initialize device */
IntUartInfo[minor].iomode = TERMIOS_IRQ_DRIVEN;
- IntUartInitialize();
+ IntUartInitialize();
/* Register the console port */
status = rtems_io_register_name ("/dev/console", major, CONSOLE_PORT);
@@ -608,7 +608,7 @@ rtems_device_driver console_initialize(
/***************************************************************************
Function : console_open
- Description : This actually opens the device depending on the minor
+ Description : This actually opens the device depending on the minor
number set during initialisation. The device specific access routines are
passed to termios when the devices is opened depending on whether it is
polled or not.
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
index ad4cd444e4..b069050fdd 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
@@ -1,7 +1,7 @@
/*
* mcf5235 BSP header file
*/
-
+
#ifndef _BSP_H
#define _BSP_H
diff --git a/c/src/lib/libbsp/m68k/mcf5235/network/network.c b/c/src/lib/libbsp/m68k/mcf5235/network/network.c
index d09d5a03e8..7bd01e8249 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/network/network.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/network/network.c
@@ -107,7 +107,7 @@ static rtems_isr
mcf5235_fec_rx_interrupt_handler( rtems_vector_number v )
{
MCF5235_FEC_EIR = MCF5235_FEC_EIR_RXF;
- MCF5235_FEC_EIMR &= ~MCF5235_FEC_EIMR_RXF;
+ MCF5235_FEC_EIMR &= ~MCF5235_FEC_EIMR_RXF;
enet_driver[0].rxInterrupts++;
rtems_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT);
}
@@ -116,7 +116,7 @@ static rtems_isr
mcf5235_fec_tx_interrupt_handler( rtems_vector_number v )
{
MCF5235_FEC_EIR = MCF5235_FEC_EIR_TXF;
- MCF5235_FEC_EIMR &= ~MCF5235_FEC_EIMR_TXF;
+ MCF5235_FEC_EIMR &= ~MCF5235_FEC_EIMR_TXF;
enet_driver[0].txInterrupts++;
rtems_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT);
}
@@ -240,7 +240,7 @@ mcf5235_fec_initialize_hardware(struct mcf5235_enet_struct *sc)
* Full duplex
* No loopback
*/
- MCF5235_FEC_RCR = MCF5235_FEC_RCR_MAX_FL(MAX_MTU_SIZE) |
+ MCF5235_FEC_RCR = MCF5235_FEC_RCR_MAX_FL(MAX_MTU_SIZE) |
MCF5235_FEC_RCR_MII_MODE;
/*
@@ -321,13 +321,13 @@ fec_get_mac_address(volatile struct mcf5235_enet_struct *sc, unsigned char* hwad
hwaddr[1] = (addr >> 16) & 0xff;
hwaddr[2] = (addr >> 8) & 0xff;
hwaddr[3] = (addr >> 0) & 0xff;
-
+
addr = MCF5235_FEC_PAUR;
-
+
hwaddr[4] = (addr >> 24) & 0xff;
hwaddr[5] = (addr >> 16) & 0xff;
}
-
+
/*
* Soak up buffer descriptors that have been sent.
@@ -485,9 +485,9 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
*/
nAdded = 0;
firstTxBd = sc->txBdBase + sc->txBdHead;
-
+
for (;;) {
- /*
+ /*
* Wait for buffer descriptor to become available
*/
if ((sc->txBdActiveCount + nAdded) == sc->txBdCount) {
@@ -508,7 +508,7 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
int level;
rtems_interrupt_disable(level);
- MCF5235_FEC_EIMR |= MCF5235_FEC_EIMR_TXF;
+ MCF5235_FEC_EIMR |= MCF5235_FEC_EIMR_TXF;
rtems_interrupt_enable(level);
sc->txRawWait++;
rtems_bsdnet_event_receive(TX_INTERRUPT_EVENT,
@@ -518,13 +518,13 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
fec_retire_tx_bd(sc);
}
}
-
+
/*
* Don't set the READY flag on the first fragment
* until the whole packet has been readied.
*/
status = nAdded ? MCF5235_FEC_TxBD_R : 0;
-
+
/*
* The IP fragmentation routine in ip_output
* can produce fragments with zero length.
@@ -595,9 +595,9 @@ fec_txDaemon(void *arg)
/*
* Wait for packet
*/
- rtems_bsdnet_event_receive(START_TRANSMIT_EVENT,
- RTEMS_EVENT_ANY | RTEMS_WAIT,
- RTEMS_NO_TIMEOUT,
+ rtems_bsdnet_event_receive(START_TRANSMIT_EVENT,
+ RTEMS_EVENT_ANY | RTEMS_WAIT,
+ RTEMS_NO_TIMEOUT,
&events);
/*
diff --git a/c/src/lib/libbsp/m68k/mcf5235/start/start.S b/c/src/lib/libbsp/m68k/mcf5235/start/start.S
index 22f83dc43f..6cc14eb232 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/start/start.S
+++ b/c/src/lib/libbsp/m68k/mcf5235/start/start.S
@@ -24,10 +24,10 @@
BEGIN_CODE
#define INITIAL_STACK __SRAMBASE+SRAM_SIZE-4
-
+
PUBLIC (INTERRUPT_VECTOR)
SYM(INTERRUPT_VECTOR):
- .long INITIAL_STACK | 0: Initial 'SSP'
+ .long INITIAL_STACK | 0: Initial 'SSP'
.long start | 1: Initial PC
.long SYM(_uhoh) | 2: Bus error
.long SYM(_uhoh) | 3: Address error
@@ -290,9 +290,9 @@ SYM(INTERRUPT_VECTOR):
*/
.align 4
PUBLIC (_uhoh)
-SYM(_uhoh):
+SYM(_uhoh):
nop | Leave spot for breakpoint
- stop #0x2700 | Stop with interrupts disabled
+ stop #0x2700 | Stop with interrupts disabled
bra.w SYM(_uhoh) | Stuck forever
.align 4
@@ -318,12 +318,12 @@ SYM(start):
move.l #__SRAMBASE+1,d0 | Enable the MCF5235 internal SRAM
movec d0,%rambar | ...so we have a stack
- move.l #0x20000201, d0
+ move.l #0x20000201, d0
move.l d0,(0x40000008) | set up 2nd RAMBAR to make 2nd port avail to FEC
move.l #__IPSBAR+1,d0 | Enable the MCF5235 internal peripherals
move.l d0,DEFAULT_IPSBAR
-
+
/*
* Remainder of the startup code is handled by C code
*/
@@ -332,7 +332,7 @@ SYM(start):
/***************************************************************************
Function : CopyDataClearBSSAndStart
- Description : Copy DATA segment, Copy SRAM segment, clear BSS segment,
+ Description : Copy DATA segment, Copy SRAM segment, clear BSS segment,
start C program. Assume that DATA and BSS sizes are multiples of 4.
***************************************************************************/
.align 4
@@ -340,7 +340,7 @@ SYM(start):
PUBLIC (CopyDataClearBSSAndStart)
SYM(CopyDataClearBSSAndStart):
lea SYM(_data_dest_start),a0 | Get start of DATA in RAM
- lea SYM(_data_src_start),a2 | Get start of DATA in ROM
+ lea SYM(_data_src_start),a2 | Get start of DATA in ROM
cmpl a0,a2 | Are they the same?
beq.s NODATACOPY | Yes, no copy necessary
lea SYM(_data_dest_end),a1 | Get end of DATA in RAM
@@ -351,7 +351,7 @@ DATACOPYLOOPTEST:
cmpl a1,a0 | Done?
bcs.s DATACOPYLOOP | No, skip
NODATACOPY:
-
+
/* Now, clear BSS */
lea _clear_start,a0 | Get start of BSS
lea _clear_end,a1 | Get end of BSS
@@ -375,8 +375,8 @@ MULTI_TASK_EXIT:
nop
nop
trap #14
- bra MULTI_TASK_EXIT
-
+ bra MULTI_TASK_EXIT
+
END_CODE
.align 2
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/bspgetcpuclockspeed.c b/c/src/lib/libbsp/m68k/mcf5235/startup/bspgetcpuclockspeed.c
index 347d6b019d..dbdb1480fc 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/bspgetcpuclockspeed.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/startup/bspgetcpuclockspeed.c
@@ -6,12 +6,12 @@
* found in the file LICENSE in this distribution or at
*
* http://www.rtems.com/license/LICENSE.
- *
+ *
* $Id$
*/
#include <bsp.h>
-
+
extern char _CPUClockSpeed[];
uint32_t get_CPU_clock_speed(void)
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c
index cbfa25124f..e141e52504 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c
@@ -6,12 +6,12 @@
* found in the file LICENSE in this distribution or at
*
* http://www.rtems.com/license/LICENSE.
- *
+ *
* $Id$
*/
#include <bsp.h>
-
+
/*
* Read/write copy of common cache
* Split I/D cache
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c b/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c
index 505809f728..d3a82188cd 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c
@@ -2,7 +2,7 @@
* This is where the real hardware setup is done. A minimal stack
* has been provided by the start.S code. No normal C or RTEMS
* functions can be called from here.
- *
+ *
* This routine is pretty simple for the uC5235 because all the hard
* work has been done by the bootstrap dBUG code.
*/
@@ -21,8 +21,8 @@
* if it is set to 1 then we want to boot our own code from flash and we
* do need to initialize the SDRAM.
*/
-
-
+
+
extern uint32_t MCF5235_BSP_START_FROM_FLASH;
void Init5235 (void)
@@ -31,16 +31,16 @@ void Init5235 (void)
int x;
volatile int temp = 0;
int *address_of_MCF5235_BSP_START_FROM_FLASH;
-
+
/*Setup the GPIO Registers */
MCF5235_GPIO_UART=0x3FFF;
MCF5235_GPIO_PAR_AD=0xE1;
-
+
/*Setup the Chip Selects so CS0 is flash */
MCF5235_CS_CSAR0 =(0xFFE00000 & 0xffff0000)>>16;
MCF5235_CS_CSMR0 = 0x001f0001;
MCF5235_CS_CSCR0 = 0x1980;
-
+
address_of_MCF5235_BSP_START_FROM_FLASH = (int *) & MCF5235_BSP_START_FROM_FLASH;
if ( (int)address_of_MCF5235_BSP_START_FROM_FLASH == 1) {
/*Setup the SDRAM */
@@ -56,11 +56,11 @@ void Init5235 (void)
temp +=1;
}
/* set ip ( bit 3 ) in dacr */
- MCF5235_SDRAMC_DACR0 |= (0x00000008) ;
+ MCF5235_SDRAMC_DACR0 |= (0x00000008) ;
/* init precharge */
*((unsigned long *)MM_SDRAM_BASE) = 0xDEADBEEF;
/* set RE in dacr */
- MCF5235_SDRAMC_DACR0 |= (0x00008000);
+ MCF5235_SDRAMC_DACR0 |= (0x00008000);
/* wait */
for(x=0; x<20000; x++)
{
@@ -70,12 +70,12 @@ void Init5235 (void)
MCF5235_SDRAMC_DACR0 |= (0x00000040);
*((short *)MM_SDRAM_BASE) = 0;
for(x=0; x<60000; x++)
- {
+ {
temp +=1;
}
*((unsigned long*)MM_SDRAM_BASE)=0x12345678;
} /* we have finished setting up the sdram */
-
+
/* Copy the interrupt vector table to address 0x0 in SDRAM */
{
extern void INTERRUPT_VECTOR(void);