summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/uC5282
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/uC5282
parentWhitespace removal. (diff)
downloadrtems-d4b4664b99044b888bc178bdbd870edd4404b710.tar.bz2
Whitespace removal.
Diffstat (limited to 'c/src/lib/libbsp/m68k/uC5282')
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/console/console.c20
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/network/network.c24
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/start/start.S16
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c36
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/startup/init5282.c4
6 files changed, 51 insertions, 51 deletions
diff --git a/c/src/lib/libbsp/m68k/uC5282/console/console.c b/c/src/lib/libbsp/m68k/uC5282/console/console.c
index 8282bbe0c7..96ad4b095a 100644
--- a/c/src/lib/libbsp/m68k/uC5282/console/console.c
+++ b/c/src/lib/libbsp/m68k/uC5282/console/console.c
@@ -37,7 +37,7 @@ static int IntUartInterruptWrite (int minor, const char *buf, int len);
static void
_BSP_null_char( char c )
-{
+{
int level;
if (c == '\n')
@@ -169,7 +169,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
@@ -401,9 +401,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
@@ -529,7 +529,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++;
@@ -556,7 +556,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
@@ -572,8 +572,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
@@ -611,7 +611,7 @@ rtems_device_driver console_initialize(
/* set io modes for the different channels and initialize device */
for ( chan = 0; chan < MAX_UART_INFO; chan++ )
IntUartInfo[chan].iomode = TERMIOS_IRQ_DRIVEN;
- IntUartInitialize();
+ IntUartInitialize();
/* Register the console port */
status = rtems_io_register_name ("/dev/console", major, CONSOLE_PORT);
@@ -649,7 +649,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/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
index 608074b38f..899dda7d43 100644
--- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
@@ -10,7 +10,7 @@
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*/
-
+
#ifndef _BSP_H
#define _BSP_H
diff --git a/c/src/lib/libbsp/m68k/uC5282/network/network.c b/c/src/lib/libbsp/m68k/uC5282/network/network.c
index 7717931add..1cc26c0820 100644
--- a/c/src/lib/libbsp/m68k/uC5282/network/network.c
+++ b/c/src/lib/libbsp/m68k/uC5282/network/network.c
@@ -162,7 +162,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);
}
@@ -171,7 +171,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);
}
@@ -276,7 +276,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;
/*
@@ -547,9 +547,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) {
@@ -570,7 +570,7 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
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,
@@ -580,13 +580,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.
@@ -665,9 +665,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);
/*
@@ -836,7 +836,7 @@ enet_stats(struct mcf5282_enet_struct *sc)
printf("Link %s %d Mb/s, %s-duplex.\n",
fixed ? "fixed" : "auto-negotiate",
speed,
- full ? "full" : "half");
+ full ? "full" : "half");
}
printf(" EIR:%8.8lx ", MCF5282_FEC_EIR);
printf("EIMR:%8.8lx ", MCF5282_FEC_EIMR);
diff --git a/c/src/lib/libbsp/m68k/uC5282/start/start.S b/c/src/lib/libbsp/m68k/uC5282/start/start.S
index 03ec2731ba..a4dfae810e 100644
--- a/c/src/lib/libbsp/m68k/uC5282/start/start.S
+++ b/c/src/lib/libbsp/m68k/uC5282/start/start.S
@@ -298,9 +298,9 @@ Entry:
*/
.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
@@ -336,16 +336,16 @@ vectcpy:
move.l a0@+,a1@+ | Copy the vector table
sub.l #1,d0
bne.s vectcpy
-
+
/*
* Remainder of the startup code is handled by C code
*/
jmp SYM(Init5282) | Start C code (which never returns)
-
+
/***************************************************************************
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
@@ -354,7 +354,7 @@ vectcpy:
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
- sub.l #SYM(_header_offset),a2 | Change source by the amount of the header offset
+ sub.l #SYM(_header_offset),a2 | Change source by the amount of the header offset
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
@@ -365,7 +365,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
@@ -389,7 +389,7 @@ MULTI_TASK_EXIT:
nop
nop
trap #14
- bra MULTI_TASK_EXIT
+ bra MULTI_TASK_EXIT
END_CODE
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
index c56197c690..22fc635dcd 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
@@ -14,14 +14,14 @@
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
- *
+ *
* $Id$
*/
#include <bsp.h>
#include <rtems/error.h>
#include <errno.h>
-
+
/*
* Location of 'VME' access
*/
@@ -53,7 +53,7 @@ extern char RamBase[];
* If a write to the CACR is performed to clear the cache (CINV = BIT 24 set)
* and only a partial clear will be done (INVI = BIT 21 or INVD = BIT 20 set),
* then cache corruption may occur.
- *
+ *
* 6.2 Workaround
* All loads of the CACR that perform a cache clear operation (CINV = BIT 24)
* should be followed immediately by a NOP instruction. This avoids the cache
@@ -63,16 +63,16 @@ extern char RamBase[];
*
* Buffered writes must be disabled as described in "MCF5282 Chip Errata",
* MCF5282DE, Rev. 6, 5/2009:
- * SECF124: Buffered Write May Be Executed Twice
- * Errata type: Silicon
- * Affected component: Cache
+ * SECF124: Buffered Write May Be Executed Twice
+ * Errata type: Silicon
+ * Affected component: Cache
* Description: If buffered writes are enabled using the CACR or ACR
* registers, the imprecise write transaction generated
- * by a buffered write may be executed twice.
- * Workaround: Do not enable buffered writes in the CACR or ACR registers:
- * CACR[8] = DBWE (default buffered write enable) must be 0
- * ACRn[5] = BUFW (buffered write enable) must be 0
- * Fix plan: Currently, there are no plans to fix this.
+ * by a buffered write may be executed twice.
+ * Workaround: Do not enable buffered writes in the CACR or ACR registers:
+ * CACR[8] = DBWE (default buffered write enable) must be 0
+ * ACRn[5] = BUFW (buffered write enable) must be 0
+ * Fix plan: Currently, there are no plans to fix this.
*/
#define m68k_set_cacr_nop(_cacr) asm volatile ("movec %0,%%cacr\n\tnop" : : "d" (_cacr))
#define m68k_set_cacr(_cacr) asm volatile ("movec %0,%%cacr" : : "d" (_cacr))
@@ -282,7 +282,7 @@ void bsp_start( void )
* Two A24/D16 spaces, supervisor data acces
*/
MCF5282_CS1_CSAR = MCF5282_CS_CSAR_BA(VME_ONE_BASE);
- MCF5282_CS1_CSMR = MCF5282_CS_CSMR_BAM_16M |
+ MCF5282_CS1_CSMR = MCF5282_CS_CSMR_BAM_16M |
MCF5282_CS_CSMR_CI |
MCF5282_CS_CSMR_SC |
MCF5282_CS_CSMR_UC |
@@ -290,7 +290,7 @@ void bsp_start( void )
MCF5282_CS_CSMR_V;
MCF5282_CS1_CSCR = MCF5282_CS_CSCR_PS_16;
MCF5282_CS2_CSAR = MCF5282_CS_CSAR_BA(VME_TWO_BASE);
- MCF5282_CS2_CSMR = MCF5282_CS_CSMR_BAM_16M |
+ MCF5282_CS2_CSMR = MCF5282_CS_CSMR_BAM_16M |
MCF5282_CS_CSMR_CI |
MCF5282_CS_CSMR_SC |
MCF5282_CS_CSMR_UC |
@@ -511,7 +511,7 @@ fpga_trampoline (rtems_vector_number v)
static rtems_isr
trampoline (rtems_vector_number v)
{
- if (handlerTab[v].func)
+ if (handlerTab[v].func)
(*handlerTab[v].func)(handlerTab[v].arg, (unsigned long)v);
}
@@ -605,7 +605,7 @@ rtems_interrupt_level level;
if (source < 8)
MCF5282_EPORT_EPIER |= 1 << source;
else
- *(&MCF5282_INTC0_ICR1 + (source - 1)) =
+ *(&MCF5282_INTC0_ICR1 + (source - 1)) =
MCF5282_INTC_ICR_IL(l) |
MCF5282_INTC_ICR_IP(p);
enable_irq(source);
@@ -691,7 +691,7 @@ rtems_bsp_reset_cause(char *buf, size_t capacity)
int bit, rsr;
size_t i;
const char *cp;
-
+
if (buf == NULL)
return;
if (capacity)
@@ -709,13 +709,13 @@ rtems_bsp_reset_cause(char *buf, size_t capacity)
case MCF5282_RESET_RSR_LOL: cp = "Loss of lock"; break;
default: cp = "??"; break;
}
- i += snprintf(buf+i, capacity-i, cp);
+ i += snprintf(buf+i, capacity-i, cp);
if (i >= capacity)
break;
rsr &= ~bit;
if (rsr == 0)
break;
- i += snprintf(buf+i, capacity-i, ", ");
+ i += snprintf(buf+i, capacity-i, ", ");
if (i >= capacity)
break;
}
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c b/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c
index 6eaef35262..83b3501b0b 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c
+++ b/c/src/lib/libbsp/m68k/uC5282/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.
*
@@ -26,7 +26,7 @@
void Init5282 (void)
{
extern void CopyDataClearBSSAndStart (void);
-
+
/*
* Copy data, clear BSS and call boot_card()
*/