summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/gen68302
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/m68k/gen68302
parentRemove stray white spaces. (diff)
downloadrtems-f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c.tar.bz2
Remove duplicate white lines.
Diffstat (limited to 'c/src/lib/libbsp/m68k/gen68302')
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/console/console.c2
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/include/m302_int.h9
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/network/network.c13
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/start/start.S3
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/timer/timer.c3
5 files changed, 0 insertions, 30 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68302/console/console.c b/c/src/lib/libbsp/m68k/gen68302/console/console.c
index 84363fb735..8e98d42ec2 100644
--- a/c/src/lib/libbsp/m68k/gen68302/console/console.c
+++ b/c/src/lib/libbsp/m68k/gen68302/console/console.c
@@ -122,7 +122,6 @@ rtems_boolean is_character_ready(
}
}
-
/* inbyte
*
* Receive a character from the MC68302's SCC2.
@@ -155,7 +154,6 @@ char inbyte( void )
return ch;
}
-
/* outbyte
*
* Transmit a character out on the MC68302's SCC2.
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h b/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h
index 0bbe9515bc..3c7f91c90a 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h
+++ b/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h
@@ -43,7 +43,6 @@
#define EDMA_BLIM_MASK 0x0007
#define EDMA_BLIM_8ACCESS 0x0003
-
/* Ethernet Maximum Receive Buffer Length EMRBLR */
#define EMRBLR_MASK 0x07FFE
@@ -104,7 +103,6 @@
#define AR_CNTRL_MULTI_MASK (AR_CNTRL_BIT_MULTI0 | AR_CNTRL_BIT_MULTI1)
-
/* Ethernet buffer Status TX */
#define BUF_STAT_CARRIER_LOST 0x0001
#define BUF_STAT_UNDERRUN 0x0002
@@ -120,7 +118,6 @@
#define BUF_STAT_TO 0x4000
#define BUF_STAT_READY 0x8000
-
/* Ethernet buffer Status RX */
#define BUF_STAT_COLLISION 0x0001
#define BUF_STAT_OVERRUN 0x0002
@@ -280,8 +277,6 @@ struct m68302_imp {
uchar reserved_3[0x74A];
-
-
/****************** 68 EN 302 specific registers **********************/
/** only available here if
M68302_INTERNAL_RAM_BASE_ADD+0x1000=M68EN302_INTERNAL_RAM_BASE_ADD*/
@@ -303,7 +298,6 @@ struct m68302_imp {
uchar dram_reserved[0x7E8];
-
/* Ethernet Controller Registers */
ushort ecntrl; /* Ethernet Control Register */
@@ -387,7 +381,6 @@ struct m68302_imp {
#define M68302imp_sccm(i) (M68302imp_ scc_regs[i].sccm)
#define M68302imp_sccs(i) (M68302imp_ scc_regs[i].sccs)
-
/*----------------------------------------------------------------------------*/
#define M68en302imp_mbc (M68302imp_ mbc)
@@ -399,7 +392,6 @@ struct m68302_imp {
#define M68en302imp_drfrsh (M68302imp_ drfrsh)
#define M68en302imp_dba(i) (M68302imp_ dba[i])
-
#define M68en302imp_ecntrl (M68302imp_ ecntrl)
#define M68en302imp_edma (M68302imp_ edma)
#define M68en302imp_emrblr (M68302imp_ emrblr)
@@ -517,7 +509,6 @@ struct m68302_imp {
#define M68302_CS_WRITE_ONLY 0x22 /* write only memory access */
#define M68302_CS_READ_AND_WRITE 0x00 /* read and write memory access */
-
#define M68302_cs_install(cs_nb,base_add,range,nb_wait_state,read_write) \
do { \
M68302imp_cs_option(cs_nb) = (((~(range - 1)) >> 11) & 0x1FFC) | \
diff --git a/c/src/lib/libbsp/m68k/gen68302/network/network.c b/c/src/lib/libbsp/m68k/gen68302/network/network.c
index b1d47be756..41614f0fc8 100644
--- a/c/src/lib/libbsp/m68k/gen68302/network/network.c
+++ b/c/src/lib/libbsp/m68k/gen68302/network/network.c
@@ -158,15 +158,12 @@ m302Enet_initialize_hardware (struct scc_softc *sc)
#define DSQE 0x0010
#define FDE 0x0020
-
-
/*
* standard loopback
*/
M68302imp_port_data (1) &= ~(LBK);
M68302imp_port_data (1) |= (FDE);
-
M68en302imp_ecntrl=0x0001;
/*
* Set dma configuration status register EDMA
@@ -189,7 +186,6 @@ m302Enet_initialize_hardware (struct scc_softc *sc)
*/
M68en302imp_intr_vect = M302_ETHER_IVECTOR;
-
M68en302imp_intr_mask=0x0;
/*
@@ -232,13 +228,11 @@ m302Enet_initialize_hardware (struct scc_softc *sc)
cam[5] = (hwaddr[2] << 8) | hwaddr[3];
cam[6] = (hwaddr[4] << 8) | hwaddr[5];
-
/*
* Set receiver and transmitter buffer descriptor bases
*/
a_bd = M68302imp_a_eth_bd (0); /* point to first BD */
-
for (i=0;i<128;i++){
M68302_scc_bd_stat_ctrl (a_bd + i) = 0;
@@ -246,7 +240,6 @@ m302Enet_initialize_hardware (struct scc_softc *sc)
M68302_scc_bd_p_buffer (a_bd + i) = NULL;
}
-
sc->txBdBase = M68302imp_a_eth_bd ( 0 ); /* point to first BD */
sc->rxBdBase = M68302imp_a_eth_bd ( sc->txBdCount); /* point to first RX BD atfer all TX*/
@@ -306,7 +299,6 @@ m302Enet_retire_tx_bd (struct scc_softc *sc)
BUF_STAT_UNDERRUN)) {
int j;
-
if (status & BUF_STAT_LATE_COLLISION)
sc->txLateCollision++;
if (status & BUF_STAT_RETRY_LIMIT)
@@ -403,7 +395,6 @@ scc_rxDaemon (void *arg)
sc->rxMbuf[rxBdIndex] = m;
rxBd->p_buffer = mtod (m, void *);
-
if (++rxBdIndex == sc->rxBdCount) {
rxBd->stat_ctrl = BUF_STAT_EMPTY | BUF_STAT_INTERRUPT | BUF_STAT_WRAP;
break;
@@ -452,7 +443,6 @@ scc_rxDaemon (void *arg)
}
}
-
/*
* Check that packet is valid
*/
@@ -777,7 +767,6 @@ scc_init (void *arg)
*/
m302Enet_initialize_hardware (sc);
-
sc->txDaemonTid = rtems_bsdnet_newproc ("SCtx", 4096, scc_txDaemon, sc);
sc->rxDaemonTid = rtems_bsdnet_newproc ("SCrx", 4096, scc_rxDaemon, sc);
@@ -821,7 +810,6 @@ scc_stop (struct scc_softc *sc)
}
-
/*
* Show interface statistics
*/
@@ -903,7 +891,6 @@ scc_ioctl (struct ifnet *ifp, int command, caddr_t data)
}
-
/*
* Attach an SCC driver to the system
*/
diff --git a/c/src/lib/libbsp/m68k/gen68302/start/start.S b/c/src/lib/libbsp/m68k/gen68302/start/start.S
index c6ade9af55..8c2a6fe6bc 100644
--- a/c/src/lib/libbsp/m68k/gen68302/start/start.S
+++ b/c/src/lib/libbsp/m68k/gen68302/start/start.S
@@ -40,7 +40,6 @@
.set tmpSRAM_BASE, 0x400000 | start of temporary SRAM
.set FLASH_BASE, 0xc00000 | start of FLASH''s normal location
-
BEGIN_CODE
PUBLIC (M68Kvec) | Vector Table
SYM (M68Kvec): | standard location for vectors
@@ -232,7 +231,6 @@ Bad: bra Bad
nop
END_CODE
-
BEGIN_DATA
PUBLIC (start_frame)
@@ -257,6 +255,5 @@ SYM (environ):
PUBLIC (stack_size)
.set SYM (stack_size),0x1000
-
END_DATA
END
diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
index b3927487c7..f69569c174 100644
--- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
@@ -19,12 +19,10 @@
* $Id$
*/
-
#include <rtems.h>
#include <bsp.h>
#include <rtems/m68k/m68302.h>
-
#define TMR2_VAL 0x071b /* Timer mode register
* (section 3.5.2.1 in 68302 manual)
* 15-8: "7" prescaler divide by 8 (x+1)
@@ -110,7 +108,6 @@ int Read_timer( void )
return (total - AVG_OVERHEAD) >> 1;
}
-
/*
* Empty function call used in loops to measure basic cost of looping
* in Timing Test Suite.