diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 16:01:48 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 16:01:48 +0000 |
commit | f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c (patch) | |
tree | 4150010cec9b6b51100f183b435955cd847679b4 /c/src/lib/libbsp/powerpc/eth_comm | |
parent | Remove stray white spaces. (diff) | |
download | rtems-f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c.tar.bz2 |
Remove duplicate white lines.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/eth_comm')
11 files changed, 0 insertions, 40 deletions
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c b/c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c index e9cce22c8a..c985209e0b 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c +++ b/c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c @@ -30,7 +30,6 @@ i82527_msg_t rxMsgBuf[NUM_CAN_DEVS][RX_CAN_BUF_SIZE]; volatile i82527_t *candev[NUM_CAN_DEVS]; - static rtems_isr canInterruptHandler (rtems_vector_number v) { @@ -94,7 +93,6 @@ canInterruptHandler (rtems_vector_number v) } } - candev[dev]->msg15.ctrl0 = 0xff & (I82527_MSG_CTRL_MSGVAL_SET | I82527_MSG_CTRL_INTPND_CLR); candev[dev]->msg15.ctrl1 = 0xff & (I82527_MSG_CTRL_NEWDAT_CLR | @@ -145,7 +143,6 @@ rtems_device_driver canbus_initialize( #error NUM_CAN_DEVS is 0. It needs to be at least 1 #endif /* NUM_CAN_DEVS > 0 */ - for (i=0; i < NUM_CAN_DEVS; i++) { /* clear rx buffers */ @@ -161,7 +158,6 @@ rtems_device_driver canbus_initialize( candev[i]->cir = I82527_CIR_DMC; /* Divide memory clock by 2 */ - /* We want 250 kbps so assuming an input clock rate of 10 MHz: * DSC = 0 => SCLK = 10 MHz, tSCLK = 100ns * BRP = 1 => tq = 200ns @@ -336,7 +332,6 @@ rtems_device_driver canbus_close( return RTEMS_SUCCESSFUL; } - rtems_device_driver canbus_read( rtems_device_major_number major, rtems_device_minor_number minor, @@ -421,8 +416,6 @@ rtems_device_driver canbus_write( I82527_MSG_CTRL_CPUUPD_CLR | I82527_MSG_CTRL_TXRQ_SET); - - return RTEMS_SUCCESSFUL; } rtems_device_driver canbus_control( @@ -434,7 +427,6 @@ rtems_device_driver canbus_control( return RTEMS_SUCCESSFUL; } - /* part of old canbus_read */ #if 0 for (i=0; i < RX_CAN_BUF_SIZE) { @@ -453,7 +445,6 @@ rtems_device_driver canbus_control( for (j=0; j < pkt_len; j++) msg.data[j] = rxMsgBuf[minor][i].data[j]; - /* wait until there is a msg */ while (!(candev->msg15.ctrl1 & I82527_MSG_CTRL_NEWDAT)) continue; @@ -473,6 +464,5 @@ rtems_device_driver canbus_control( candev->status = 0x0; - return RTEMS_SUCCESSFUL; #endif diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h b/c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h index e32d3c6338..1611fab1b2 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h @@ -144,7 +144,6 @@ extern i82527_t canbus0; extern i82527_t canbus1; extern i82527_t canbus2; - rtems_device_driver canbus_initialize(rtems_device_major_number, rtems_device_minor_number, void *); @@ -164,7 +163,6 @@ rtems_device_driver canbus_control(rtems_device_major_number, rtems_device_minor_number, void *); - #define CANBUS_DRIVER_TABLE_ENTRY \ { canbus_initialize, canbus_open, canbus_close, \ canbus_read, canbus_write, canbus_control } diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/info.h b/c/src/lib/libbsp/powerpc/eth_comm/include/info.h index d205fed121..3dcc8e380c 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/info.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/info.h @@ -87,6 +87,4 @@ typedef struct BoardInfoBlock_ { #define IFACE_RS232_TX4 0x0100; #define IFACE_RS232_RX4 0x0200; - - #endif /* __info_h__*/ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.c b/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.c index fe4b7fa418..9f4b5ce818 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.c @@ -63,7 +63,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 @@ -250,7 +249,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)) { @@ -484,8 +482,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/eth_comm/irq/irq.h b/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.h index 635ee42fb8..daa6290878 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.h @@ -21,7 +21,6 @@ #ifndef LIBBSP_POWERPC_ETH_COMM_IRQ_IRQ_H #define LIBBSP_POWERPC_ETH_COMM_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/eth_comm/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/eth_comm/irq/irq_asm.S index 38c7d2283d..0f08a13434 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/irq_asm.S +++ b/c/src/lib/libbsp/powerpc/eth_comm/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/eth_comm/network/network.c b/c/src/lib/libbsp/powerpc/eth_comm/network/network.c index 4ed7a0daa1..ed0fdde29b 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/network.c +++ b/c/src/lib/libbsp/powerpc/eth_comm/network/network.c @@ -449,7 +449,6 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc) */ m8xx.pgcra &= ~0x80; - /* * Set SIU interrupt level to LVL2 * @@ -556,8 +555,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 */ @@ -573,7 +570,6 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc) } - /* * Soak up buffer descriptors that have been sent * Note that a buffer descriptor can't be retired as soon as it becomes @@ -1308,7 +1304,6 @@ fec_init (void *arg) else m8xx.fec.r_cntrl &= ~0x8; - /* * Tell the world that we're running. */ @@ -1320,7 +1315,6 @@ fec_init (void *arg) m8xx.fec.ecntrl = 0x2; } - /* * Stop the device */ @@ -1563,7 +1557,6 @@ rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config) if (ifp->if_softc != NULL) return 0; - /* * Process options */ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/start.S b/c/src/lib/libbsp/powerpc/eth_comm/start/start.S index 288b7f3cd9..61b5b39d1f 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/start/start.S +++ b/c/src/lib/libbsp/powerpc/eth_comm/start/start.S @@ -45,8 +45,6 @@ * can tell. It should still be in the papyrus BSP. -Jay */ - - /* * On entry to download_entry, R3 will hold a pointer to a Board Info * Block (boardinfo_t). This should be copied as soon as possible @@ -81,7 +79,6 @@ PUBLIC_VAR (text_length) text_length: .long text.size - /* * Initialization code */ diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c index 3d830a9f6e..ad0cdcc183 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c @@ -165,7 +165,6 @@ void bsp_start(void) if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); - ws_start = heap_start + (256 * 1024); if (ws_start & ((512 * 1024) - 1)) { /* align to 512K boundary */ ws_start = (ws_start + (512 * 1024)) & ~((512 * 1024) - 1); @@ -201,7 +200,6 @@ void bsp_start(void) m8xx.fec.mii_speed = 0x0a; m8xx.fec.mii_data = 0x680a0000; - m8xx.scc2.sccm=0; m8xx.scc2p.rbase=0; m8xx.scc2p.tbase=0; diff --git a/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors.S b/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors.S index 561f190225..50758ca5b4 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors.S +++ b/c/src/lib/libbsp/powerpc/eth_comm/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/eth_comm/vectors/vectors.h b/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors.h index 3a366f5b83..232c61d9a6 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/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; /* |