summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/av5282
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/av5282
parentWhitespace removal. (diff)
downloadrtems-d4b4664b99044b888bc178bdbd870edd4404b710.tar.bz2
Whitespace removal.
Diffstat (limited to 'c/src/lib/libbsp/m68k/av5282')
-rw-r--r--c/src/lib/libbsp/m68k/av5282/console/console.c22
-rw-r--r--c/src/lib/libbsp/m68k/av5282/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/m68k/av5282/network/network.c28
-rw-r--r--c/src/lib/libbsp/m68k/av5282/start/start.S20
-rw-r--r--c/src/lib/libbsp/m68k/av5282/startup/bspstart.c4
-rw-r--r--c/src/lib/libbsp/m68k/av5282/startup/init5282.c12
6 files changed, 44 insertions, 44 deletions
diff --git a/c/src/lib/libbsp/m68k/av5282/console/console.c b/c/src/lib/libbsp/m68k/av5282/console/console.c
index dcd78ab69d..51cddbfea1 100644
--- a/c/src/lib/libbsp/m68k/av5282/console/console.c
+++ b/c/src/lib/libbsp/m68k/av5282/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
@@ -337,7 +337,7 @@ IntUartInitialize(void)
info->stopbits = -1;
info->hwflow = -1;
info->iomode = TERMIOS_POLLED;
-
+
MCF5282_UART_UACR(chan) = 0;
MCF5282_UART_UIMR(chan) = 0;
if ( info->iomode != TERMIOS_POLLED )
@@ -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/av5282/include/bsp.h b/c/src/lib/libbsp/m68k/av5282/include/bsp.h
index 71b3aa855c..b5b511777e 100644
--- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/av5282/include/bsp.h
@@ -1,7 +1,7 @@
/*
* av5282 BSP header file
*/
-
+
#ifndef __SBav5282_BSP_H
#define __SBav5282_BSP_H
diff --git a/c/src/lib/libbsp/m68k/av5282/network/network.c b/c/src/lib/libbsp/m68k/av5282/network/network.c
index 2dcf1d1e04..891d7d3924 100644
--- a/c/src/lib/libbsp/m68k/av5282/network/network.c
+++ b/c/src/lib/libbsp/m68k/av5282/network/network.c
@@ -115,7 +115,7 @@ static rtems_isr
mcf5282_fec_rx_interrupt_handler( rtems_vector_number v )
{
MCF5282_FEC_EIR = MCF5282_FEC_EIR_RXF;
- MCF5282_FEC_EIMR &= ~MCF5282_FEC_EIMR_RXF;
+ MCF5282_FEC_EIMR &= ~MCF5282_FEC_EIMR_RXF;
enet_driver[0].rxInterrupts++;
rtems_event_send(enet_driver[0].rxDaemonTid, RX_INTERRUPT_EVENT);
}
@@ -124,7 +124,7 @@ static rtems_isr
mcf5282_fec_tx_interrupt_handler( rtems_vector_number v )
{
MCF5282_FEC_EIR = MCF5282_FEC_EIR_TXF;
- MCF5282_FEC_EIMR &= ~MCF5282_FEC_EIMR_TXF;
+ MCF5282_FEC_EIMR &= ~MCF5282_FEC_EIMR_TXF;
enet_driver[0].txInterrupts++;
rtems_event_send(enet_driver[0].txDaemonTid, TX_INTERRUPT_EVENT);
}
@@ -264,7 +264,7 @@ mcf5282_fec_initialize_hardware(struct mcf5282_enet_struct *sc)
* Full duplex
* No loopback
*/
- MCF5282_FEC_RCR = MCF5282_FEC_RCR_MAX_FL(MAX_MTU_SIZE) |
+ MCF5282_FEC_RCR = MCF5282_FEC_RCR_MAX_FL(MAX_MTU_SIZE) |
MCF5282_FEC_RCR_MII_MODE;
/*
@@ -334,7 +334,7 @@ mcf5282_fec_initialize_hardware(struct mcf5282_enet_struct *sc)
MCF5282_INTC0_ICR27 = MCF5282_INTC_ICR_IL(FEC_IRQ_LEVEL) |
MCF5282_INTC_ICR_IP(FEC_IRQ_RX_PRIORITY);
MCF5282_INTC0_IMRL &= ~(MCF5282_INTC_IMRL_INT27 | MCF5282_INTC_IMRL_MASKALL);
-
+
status = rtems_interrupt_catch(mcf5282_mii_interrupt_handler, MII_VECTOR, &old_handler);
if (status != RTEMS_SUCCESSFUL)
rtems_panic ("Can't attach MCF5282 FEC MII interrupt handler: %s\n",
@@ -504,9 +504,9 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
*/
nAdded = 0;
firstTxBd = sc->txBdBase + sc->txBdHead;
-
+
while(m != NULL) {
- /*
+ /*
* Wait for buffer descriptor to become available
*/
if ((sc->txBdActiveCount + nAdded) == sc->txBdCount) {
@@ -514,7 +514,7 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
* Clear old events.
*/
MCF5282_FEC_EIR = MCF5282_FEC_EIR_TXF;
-
+
/*
* Wait for buffer descriptor to become available.
* Check for buffer descriptors before waiting for the event.
@@ -525,9 +525,9 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
while ((sc->txBdActiveCount + nAdded) == sc->txBdCount) {
rtems_event_set events;
int level;
-
+
rtems_interrupt_disable(level);
- MCF5282_FEC_EIMR |= MCF5282_FEC_EIMR_TXF;
+ MCF5282_FEC_EIMR |= MCF5282_FEC_EIMR_TXF;
rtems_interrupt_enable(level);
sc->txRawWait++;
rtems_bsdnet_event_receive(TX_INTERRUPT_EVENT,
@@ -537,13 +537,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 ? MCF5282_FEC_TxBD_R : 0;
-
+
/*
* The IP fragmentation routine in ip_output
* can produce fragments with zero length.
@@ -622,9 +622,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/av5282/start/start.S b/c/src/lib/libbsp/m68k/av5282/start/start.S
index fa176b06fd..d3bfa1cca0 100644
--- a/c/src/lib/libbsp/m68k/av5282/start/start.S
+++ b/c/src/lib/libbsp/m68k/av5282/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
@@ -325,7 +325,7 @@ SYM(start):
*/
move.l #__IPSBAR+1,d0 | Enable the MCF5282 internal peripherals
move.l d0,DEFAULT_IPSBAR
-
+
/*
* Remainder of the startup code is handled by C code
*/
@@ -334,7 +334,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
@@ -342,7 +342,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
@@ -353,7 +353,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
@@ -377,8 +377,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/av5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c
index 1edcf42b63..2099bb6feb 100644
--- a/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c
@@ -17,13 +17,13 @@
* found in the file LICENSE in this distribution or at
*
* http://www.rtems.com/license/LICENSE.
- *
+ *
* $Id$
*/
#include <bsp.h>
#include <string.h>
-
+
/*
* Cacheable areas
*/
diff --git a/c/src/lib/libbsp/m68k/av5282/startup/init5282.c b/c/src/lib/libbsp/m68k/av5282/startup/init5282.c
index 324b32323d..3dbeb4df70 100644
--- a/c/src/lib/libbsp/m68k/av5282/startup/init5282.c
+++ b/c/src/lib/libbsp/m68k/av5282/startup/init5282.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 uC5282 because all the hard
* work has been done by the bootstrap dBUG code.
*/
@@ -24,7 +24,7 @@ void Init5282 (void)
{
int x;
int temp = 0;
-
+
/*Setup the GPIO Registers */
MCF5282_GPIO_PBCDPAR = 0x80;
MCF5282_GPIO_PEPAR = 0x5100;
@@ -35,7 +35,7 @@ void Init5282 (void)
MCF5282_QADC_DDRQB = 0x07;
MCF5282_GPTA_GPTDDR = 0x0C;
MCF5282_GPTA_GPTPORT = 0x4;
-
+
/*Setup the Chip Selects so CS0 is flash */
MCF5282_CS0_CSAR =(0xff800000 & 0xffff0000)>>16;
MCF5282_CS0_CSMR = 0x007f0001;
@@ -54,11 +54,11 @@ void Init5282 (void)
temp +=1;
}
/* set ip ( bit 3 ) in dacr */
- MCF5282_SDRAMC_DACR0 |= (0x00000008) ;
+ MCF5282_SDRAMC_DACR0 |= (0x00000008) ;
/* init precharge */
*((short *)MM_SDRAM_BASE) = 0;
/* set RE in dacr */
- MCF5282_SDRAMC_DACR0 |= (0x00008000);
+ MCF5282_SDRAMC_DACR0 |= (0x00008000);
/* wait */
for(x=0; x<20000; x++)
{
@@ -72,7 +72,7 @@ void Init5282 (void)
temp +=1;
}
*((unsigned long*)MM_SDRAM_BASE)=0x12345678;
-
+
/* Copy the interrupt vector table to address 0x0 in SDRAM */
{
uint32_t *inttab = (uint32_t *)&INTERRUPT_VECTOR;