summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/mbx8xx
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/powerpc/mbx8xx
parent6128a4aa5e791ed4e0a655bfd346a52d92da7883 (diff)
downloadrtems-f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c.tar.bz2
Remove duplicate white lines.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mbx8xx')
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/configure.ac3
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/console/console.c12
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/ide/idecfg.c1
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c4
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h5
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S1
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/network/network.c24
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c3
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S3
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.h1
11 files changed, 0 insertions, 59 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac
index a1cc3a0b18..e5e2e265fa 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac
@@ -60,7 +60,6 @@ RTEMS_BSPOPTS_HELP([CONSOLE_MINOR],
SMC2_MINOR, SCC2_MINOR, SCC3_MINOR, or SCC4_MINOR.
Determines which device will be registered as /dev/console.])
-
RTEMS_BSPOPTS_SET([UARTS_IO_MODE],[*],[0])
RTEMS_BSPOPTS_HELP([UARTS_IO_MODE],
[(BSP--console driver)
@@ -75,7 +74,6 @@ RTEMS_BSPOPTS_HELP([UARTS_IO_MODE],
does not perform serial I/O on any port other than its default debug
port, which must be SMC1.])
-
RTEMS_BSPOPTS_SET([PRINTK_MINOR],[mbx860_005b],[SMC1_MINOR])
RTEMS_BSPOPTS_SET([PRINTK_MINOR],[*],[SMC2_MINOR])
RTEMS_BSPOPTS_HELP([PRINTK_MINOR],
@@ -98,7 +96,6 @@ RTEMS_BSPOPTS_HELP([PRINTK_IO_MODE],
on any port other than its default debug port, which must be SMC1.
Printk always uses polled output.])
-
RTEMS_BSPOPTS_SET([EPPCBUG_SMC1],[mbx860_005b],[])
RTEMS_BSPOPTS_SET([EPPCBUG_SMC1],[*],[1])
RTEMS_BSPOPTS_HELP([EPPCBUG_SMC1],
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c b/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
index efb7c6853b..e5507eeb0c 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/console/console.c
@@ -93,7 +93,6 @@ static void serial_putchar(const char c);
BSP_output_char_function_type BSP_output_char = _BSP_null_char;
-
/*
* _EPPCBug_pollRead
*
@@ -200,7 +199,6 @@ static int _EPPCBug_pollRead(
return retval;
}
-
/*
* _EPPCBug_pollWrite
*
@@ -325,7 +323,6 @@ error:
return -1;
}
-
/*
* do_poll_read
*
@@ -392,7 +389,6 @@ static rtems_status_code do_poll_read(
#endif
}
-
/*
* do_poll_write
*
@@ -460,7 +456,6 @@ static rtems_status_code do_poll_write(
#endif
}
-
/*
* Print functions prototyped in bspIo.h
*/
@@ -814,7 +809,6 @@ rtems_device_driver console_initialize(
#endif /* NVRAM_CONFIGURE != 1 */
-
status = rtems_io_register_name ("/dev/tty0", major, SMC1_MINOR);
if (status != RTEMS_SUCCESSFUL)
rtems_fatal_error_occurred (status);
@@ -846,7 +840,6 @@ rtems_device_driver console_initialize(
return RTEMS_SUCCESSFUL;
}
-
/*
* Open the device
*/
@@ -882,7 +875,6 @@ rtems_device_driver console_open(
};
rtems_status_code sc;
-
#if (NVRAM_CONFIGURE == 1) || \
((NVRAM_CONFIGURE != 1) && (UARTS_USE_TERMIOS == 1) && \
(UARTS_IO_MODE == 1))
@@ -947,7 +939,6 @@ rtems_device_driver console_open(
#endif /* NVRAM_CONFIGURE != 1 */
}
-
/*
* Close the device
*/
@@ -981,7 +972,6 @@ rtems_device_driver console_close(
#endif /* NVRAM_CONFIGURE != 1 */
}
-
/*
* Read from the device
*/
@@ -1015,7 +1005,6 @@ rtems_device_driver console_read(
#endif
}
-
/*
* Write to the device
*/
@@ -1050,7 +1039,6 @@ rtems_device_driver console_write(
#endif
}
-
/*
* Handle ioctl request.
*/
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ide/idecfg.c b/c/src/lib/libbsp/powerpc/mbx8xx/ide/idecfg.c
index 6dee967b54..9b9537de2b 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ide/idecfg.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ide/idecfg.c
@@ -25,7 +25,6 @@
#include <libchip/ide_ctrl_cfg.h>
#include <libchip/ide_ctrl_io.h>
-
/*
* The following table configures the IDE driver used in this BSP.
*/
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
index 9beb406672..ef4f499927 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
@@ -32,7 +32,6 @@ extern "C" {
#include <mpc8xx/console.h>
#include <bsp/vectors.h>
-
/*
* Representation of initialization data in NVRAM
*/
@@ -55,7 +54,6 @@ typedef volatile struct nvram_config_ {
*/
#define nvram ((nvram_config * const) 0xFA001000)
-
/*
* Network driver configuration
*/
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c
index 2a5afa4569..501168ec91 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c
@@ -64,7 +64,6 @@ static inline int is_processor_irq(const rtems_irq_symbolic_name irqLine)
);
}
-
/*
* masks used to mask off the interrupts. For exmaple, for ILVL2, the
* mask is used to mask off interrupts ILVL2, IRQ3, ILVL3, ... IRQ7
@@ -251,7 +250,6 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
return 1;
}
-
int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
{
if (!isValidInterrupt(irq->name)) {
@@ -485,8 +483,6 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum)
}
}
-
-
void _ThreadProcessSignalsFromIrq (BSP_Exception_frame* ctx)
{
/*
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
index 49e720a6b5..b7d10150af 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
@@ -21,7 +21,6 @@
#ifndef LIBBSP_POWERPC_MBX8XX_IRQ_IRQ_H
#define LIBBSP_POWERPC_MBX8XX_IRQ_IRQ_H
-
#define BSP_ASM_IRQ_VECTOR_BASE 0x0
#ifndef ASM
@@ -143,7 +142,6 @@ typedef enum {
#define CPM_INTERRUPT
-
/*
* Type definition for RTEMS managed interrupts
*/
@@ -217,9 +215,6 @@ typedef struct {
rtems_irq_prio* irqPrioTbl;
}rtems_irq_global_settings;
-
-
-
/*-------------------------------------------------------------------------+
| Function Prototypes.
+--------------------------------------------------------------------------*/
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S
index fa877aafaf..0e3ad7af7b 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S
@@ -21,7 +21,6 @@
#include <bsp/vectors.h>
#include <libcpu/raw_exception.h>
-
#define SYNC \
sync; \
isync
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c b/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c
index 32c08798f5..943911007b 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c
@@ -59,7 +59,6 @@
#define INET_ADDR_MAX_BUF_SIZE (sizeof "255.255.255.255")
-
/*
* RTEMS event used by interrupt handler to signal daemons.
* This must *not* be the same event used by the TCP/IP task synchronization.
@@ -126,7 +125,6 @@ struct m8xx_enet_struct {
};
static struct m8xx_enet_struct enet_driver[NIFACES];
-
static void m8xx_scc1_ethernet_on(const rtems_irq_connect_data* ptr)
{
}
@@ -418,7 +416,6 @@ m8xx_enet_initialize (struct m8xx_enet_struct *sc)
m8xx.scc1.gsmr_l = 0x1088003c;
}
-
#ifdef MPC860T
/*
* Please organize FEC controller code better by moving code from
@@ -468,7 +465,6 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc)
*/
m8xx.pgcra &= ~0x80;
-
/*
* Set SIU interrupt level to LVL2
*
@@ -575,8 +571,6 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc)
sc->txBdHead = sc->txBdTail = 0;
sc->txBdActiveCount = 0;
-
-
/*
* Mask all FEC interrupts and clear events
*/
@@ -593,7 +587,6 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc)
}
#endif
-
/*
* Soak up buffer descriptors that have been sent.
* Note that a buffer descriptor can't be retired as soon as it becomes
@@ -815,7 +808,6 @@ scc_rxDaemon (void *arg)
}
}
-
#ifdef MPC860T
static void
fec_rxDaemon (void *arg)
@@ -949,7 +941,6 @@ fec_rxDaemon (void *arg)
}
#endif
-
static void
scc_sendpacket (struct ifnet *ifp, struct mbuf *m)
{
@@ -1076,7 +1067,6 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m)
}
}
-
#ifdef MPC860T
static void
fec_sendpacket (struct ifnet *ifp, struct mbuf *m)
@@ -1208,7 +1198,6 @@ fec_sendpacket (struct ifnet *ifp, struct mbuf *m)
}
#endif
-
/*
* Driver transmit daemon
*/
@@ -1242,7 +1231,6 @@ scc_txDaemon (void *arg)
}
}
-
#ifdef MPC860T
void
fec_txDaemon (void *arg)
@@ -1278,7 +1266,6 @@ fec_txDaemon (void *arg)
}
#endif
-
/*
* Send packet (caller provides header).
*/
@@ -1291,7 +1278,6 @@ m8xx_enet_start (struct ifnet *ifp)
ifp->if_flags |= IFF_OACTIVE;
}
-
/*
* Initialize and start the device
*/
@@ -1335,7 +1321,6 @@ scc_init (void *arg)
m8xx.scc1.gsmr_l |= 0x30;
}
-
#ifdef MPC860T
static void
fec_init (void *arg)
@@ -1366,7 +1351,6 @@ fec_init (void *arg)
else
m8xx.fec.r_cntrl &= ~0x8;
-
/*
* Tell the world that we're running.
*/
@@ -1379,7 +1363,6 @@ fec_init (void *arg)
}
#endif
-
/*
* Stop the device
*/
@@ -1396,7 +1379,6 @@ scc_stop (struct m8xx_enet_struct *sc)
m8xx.scc1.gsmr_l &= ~0x30;
}
-
#ifdef MPC860T
static void
fec_stop (struct m8xx_enet_struct *sc)
@@ -1412,7 +1394,6 @@ fec_stop (struct m8xx_enet_struct *sc)
}
#endif
-
/*
* Show interface statistics
*/
@@ -1440,7 +1421,6 @@ enet_stats (struct m8xx_enet_struct *sc)
printf (" Raw output wait:%-8lu\n", sc->txRawWait);
}
-
/*
* Driver ioctl handler
*/
@@ -1490,7 +1470,6 @@ scc_ioctl (struct ifnet *ifp, int command, caddr_t data)
return error;
}
-
#ifdef MPC860T
static int
fec_ioctl (struct ifnet *ifp, int command, caddr_t data)
@@ -1539,7 +1518,6 @@ fec_ioctl (struct ifnet *ifp, int command, caddr_t data)
}
#endif
-
/*
* Attach an SCC driver to the system
*/
@@ -1671,7 +1649,6 @@ rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config)
return 1;
};
-
#ifdef MPC860T
int
rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config)
@@ -1749,7 +1726,6 @@ rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config)
};
#endif
-
int
rtems_enet_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
{
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
index 2fc1a2f194..e62cd0715b 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
@@ -28,7 +28,6 @@
#include <libcpu/cpuIdent.h>
#include <libcpu/spr.h>
-
SPR_RW(SPRG0)
SPR_RW(SPRG1)
@@ -107,7 +106,6 @@ void bsp_pretasking_hook(void)
#endif
}
-
/*
* bsp_start()
*
@@ -179,7 +177,6 @@ void bsp_start(void)
*/
initialize_exceptions();
-
/*
* Allocate the memory for the RTEMS Work Space. This can come from
* a variety of places: hard coded address, malloc'ed from outside
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S
index 14720aee38..8b1793bf8a 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.S
@@ -8,13 +8,10 @@
* $Id$
*/
-
-
#include <rtems/asm.h>
#include <rtems/score/cpu.h>
#include <bsp/vectors.h>
-
#define SYNC \
sync; \
isync
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.h b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.h
index 43fb7ecedf..3c37c54c73 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.h
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/vectors.h
@@ -130,7 +130,6 @@ typedef struct {
unsigned EXC_DAR;
}BSP_Exception_frame;
-
typedef void (*exception_handler_t) (BSP_Exception_frame* excPtr);
extern exception_handler_t globalExceptHdl;
/*