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 | |
| parent | Remove stray white spaces. (diff) | |
| download | rtems-f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c.tar.bz2 | |
Remove duplicate white lines.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
130 files changed, 0 insertions, 753 deletions
diff --git a/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c b/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c index b768a20541..31268611bc 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c +++ b/c/src/lib/libbsp/powerpc/dmv177/clock/clock.c @@ -46,7 +46,6 @@ uint32_t Clock_Decrementer_value; */ rtems_isr_entry Old_ticker; - void Clock_exit( void ); /* diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.ac b/c/src/lib/libbsp/powerpc/dmv177/configure.ac index 9088482e1e..506f63ba6a 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/configure.ac +++ b/c/src/lib/libbsp/powerpc/dmv177/configure.ac @@ -46,7 +46,6 @@ RTEMS_BSPOPTS_HELP([DMV177_USE_INSTRUCTION_CACHE], This code can conflict with debuggers or emulators. The BSP actually contains the call that enables this.]) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile wrapup/Makefile diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h index 1c37e843b2..7dbff30a6d 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h @@ -58,14 +58,12 @@ int rtems_dmv177_sonic_driver_attach(struct rtems_bsdnet_ifconfig *config); #define RTEMS_BSP_NETWORK_DRIVER_NAME "sonic1" #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_dmv177_sonic_driver_attach - /* * The following macro calculates the Baud constant. For the Z8530 chip. */ #define Z8530_Baud( _frequency, _clock_by, _baud_rate ) \ ( (_frequency /( _clock_by * 2 * _baud_rate)) - 2) - /* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These @@ -77,7 +75,6 @@ int rtems_dmv177_sonic_driver_attach(struct rtems_bsdnet_ifconfig *config); #define MAX_LONG_TEST_DURATION 300 /* 5 minutes = 300 seconds */ #define MAX_SHORT_TEST_DURATION 3 /* 3 seconds */ - /* * Stuff for Time Test 27 */ @@ -127,7 +124,6 @@ int rtems_dmv177_sonic_driver_attach(struct rtems_bsdnet_ifconfig *config); * NOTE: Use the standard Clock driver entry */ - /* * Information placed in the linkcmds file. */ @@ -168,8 +164,6 @@ void DEBUG_puts( char *string ); void BSP_fatal_return( void ); - - void bsp_start( void ); void bsp_cleanup( void ); diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h index 4a54fd7573..a68e4ce9e9 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h +++ b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h @@ -22,7 +22,6 @@ #ifndef _INCLUDE_DMV170_h #define _INCLUDE_DMV170_h - /* * DY-4 uses a non-standard clock for the Exar 88681. */ @@ -215,7 +214,6 @@ extern "C" { #define DMV170_64_BIT_NON_VOLITAL_MEM_INSTALLED 0x2000 #define DMV170_64_BIT_NON_VOLITAL_MEM_NOT_INSTALLED 0x0000 - /* * DUART Baud Rate Definitions. */ @@ -224,7 +222,6 @@ extern "C" { #define DMV170_RTC_FREQUENCY 0x0000 - /* * CPU General Purpose Interrupt definations (PPC_IRQ_EXTERNAL). * Note: For the interrupt level read the lower 3 bits of the @@ -271,7 +268,6 @@ extern "C" { #define SCV64_Is_IRQ4( _status ) (_status&0x10) #define SCV64_Is_IRQ5( _status ) (_status&0x20) - /* * scv64.c */ diff --git a/c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c b/c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c index e7e357d0d2..731a016dd1 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c +++ b/c/src/lib/libbsp/powerpc/dmv177/scv64/scv64.c @@ -95,7 +95,6 @@ typedef struct { */ #define AUTOVECTOR_5 0x80 - /* * Set the registers pointer to the base address of the SCV64 */ diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c b/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c index 5b3d292c78..82a2fdc001 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c @@ -69,7 +69,6 @@ rtems_isr external_exception_ISR ( Chain_Node *node; EE_ISR_Type *ee_isr; - /* * Get all active interrupts. */ @@ -115,7 +114,6 @@ rtems_isr external_exception_ISR ( } } - /*PAGE * * initialize_external_exception_vector diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c b/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c index c9a406f6bf..1170270ae3 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c +++ b/c/src/lib/libbsp/powerpc/dmv177/timer/timer.c @@ -38,10 +38,8 @@ void Timer_initialize() * Timer runs long and accurate enough not to require an interrupt. */ - Timer_driver_Start_time = PPC_Get_timebase_register(); - } #define AVG_OVERHEAD 24 /* It typically takes 24 instructions */ 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; /* diff --git a/c/src/lib/libbsp/powerpc/gen405/configure.ac b/c/src/lib/libbsp/powerpc/gen405/configure.ac index f85c210444..35853b2a24 100644 --- a/c/src/lib/libbsp/powerpc/gen405/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen405/configure.ac @@ -31,7 +31,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], [This defines the base address of the exception table. NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/gen405/include/bsp.h b/c/src/lib/libbsp/powerpc/gen405/include/bsp.h index a7eedd807e..48b4960e89 100644 --- a/c/src/lib/libbsp/powerpc/gen405/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/gen405/include/bsp.h @@ -80,7 +80,6 @@ extern "C" { #define MAX_LONG_TEST_DURATION 300 /* 5 minutes = 300 seconds */ #define MAX_SHORT_TEST_DURATION 3 /* 3 seconds */ - /* * Stuff for Time Test 27 */ @@ -100,7 +99,6 @@ extern "C" { #define RAM_START 0 #define RAM_END 0x00800000 - /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ diff --git a/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c index 97f70ec440..aff05322cd 100644 --- a/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/gen405/startup/bspstart.c @@ -121,7 +121,6 @@ void bsp_pretasking_hook(void) uint32_t heap_size; uint32_t heap_end; - heap_start = (uint32_t ) &_end; if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); @@ -140,7 +139,6 @@ void bsp_pretasking_hook(void) } - /* * bsp_start * diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.ac b/c/src/lib/libbsp/powerpc/helas403/configure.ac index 7e4cbabb88..fb12cf4d4c 100644 --- a/c/src/lib/libbsp/powerpc/helas403/configure.ac +++ b/c/src/lib/libbsp/powerpc/helas403/configure.ac @@ -30,7 +30,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], [This defines the base address of the exception table. NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/helas403/flashentry/flashentry.S b/c/src/lib/libbsp/powerpc/helas403/flashentry/flashentry.S index d11babaa93..b3f197755e 100644 --- a/c/src/lib/libbsp/powerpc/helas403/flashentry/flashentry.S +++ b/c/src/lib/libbsp/powerpc/helas403/flashentry/flashentry.S @@ -122,7 +122,6 @@ stack_top: mtdcr br0,r2 /* write to DCR BR0 */ - /*-------------------------------------------------------------------- * test various RAM configurations (from big to small per bank) *------------------------------------------------------------------*/ @@ -464,10 +463,8 @@ ramaccfx: lwz r4,0(r2) /* get memory at start adr */ blr - #if PPC_ABI == PPC_ABI_POWEROPEN DESCRIPTOR (startup) #endif - .comm environ,4,4 diff --git a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h index 56aff201e1..e552bf09e6 100644 --- a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h @@ -77,7 +77,6 @@ extern "C" { #define MAX_LONG_TEST_DURATION 300 /* 5 minutes = 300 seconds */ #define MAX_SHORT_TEST_DURATION 3 /* 3 seconds */ - /* * Stuff for Time Test 27 */ @@ -97,7 +96,6 @@ extern "C" { #define RAM_START 0 #define RAM_END 0x00800000 - /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ diff --git a/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c b/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c index a769b7c380..58717e14b3 100644 --- a/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c @@ -127,7 +127,6 @@ void bsp_pretasking_hook(void) #endif } - /* * bsp_start * 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; /* diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h index fb79919160..c2abd385a5 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h @@ -52,7 +52,6 @@ #include <bsp/openpic.h> #define BSP_PIC_DO_EOI openpic_eoi(0) - #ifndef ASM #define outport_byte(port,value) outb(value,port) #define outport_word(port,value) outw(value,port) @@ -105,7 +104,6 @@ extern int BSP_connect_clock_handler (void); */ extern unsigned long _BSP_clear_hostbridge_errors(int enableMCP, int quiet); - /* * TM27 stuff */ @@ -137,7 +135,6 @@ void Install_tm27_vector(void (*_handler)()) asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) - #define Clear_tm27_intr() \ do { \ uint32_t _clicks = 0xffffffff; \ @@ -154,7 +151,6 @@ void Install_tm27_vector(void (*_handler)()) } while (0) #endif - #endif #endif diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac index 8b7e2e235b..2b2b335b82 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac @@ -15,7 +15,6 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS - RTEMS_BSPOPTS_SET([DATA_CACHE_ENABLE],[*],[0]) RTEMS_BSPOPTS_HELP([DATA_CACHE_ENABLE], [If defined, the data cache will be enabled after address translation diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c index 29243f4783..27b93d0de4 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c @@ -98,12 +98,8 @@ static void _BSP_output_char( char c ); static rtems_status_code do_poll_read( rtems_device_major_number major, rtems_device_minor_number minor, void * arg); static rtems_status_code do_poll_write( rtems_device_major_number major, rtems_device_minor_number minor, void * arg); - BSP_output_char_function_type BSP_output_char = _BSP_output_char; - - - /* * do_poll_read * @@ -146,7 +142,6 @@ static rtems_status_code do_poll_read( return RTEMS_SUCCESSFUL; } - /* * do_poll_write * @@ -190,7 +185,6 @@ static rtems_status_code do_poll_write( } - /* * Print functions prototyped in bspIo.h */ @@ -211,7 +205,6 @@ static void _BSP_output_char( char c ) } - /* *************** * BOILERPLATE * @@ -266,8 +259,6 @@ rtems_device_driver console_initialize( m8xx_uart_scc_initialize(SCC4_MINOR); /* /dev/tty3 */ #endif - - /* * Set up interrupts */ @@ -279,7 +270,6 @@ rtems_device_driver console_initialize( chmod("/dev/tty0",0660); chown("/dev/tty0",2,0); - status = rtems_io_register_name ("/dev/tty1", major, SCC2_MINOR); if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred (status); @@ -313,7 +303,6 @@ rtems_device_driver console_initialize( return RTEMS_SUCCESSFUL; } - /* * Open the device */ @@ -359,7 +348,6 @@ rtems_device_driver console_open( if ( minor > NUM_PORTS-1 ) return RTEMS_INVALID_NUMBER; - #if UARTS_USE_TERMIOS == 1 #if UARTS_IO_MODE == 1 /* RTEMS interrupt-driven I/O with termios */ @@ -378,7 +366,6 @@ rtems_device_driver console_open( } - /* * Close the device */ @@ -399,7 +386,6 @@ rtems_device_driver console_close( } - /* * Read from the device */ @@ -412,7 +398,6 @@ rtems_device_driver console_read( if ( minor > NUM_PORTS-1 ) return RTEMS_INVALID_NUMBER; - #if UARTS_USE_TERMIOS == 1 return rtems_termios_read( arg ); #else @@ -421,7 +406,6 @@ rtems_device_driver console_read( } - /* * Write to the device */ @@ -434,7 +418,6 @@ rtems_device_driver console_write( if ( minor > NUM_PORTS-1 ) return RTEMS_INVALID_NUMBER; - #if UARTS_USE_TERMIOS == 1 return rtems_termios_write( arg ); #else @@ -444,7 +427,6 @@ rtems_device_driver console_write( } - /* * Handle ioctl request. */ @@ -457,7 +439,6 @@ rtems_device_driver console_control( if ( minor > NUM_PORTS-1 ) return RTEMS_INVALID_NUMBER; - #if UARTS_USE_TERMIOS == 1 return rtems_termios_ioctl( arg ); #else diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h index 0ddbb8eb33..067752802e 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h @@ -60,8 +60,6 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config, int a #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth1" #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_enet_driver_attach - - /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; @@ -115,7 +113,6 @@ extern rtems_configuration_table BSP_Configuration; #define RAM_END 0x1000000 */ - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c index 7de64a8884..d8abb1f29b 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c @@ -38,7 +38,6 @@ static rtems_irq_connect_data default_rtems_entry; static rtems_irq_global_settings* internal_config; static rtems_irq_connect_data* rtems_hdl_tbl; - /* * Check if symbolic IRQ name is an CPM IRQ */ @@ -141,8 +140,6 @@ static m82xxIrqMasks_t SIU_MaskBit[BSP_CPM_IRQ_NUMBER] = }; - - void dump_irq_masks(void ) { int i; @@ -226,7 +223,6 @@ int BSP_irq_disable_at_cpm(const rtems_irq_symbolic_name irqLine) m8260.simr_h &= ~(SIU_MaskBit[cpm_irq_index].mask_h); m8260.simr_l &= ~(SIU_MaskBit[cpm_irq_index].mask_l); - return 0; } @@ -243,7 +239,6 @@ int BSP_irq_enabled_at_cpm(const rtems_irq_symbolic_name irqLine) (m8260.simr_l & SIU_MaskBit[cpm_irq_index].mask_l)); } - /* * ------------------------ RTEMS Single Irq Handler Mngt Routines ---------------- */ @@ -304,7 +299,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)) { @@ -418,7 +412,6 @@ int BSP_rtems_irq_mngt_get(rtems_irq_global_settings** config) volatile unsigned int maxLoop = 0; #endif - /* * High level IRQ handler called from shared_raw_irq_code_entry */ @@ -436,8 +429,6 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) unsigned loopCounter; #endif - - /* * Handle decrementer interrupt */ @@ -507,8 +498,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/mpc8260ads/irq/irq.h b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h index d01dcc1e47..7d24745142 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h @@ -29,7 +29,6 @@ #ifndef LIBBSP_POWERPC_MBX8XX_IRQ_IRQ_H #define LIBBSP_POWERPC_MBX8XX_IRQ_IRQ_H - #define BSP_ASM_IRQ_VECTOR_BASE 0x0 #ifndef ASM @@ -144,7 +143,6 @@ typedef enum { BSP_CPM_IRQ_PC1 = BSP_CPM_IRQ_LOWEST_OFFSET + 62, BSP_CPM_IRQ_PC0 = BSP_CPM_IRQ_LOWEST_OFFSET + 63, - /* * Some Processor exception handled as rtems IRQ symbolic name definition */ @@ -155,7 +153,6 @@ typedef enum { #define CPM_INTERRUPT - /* * Type definition for RTEMS managed interrupts */ @@ -229,9 +226,6 @@ typedef struct { rtems_irq_prio* irqPrioTbl; }rtems_irq_global_settings; - - - /*-------------------------------------------------------------------------+ | Function Prototypes. +--------------------------------------------------------------------------*/ @@ -264,8 +258,6 @@ int BSP_irq_ack_at_cpm (const rtems_irq_symbolic_name irqLine); */ int BSP_irq_enabled_at_cpm (const rtems_irq_symbolic_name irqLine); - - /* * ------------------------ RTEMS Single Irq Handler Mngt Routines ---------------- */ @@ -315,7 +307,6 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* ptr); */ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data*); - /* * ------------------------ RTEMS Global Irq Handler Mngt Routines ---------------- */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S index 64f0176109..a8971f5b1d 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S @@ -28,7 +28,6 @@ .text .p2align 5 - PUBLIC_VAR(decrementer_exception_vector_prolog_code) SYM (decrementer_exception_vector_prolog_code): @@ -258,7 +257,6 @@ nested: */ bl _ThreadProcessSignalsFromIrq - /* * start restoring exception like frame */ @@ -272,10 +270,8 @@ nested: mtcr r29 mtlr r28 - lmw r4, GPR4_OFFSET(r1) - lwz r2, GPR2_OFFSET(r1) lwz r0, GPR0_OFFSET(r1) diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c index b0f8324ae7..952cf76d66 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c @@ -58,7 +58,6 @@ static rtems_irq_connect_data defaultIrq = { without knowing more about the application they are kept the same. */ - static rtems_irq_prio irqPrioTable[BSP_CPM_IRQ_NUMBER]={ /* * actual priorities for interrupt : @@ -73,7 +72,6 @@ static rtems_irq_prio irqPrioTable[BSP_CPM_IRQ_NUMBER]={ }; - /* * Initialize CPM interrupt management */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c index 64a4ee3d7d..41c6d3539c 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c @@ -77,7 +77,6 @@ #include "if_hdlcsubr.h" - /* u_char etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; */ @@ -162,7 +161,6 @@ hdlc_output(ifp, m0, dst, rt0) senderr(EAFNOSUPPORT); } - if (mcopy) (void) looutput(ifp, mcopy, dst, rt); #if 0 @@ -241,7 +239,6 @@ hdlc_input(ifp, m) if (m->m_flags & (M_BCAST|M_MCAST)) ifp->if_imcasts++; - /* * RTEMS addition -- allow application to `tap into' * the incoming packet stream. @@ -254,7 +251,6 @@ hdlc_input(ifp, m) schednetisr(NETISR_IP); inq = &ipintrq; - s = splimp(); if (IF_QFULL(inq)) { IF_DROP(inq); @@ -294,7 +290,6 @@ hdlc_ifattach(ifp) } } - /* SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW, 0, "Ethernet"); */ int diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h index 9daa50524f..c4f42ea352 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h @@ -22,14 +22,11 @@ #ifndef __IF_HDLCSUBR_H #define __IF_HDLCSUBR_H - struct ifnet; struct mbuf; struct sockaddr; struct rtentry; - - void hdlc_ifattach __P((struct ifnet *)); void hdlc_input __P((struct ifnet *, struct mbuf *)); int hdlc_output __P((struct ifnet *, diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c index 9de8b0ff26..c53bb73ed9 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c @@ -62,7 +62,6 @@ #define INET_ADDR_MAX_BUF_SIZE (sizeof "255.255.255.255") - extern void m8xx_dump_brgs( void ); /* @@ -77,7 +76,6 @@ extern void m8xx_dump_brgs( void ); */ #define START_TRANSMIT_EVENT RTEMS_EVENT_2 - /* * Receive buffer size -- Allow for a full ethernet packet plus CRC (1518). * Round off to nearest multiple of RBUF_ALIGN. @@ -128,7 +126,6 @@ struct m8260_hdlc_struct { }; static struct m8260_hdlc_struct hdlc_driver[NIFACES]; - static void m8xx_scc3_hdlc_on(const rtems_irq_connect_data* ptr) { } @@ -187,7 +184,6 @@ m8xx_scc3_interrupt_handler () #endif } - static rtems_irq_connect_data hdlcSCC3IrqData = { BSP_CPM_IRQ_SCC3, (rtems_irq_hdl) m8xx_scc3_interrupt_handler, @@ -196,7 +192,6 @@ static rtems_irq_connect_data hdlcSCC3IrqData = { (rtems_irq_is_enabled)m8xx_scc3_hdlc_isOn }; - /* * Initialize the SCC hardware * Configure I/O ports for SCC3 @@ -232,7 +227,6 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) m8260.psord &= ~0x00000080; m8260.pdird |= 0x00200080; - /* External Rx Clock from CLK5 */ if( m8xx_get_clk( M8xx_CLK_5 ) == -1 ) printk( "Error allocating CLK5 for network device.\n" ); @@ -245,8 +239,6 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) else m8260.cmxscr |= ((unsigned)brg << 8); - - /* * Allocate mbuf pointers */ @@ -283,7 +275,6 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) */ m8260.scc3p.mrblr = RBUF_SIZE; - m8260.scc3p.un.hdlc.c_mask = 0xF0B8; m8260.scc3p.un.hdlc.c_pres = 0xFFFF; m8260.scc3p.un.hdlc.disfc = 0; @@ -301,7 +292,6 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) m8260.scc3p.un.hdlc.haddr3 = 0xFFFF; /* Dummy */ m8260.scc3p.un.hdlc.haddr4 = 0xFFFF; /* Dummy */ - /* * Send "Init parameters" command */ @@ -326,7 +316,6 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) sc->txBdHead = sc->txBdTail = 0; sc->txBdActiveCount = 0; - m8260.scc3.sccm = 0; /* No interrupts unmasked till necessary */ /* @@ -364,8 +353,6 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) #endif - - m8260.scc3.gsmr_h = 0; m8260.scc3.gsmr_l = 0x10000000; m8260.scc3.dsr = 0x7E7E; /* flag character */ @@ -377,8 +364,6 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) } - - /* * Soak up buffer descriptors that have been sent * Note that a buffer descriptor can't be retired as soon as it becomes @@ -592,7 +577,6 @@ scc_rxDaemon (void *arg) } } - static void scc_sendpacket (struct ifnet *ifp, struct mbuf *m) { @@ -682,14 +666,12 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) txBd->buffer = mtod (m, void *); txBd->length = m->m_len; - /* * Flush the buffer for this descriptor */ rtems_cache_flush_multiple_data_lines((void *)txBd->buffer, txBd->length); - /* throw off the header for Ethernet Emulation mode */ /* txBd->buffer = mtod (m, void *); @@ -734,7 +716,6 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) } } - /* * Driver transmit daemon */ @@ -763,16 +744,13 @@ scc_txDaemon (void *arg) if (!m) break; - scc_sendpacket (ifp, m); - } ifp->if_flags &= ~IFF_OACTIVE; } } - /* * Send packet (caller provides header). */ @@ -830,8 +808,6 @@ scc_init (void *arg) m8260.scc3.gsmr_l |= 0x30; } - - /* * Stop the device */ @@ -848,7 +824,6 @@ scc_stop (struct m8260_hdlc_struct *sc) m8260.scc3.gsmr_l &= ~0x30; } - /* * Show interface statistics */ @@ -918,8 +893,6 @@ scc_ioctl (struct ifnet *ifp, int command, caddr_t data) return error; } - - /* * Attach an SCC driver to the system */ @@ -1000,7 +973,6 @@ rtems_scc3_driver_attach (struct rtems_bsdnet_ifconfig *config) return 1; }; - int rtems_enet_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching) { diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S b/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S index 241e60212a..aea3978628 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S @@ -41,7 +41,6 @@ * version of the data segment to the correct location. */ - .section ".entry" /* This might have to be the first thing in the * text section. At one time, it had to be * first, but I don't believe it is true @@ -68,8 +67,6 @@ PUBLIC_VAR (data_addr ) data_addr: .long data.start - - PUBLIC_VAR (text_addr) text_addr: .long text.start @@ -78,7 +75,6 @@ PUBLIC_VAR (text_length) text_length: .long text.size - /* * Initialization code */ @@ -86,7 +82,6 @@ text_length: /* Get start address */ mflr r1 - /* -------------------------------------------------- * Clear MSR[EE] to disable interrupts * Clear MSR[IP] bit to put vectors at 0x00000000 @@ -101,9 +96,6 @@ text_length: #endif mtmsr r5 - - - #ifdef ENABLE_CACHE /* Enable caches */ mfspr r5, 1008 @@ -119,7 +111,6 @@ text_length: #endif #endif - /*-------------------------------------------------- * Set up the power management modes * The 8260 has a dynamic power management mode that @@ -135,12 +126,9 @@ text_length: * *-------------------------------------------------- */ - - /* clear the bss section */ bl bssclr - /* * C_setup. */ @@ -151,7 +139,6 @@ text_length: /* Set up stack pointer = beginning of text section - 56 */ addi r1, r1, -56-4 - /* clear argc and argv */ xor r3, r3, r3 xor r4, r4, r4 @@ -159,16 +146,12 @@ text_length: .extern SYM (boot_card) bl SYM (boot_card) /* call the first C routine */ - - /* we don't expect to return from boot_card but if we do */ /* wait here for watchdog to kick us into hard reset */ - twiddle: b twiddle - /* * bssclr - zero out bss */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c index 1aba24a0fd..da23286b58 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c @@ -55,7 +55,6 @@ #include <stackchk.h> #endif - SPR_RW(SPRG0) SPR_RW(SPRG1) @@ -73,7 +72,6 @@ rtems_cpu_table Cpu_table; char *rtems_progname; - /* * Use the shared implementations of the following routines. * Look in rtems/c/src/lib/libbsp/shared/bsppost.c and @@ -159,14 +157,8 @@ void _BSP_Uart2_disable() } - - - - - extern void m8260_console_reserve_resources(rtems_configuration_table *); - /* * Function: bsp_pretasking_hook * Created: 95/03/10 @@ -199,8 +191,6 @@ bsp_pretasking_hook(void) bsp_libc_init( &_HeapStart, &_HeapEnd - &_HeapStart, 0 ); - - #ifdef STACK_CHECKER_ON /* * Initialize the stack bounds checker @@ -215,7 +205,6 @@ bsp_pretasking_hook(void) #endif } - void bsp_start(void) { extern void *_WorkspaceBase; @@ -223,14 +212,12 @@ void bsp_start(void) ppc_cpu_revision_t myCpuRevision; register unsigned char* intrStack; - /* Set MPC8260ADS board LEDS and Uart enable lines */ _BSP_GPLED0_off(); _BSP_GPLED1_off(); _BSP_Uart1_enable(); _BSP_Uart2_enable(); - /* * Get CPU identification dynamically. Note that the get_ppc_cpu_type() function * store the result in global variables so that it can be used latter... @@ -238,8 +225,6 @@ void bsp_start(void) myCpu = get_ppc_cpu_type(); myCpuRevision = get_ppc_cpu_revision(); - - cpu_init(); /* @@ -293,7 +278,6 @@ void bsp_start(void) BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; - /* BSP_Configuration.microseconds_per_tick = 1000; */ @@ -317,9 +301,6 @@ void bsp_start(void) Cpu_table.timer_least_valid = 3; Cpu_table.clock_speed = 40000000; - - - #ifdef REV_0_2 /* set up some board specific registers */ m8260.siumcr &= 0xF3FFFFFF; /* set TBEN ** BUG FIX ** */ @@ -331,13 +312,11 @@ void bsp_start(void) m8260.brgc1 = M8260_BRG_EN + (uint32_t)(((uint16_t)((40016384)/(32768)) - 1) << 1) + 0; */ - /* * Initalize RTEMS IRQ system */ BSP_rtems_irq_mng_init(0); - /* * Call this in case we use TERMIOS for console I/O */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S index e22b8c247c..b0026946df 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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/mpc8260ads/vectors/vectors.h b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.h index 43fb7ecedf..3c37c54c73 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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; /* diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c index f77648c63a..44ecb6819b 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c @@ -133,7 +133,6 @@ void initialize_exceptions() /* _BSP_GPLED0_on(); */ - if (!mpc8xx_init_exceptions(&exception_config)) { /* * At this stage we may not call BSP_Panic because it uses exceptions!!! diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c index 5015453a00..d1e2552711 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c @@ -56,7 +56,6 @@ rtems_device_minor_number rtems_clock_minor; asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) - /* * Clock_isr * diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac index 995fffe7a7..17d817f1a6 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac @@ -59,7 +59,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], [This defines the base address of the exception table. NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c index ca93acb48d..16b30e1eda 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c @@ -38,7 +38,6 @@ | ************************************************************************** +--------------------------------------------------------------------------*/ - #include <bsp.h> #include <stdlib.h> @@ -72,7 +71,6 @@ static uint8_t videoCols = VGA_NUM_COLS; /* Number of columns in display. */ static uint8_t cursRow = 0; /* Current cursor row. */ static uint8_t cursCol = 0; /* Current cursor column. */ - /*-------------------------------------------------------------------------+ | Function: setHardwareCursorPos | Description: Set hardware video cursor at given offset into video RAM. @@ -87,7 +85,6 @@ setHardwareCursorPos(uint16_t videoCursor) VGA_WRITE_CRTC(0x0f, videoCursor & 0xff); } /* setHardwareCursorPos */ - /*-------------------------------------------------------------------------+ | Function: updateVideoRamPtr | Description: Updates value of global variable "videoRamPtr" based on @@ -102,7 +99,6 @@ updateVideoRamPtr(void) videoRamPtr = videoRam + cursRow * videoCols + cursCol; } /* updateVideoRamPtr */ - /*-------------------------------------------------------------------------+ | Function: scrollUp | Description: Scrolls display up n lines. @@ -153,7 +149,6 @@ scrollUp(uint8_t lines) } } /* scrollUp */ - /*-------------------------------------------------------------------------+ | Function: printCHAR | Description: Print printable character to display. @@ -208,7 +203,6 @@ printBS(void) *(--videoRamPtr) = BLANK; } /* printBS */ - /*-------------------------------------------------------------------------+ | Function: printHT | Description: Print HT (Horizontal Tab - '\t') character to display. @@ -226,7 +220,6 @@ printHT(void) while (cursCol % TABSIZE); } /* printHT */ - /*-------------------------------------------------------------------------+ | Function: printLF | Description: Print LF (Line Feed - '\n') character to display. @@ -246,7 +239,6 @@ printLF(void) updateVideoRamPtr(); } /* printLF */ - /*-------------------------------------------------------------------------+ | Function: printCR | Description: Print CR (Carriage Return - '\r') to display. diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h b/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h index 412d76ace0..a289cdc99c 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h @@ -76,7 +76,6 @@ extern "C" { #define BL_128M (0x3FF<2) #define BL_256M (0x7FF<2) - /* Define bit fields for lower MPC603/4 BAT registers. */ #define BRPN_FIELD_60X 0xFFFE0000 @@ -194,7 +193,6 @@ extern "C" { #define ELCRM_INT7_LVL 0x80 #define ELCRM_INT5_LVL 0x20 - #define NONSPECIFIC_EOI 0x20 extern void En_Ext_Interrupt(int level); @@ -382,7 +380,6 @@ void InitializeNvRAM(void); asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) - #define Clear_tm27_intr() \ do { \ uint32_t _clicks = 0xffffffff; \ @@ -398,7 +395,6 @@ void InitializeNvRAM(void); asm volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ } while (0) - /* Constants */ /* diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/nvram.h b/c/src/lib/libbsp/powerpc/ppcn_60x/include/nvram.h index 3bedee57d1..3eba8fb006 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/nvram.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/nvram.h @@ -29,7 +29,6 @@ extern "C" { void InitializeNvRAM(void); - /* * These routines access data in the NvRAM's OS area */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/tod.h b/c/src/lib/libbsp/powerpc/ppcn_60x/include/tod.h index 9238e53366..0b3701ec65 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/tod.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/tod.h @@ -13,7 +13,6 @@ * $Id$ */ - #ifndef TOD_H #define TOD_H diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h index 8f81ebf568..bf8023a174 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h @@ -235,7 +235,6 @@ typedef volatile struct initblk { uint32_t ib_tdra; /* xmit ring desc addr */ } initblk_t; - /* * bits in mode register: allows alteration of the chips operating parameters */ @@ -286,7 +285,6 @@ typedef volatile struct rmde { uint32_t align; } rmde_t; - /* * bits in the flags field */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c index ca313e001b..174e99afa4 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c @@ -123,7 +123,6 @@ void bsp_pretasking_hook(void) */ InitializeUniverse(); - #ifdef RTEMS_DEBUG rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); #endif @@ -143,7 +142,6 @@ void bsp_std_close( void ) close(stderr_fd); } - /* * bsp_predriver_hook * @@ -257,7 +255,6 @@ void bsp_start( void ) } } - /* * Allocate the memory for the RTEMS Work Space. This can come from * a variety of places: hard coded address, malloc'ed from outside @@ -288,5 +285,4 @@ void bsp_start( void ) Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.clicks_per_usec = ulCpuBusClock/4000000; - } diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c index 98348b1020..1492196fcb 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c @@ -60,7 +60,6 @@ typedef struct rtems_vector_number vector; /* vector number */ } EE_ISR_Type; - /* Note: The following will not work if we add a method to remove * handlers at a later time. */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c index 435da9dc02..0c8255836f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c @@ -25,7 +25,6 @@ #include <rtems.h> #include <bsp.h> - /* * This routine installs vector number vector. * diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c index 6a1a427a0f..b8f2cb501e 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c @@ -38,8 +38,6 @@ rtems_isr bsp_spurious_handler( ) { - - DEBUG_puts( "Spurious Trap" ); switch ( trap ) { diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c index 2b2c03392f..22c7090bec 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c @@ -144,7 +144,6 @@ Routine Description: This function was added to bridge the BCD format of the IBM roms and the binary formate of NT - Arguments: Register - Supplies the number of the register whose value is read. @@ -178,7 +177,6 @@ Routine Description: This function was added to bridge the BCD format of the IBM roms and the binary formate of NT - Arguments: Register - Supplies the number of the register whose value is read. @@ -610,7 +608,6 @@ void setRealTimeFromRTEMS() rtems_semaphore_release(semRTC); } - int checkRealTime() { return 0; diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c index ca0d048450..bf3b065942 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c @@ -253,7 +253,6 @@ void InitializeUniverse() PCI_bus_write( &UNIVERSE->LSI0_BD, 0x05000000 ); PCI_bus_write( &UNIVERSE->LSI0_TO, 0x7C000000 ); - #if 0 /* * Set the PCI Slave Image 0 Control register with posted write enable, diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/align_h.S b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/align_h.S index bd490d2509..5a1cd73e1f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/align_h.S +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/align_h.S @@ -90,7 +90,6 @@ .set Open_srr0,152 .set Open_srr1,156 - /* * This code makes several assumptions for processing efficiency * * General purpose registers are continuous in the image, beginning with diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac index 396130fc10..65632c7bdc 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -29,7 +29,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], [This defines the base address of the exception table. NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/c/src/lib/libbsp/powerpc/psim/include/bsp.h index 887317328e..8b112a8858 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/psim/include/bsp.h @@ -69,7 +69,6 @@ extern "C" { #define MAX_LONG_TEST_DURATION 300 /* 5 minutes = 300 seconds */ #define MAX_SHORT_TEST_DURATION 3 /* 3 seconds */ - /* * Stuff for Time Test 27 */ @@ -85,7 +84,6 @@ extern "C" { asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) - #define Clear_tm27_intr() \ do { \ uint32_t _clicks = 0xffffffff; \ @@ -115,7 +113,6 @@ extern "C" { * NOTE: Use the standard Clock driver entry */ - /* * Information placed in the linkcmds file. */ diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c b/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c index 7bdd192648..18f83828d6 100644 --- a/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c +++ b/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c @@ -16,7 +16,6 @@ #include <bsp.h> #include <shm_driver.h> - /* void _Shm_setvec( ) * * This driver routine sets the SHM interrupt vector to point to the diff --git a/c/src/lib/libbsp/powerpc/psim/vectors/align_h.S b/c/src/lib/libbsp/powerpc/psim/vectors/align_h.S index 24befd4b79..b1bcfb1566 100644 --- a/c/src/lib/libbsp/powerpc/psim/vectors/align_h.S +++ b/c/src/lib/libbsp/powerpc/psim/vectors/align_h.S @@ -90,7 +90,6 @@ .set Open_srr0,152 .set Open_srr1,156 - /* * This code makes several assumptions for processing efficiency * * General purpose registers are continuous in the image, beginning with diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c index feb01efb96..d2f15c8896 100644 --- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c +++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.c @@ -29,8 +29,6 @@ void PCI_bus_delay () asm(" nop"); } - - /* * PCI_bus_write */ diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c index fda1760b0e..223fa40d30 100644 --- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c +++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c @@ -21,7 +21,6 @@ ******************************************************************** ********************************************************************/ - /******************************************************************** ******************************************************************** ********* ********* @@ -138,7 +137,6 @@ typedef struct { volatile Universe_Memory *UNIVERSE = (volatile Universe_Memory *)SCORE603E_UNIVERSE_BASE; - /******************************************************************** ******************************************************************** ********* ********* @@ -242,7 +240,6 @@ void initialize_universe() } - /* * Set the slave VME base address to the specified base address. * Note: Lower 12 bits[11:0] will be masked out prior to setting the VMEbus diff --git a/c/src/lib/libbsp/powerpc/score603e/clock/clock.c b/c/src/lib/libbsp/powerpc/score603e/clock/clock.c index 7d768acea7..5c7b2bf1b0 100644 --- a/c/src/lib/libbsp/powerpc/score603e/clock/clock.c +++ b/c/src/lib/libbsp/powerpc/score603e/clock/clock.c @@ -56,7 +56,6 @@ rtems_device_minor_number rtems_clock_minor; asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) - /* * Clock_isr * diff --git a/c/src/lib/libbsp/powerpc/score603e/configure.ac b/c/src/lib/libbsp/powerpc/score603e/configure.ac index 493013fe96..ed3bf6a266 100644 --- a/c/src/lib/libbsp/powerpc/score603e/configure.ac +++ b/c/src/lib/libbsp/powerpc/score603e/configure.ac @@ -15,7 +15,6 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS - RTEMS_BSPOPTS_SET([CONSOLE_USE_INTERRUPTS],[*],[0]) RTEMS_BSPOPTS_HELP([CONSOLE_USE_INTERRUPTS], [whether using console interrupts]) diff --git a/c/src/lib/libbsp/powerpc/score603e/console/85c30.c b/c/src/lib/libbsp/powerpc/score603e/console/85c30.c index 0bad370f35..487f8e1a10 100644 --- a/c/src/lib/libbsp/powerpc/score603e/console/85c30.c +++ b/c/src/lib/libbsp/powerpc/score603e/console/85c30.c @@ -25,7 +25,6 @@ #define STATUS_REGISTER 0x00 #define DATA_REGISTER 0x08 - #define Z8530_Status_Is_RX_character_available( _status ) \ ( (_status) & 0x01 ) @@ -57,7 +56,6 @@ static const unsigned char Stop_bit_85c30[] = { static const unsigned char Parity_85c30[] = { Z8530_PARITY_NONE, Z8530_PARITY_ODD, Z8530_PARITY_EVEN }; - /* PAGE * * Read_85c30_register @@ -102,7 +100,6 @@ static void Write_85c30_register( rtems_bsp_delay_in_bus_cycles( 40 ); } - /* PAGE * * Reset_85c30_chip @@ -119,7 +116,6 @@ void Reset_85c30_chip( Write_85c30_register( ctrl_1, 0x09, 0x40 ); } - /* PAGE * * initialize_85c30_port @@ -285,7 +281,6 @@ void initialize_85c30_port( */ Write_85c30_register( ctrl, 9, 0x0A ); - /* XXX */ /* @@ -362,7 +357,6 @@ int inbyte_nonblocking_85c30( return data; } - /* * Interrupt driven console IO */ diff --git a/c/src/lib/libbsp/powerpc/score603e/console/console.c b/c/src/lib/libbsp/powerpc/score603e/console/console.c index 78cf33c9e0..249ae2c6f1 100644 --- a/c/src/lib/libbsp/powerpc/score603e/console/console.c +++ b/c/src/lib/libbsp/powerpc/score603e/console/console.c @@ -158,8 +158,6 @@ rtems_device_driver console_control( return rtems_termios_ioctl (arg); } - - /* * Interrupt driven console IO */ @@ -223,7 +221,6 @@ void console_initialize_interrupts( void ) for (i=0; i < NUM_Z85C30_CHIPS; i++) set_vector( console_isr, Chips_85C30[i].vector, 1 ); - atexit( console_exit ); } @@ -235,7 +232,6 @@ void console_outbyte_interrupts( /* XXXXXX */ #endif - /* PAGE * * console_initialize @@ -269,7 +265,6 @@ rtems_device_driver console_initialize( * Initialize Hardware */ - /* * INITIALIZE_COM_PORTS is defined in the linker script. If it is * true all serial chips on the board are to be reset at startup @@ -403,7 +398,6 @@ rtems_device_driver console_open( }; #endif - /* * Verify the minor number is valid. */ @@ -428,7 +422,6 @@ rtems_device_driver console_open( return sc; } - #if (CONSOLE_USE_INTERRUPTS) /* diff --git a/c/src/lib/libbsp/powerpc/score603e/console/consolebsp.h b/c/src/lib/libbsp/powerpc/score603e/console/consolebsp.h index 7e20003b41..41f42ad873 100644 --- a/c/src/lib/libbsp/powerpc/score603e/console/consolebsp.h +++ b/c/src/lib/libbsp/powerpc/score603e/console/consolebsp.h @@ -22,7 +22,6 @@ extern "C" { #endif - /* * * Note: The Ports are numbered 0..NUM_Z85C30_CHIPS with port 0 and 1 @@ -30,7 +29,6 @@ extern "C" { * second chip... */ - /* * Z85c30 configuration informaiton. */ @@ -85,7 +83,6 @@ typedef struct { } Console_Protocol; - /* * Structure used for chip level information. */ @@ -117,7 +114,6 @@ typedef struct { extern Chip_85C30_info Chips_85C30 [ NUM_Z85C30_CHIPS ]; extern const Port_85C30_info Ports_85C30 [ NUM_Z85C30_PORTS ]; - /* * 85c30.c prototypes. */ diff --git a/c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c b/c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c index 2212260e0c..8c8d26302c 100644 --- a/c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c +++ b/c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c @@ -24,7 +24,6 @@ #define CONSOLE_DEFAULT_WRITE_CHARACTER_BITS CONSOLE_CHARACTER_BITS_8 #define CONSOLE_DEFAULT_CONSOLE_CLOCK CONSOLE_x16_CLOCK - #define DEFAULT_PROTOCOL { CONSOLE_DEFAULT_BAUD_RATE, \ CONSOLE_DEFAULT_STOP_BITS, \ CONSOLE_DEFAULT_PARITY, \ diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h index 12ba21e3c7..4fe70b199b 100644 --- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h @@ -97,7 +97,6 @@ extern "C" { asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) - #define Clear_tm27_intr() \ do { \ uint32_t _clicks = 0xffffffff; \ @@ -113,7 +112,6 @@ extern "C" { asm volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ } while (0) - /* Constants */ /* @@ -128,7 +126,6 @@ extern "C" { * NOTE: Use the standard Clock driver entry */ - /* * Information placed in the linkcmds file. */ @@ -198,7 +195,6 @@ void init_PCI(); void instruction_cache_enable (); void data_cache_enable (); - void initialize_PCI_bridge (); uint16_t read_and_clear_irq (); void set_irq_mask( diff --git a/c/src/lib/libbsp/powerpc/score603e/include/gen2.h b/c/src/lib/libbsp/powerpc/score603e/include/gen2.h index 64d9c10ba5..fbc78c3fe3 100644 --- a/c/src/lib/libbsp/powerpc/score603e/include/gen2.h +++ b/c/src/lib/libbsp/powerpc/score603e/include/gen2.h @@ -56,7 +56,6 @@ extern "C" { #define SCORE603E_PCI_DEVICE_ADDRESS( _offset) \ ((volatile uint32_t*)( SCORE603E_PCI_PMC_DEVICE_BASE + _offset )) - #define SCORE603E_PMC_SERIAL_ADDRESS( _offset ) \ ((volatile uint8_t*)(SCORE603E_PCI_REGISTER_BASE + _offset)) @@ -91,7 +90,6 @@ extern "C" { #define SCORE603E_JP1_JP2_PROM_BASE 0xfff00000 #define SCORE603E_NOT_JP1_2_FLASH_BASE 0xff800000 - #if (SCORE603E_USE_SDS) | (SCORE603E_USE_OPEN_FIRMWARE) | (SCORE603E_USE_NONE) #define SCORE603E_VME_A16_OFFSET 0x04000000 #elif (SCORE603E_USE_DINK) @@ -144,7 +142,6 @@ extern "C" { #define SCORE603E_85C30_4_CLOCK_X SCORE603E_85C30_PMC_CLOCK_X #define SCORE603E_85C30_5_CLOCK_X SCORE603E_85C30_PMC_CLOCK_X - #define SCORE603E_UNIVERSE_CHIP_ID 0x000010E3 /* @@ -172,7 +169,6 @@ extern "C" { #define PMC_SET_422_LOOPBACK(_word) (_word | 0x01) #define PMC_CLEAR_422_LOOPBACK(_word) (_word & 0xfe) - /* * Score603e Interupt Definations. */ @@ -239,7 +235,6 @@ extern "C" { #define MAX_BOARD_IRQS SCORE603E_IRQ19 - /* * BSP_TIMER_AVG_OVERHEAD and BSP_TIMER_LEAST_VALID for the shared timer * driver. diff --git a/c/src/lib/libbsp/powerpc/score603e/include/tod.h b/c/src/lib/libbsp/powerpc/score603e/include/tod.h index 41530e6f28..c4f20d30d5 100644 --- a/c/src/lib/libbsp/powerpc/score603e/include/tod.h +++ b/c/src/lib/libbsp/powerpc/score603e/include/tod.h @@ -13,7 +13,6 @@ * $Id$ */ - #ifndef TOD_H #define TOD_H diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c b/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c index e1b0091355..da5ffa2a35 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/FPGA.c @@ -89,7 +89,6 @@ void unmask_irq( set_irq_mask( value ); } - void init_irq_data_register() { uint32_t index; diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c b/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c index 3f016c3612..a752fe4e37 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c @@ -46,11 +46,8 @@ #define PPC603e_SPR_IABR 1010 #define PPC603e_SPR_EAR 282 - - #define PCI_MEM_CMD (SCORE603E_PCI_MEM_BASE >> 16) - typedef struct { uint32_t counter_1_100; uint32_t counter_hours; @@ -171,7 +168,6 @@ void init_PCI() ); \ } while (0) - void instruction_cache_enable () { uint32_t value; diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c index b3b2c22607..299066969d 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c @@ -136,7 +136,6 @@ void initialize_PMC() { #endif - #if (1) /* @@ -159,8 +158,6 @@ void initialize_PMC() { #endif } - - /*PAGE * * SCORE603e_bsp_postdriver_hook diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c index b1e59ed579..c552505765 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c @@ -19,7 +19,6 @@ #include <stdio.h> /* for sprintf */ - /* * Proto types for this file */ @@ -42,7 +41,6 @@ typedef struct rtems_vector_number vector; /* vector number */ } EE_ISR_Type; - /* Note: The following will not work if we add a method to remove * handlers at a later time. */ diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/setvec.c b/c/src/lib/libbsp/powerpc/score603e/startup/setvec.c index b10521f05e..e6c5048a7c 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/setvec.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/setvec.c @@ -42,7 +42,6 @@ #include <rtems.h> #include <bsp.h> - /* * This routine installs vector number vector. * @@ -56,7 +55,6 @@ rtems_isr_entry set_vector( /* returns old vector */ rtems_isr_entry previous_isr; rtems_status_code status; - /* * vectors greater than PPC603e_IRQ_LAST are handled by the General purpose * interupt handler. diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h b/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h index 594737efea..bf83667afe 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h @@ -173,7 +173,6 @@ extern void * codemove(void *, const void *, size_t, unsigned long); #define isa_io_base (bd->io_base) - void * __palloc(u_long, int); void pfree(void *); diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c b/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c index 1ca667a82f..f600ec7b52 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c @@ -32,7 +32,6 @@ #include <rtems/bspIo.h> #endif - /* Code options, put them on the compiler command line */ /* #define EIP_STATS */ /* EIP based profiling */ /* #undef EIP_STATS */ @@ -78,7 +77,6 @@ typedef struct _x86 { x86 v86_private __attribute__((aligned(32))); - /* Emulator is in another source file */ extern void em86_enter(x86 * p); @@ -461,7 +459,6 @@ void cleanup_v86_mess(void) { p->ioperm=0; } - int init_v86(void) { x86 *p = (x86 *) bd->v86_private; @@ -502,7 +499,6 @@ void em86_main(struct pci_dev *dev){ #define IOMASK 0 #endif - #ifndef __BOOT__ int i; /* Allow or disable access to all ports */ @@ -550,7 +546,6 @@ void em86_main(struct pci_dev *dev){ p->rom = palloc(length*512); if (!p->rom) return; - for(dst=(u_int *) p->rom, src=(volatile u_int *)(ptr_mem_map->isa_mem_base+0xc0000), left = length*512/sizeof(u_int); diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S b/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S index ad38fb24fb..e5560f4879 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S @@ -193,7 +193,6 @@ * */ - /* Now the details of flag evaluation with the necessary macros */ /* Alignment check is toggable so the system believes it is a 486, but @@ -1721,7 +1720,6 @@ outl_eax_dx: li r4,DX eieio NEXT - /* Macro used for add and sub */ #define ARITH(op,fl) \ op##b_reg_mem: lbzx op1,MEM; SET_FLAGS(fl(B)); lbzx op2,REG; \ @@ -2612,7 +2610,6 @@ _finish_strw: li r4,SI sthbrx r3,state,r4 # update cx NEXT - lodsb_a16: bl _setup_stringw 1: lbzx r0,STRINGSRC # [rep] lodsb add offset,offset,r7 @@ -3878,7 +3875,6 @@ ldlptrw: lhzux r7,MEM lwz ssb,ssbase(state) blr - /* Intructions that may modify the current code segment: the next optimization * might be to avoid calling C code when the code segment does not change. But * it's probably not worth the effort. @@ -4532,7 +4528,6 @@ grp3##bwl: ENTRY(test##bwl##_imm,t); OP(ud); \ grp3table(w,3) grp3table(l,3) - grp4b: BOP(incb); BOP(decb); \ OP(ud); OP(ud); \ OP(ud); OP(ud); \ diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S index cb6d9134fc..0d82791524 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S @@ -38,9 +38,6 @@ li r10,0x26 ; \ sc - - - #define MONITOR_ENTER \ mfmsr r10 ; \ ori r10,r10,MSR_IP ; \ @@ -48,8 +45,6 @@ li r10,0x63 ; \ sc - - START_GOT GOT_ENTRY(_GOT2_TABLE_) GOT_ENTRY(_FIXUP_TABLE_) @@ -98,7 +93,6 @@ start: cmplwi cr2,r0,1 beq 2,2f - /* * commented out, 11/7/2002, gregm. This instruction sequence seems to * be pathological on the 603e. @@ -113,7 +107,6 @@ start: #endif */ - 2: bl reloc /* save all the parameters and the orginal msr/hid0/r31 */ @@ -314,8 +307,6 @@ moved: lwz r1,stack(bd) 1: bctr #endif - - /* relocation function, r30 must point to got2+0x8000 */ reloc: /* Adjust got2 pointers, no need to check for 0, this code already puts diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c b/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c index ae6cf1fafc..ce610fab04 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c @@ -15,7 +15,6 @@ * $Id$ */ - void* memset(void *p, int c, unsigned int n) { char *q =p; diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c index 6b4718e7ea..373b13bb45 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c @@ -33,7 +33,6 @@ struct wait_queue; struct buffer_head; typedef struct { int counter; } atomic_t; - typedef struct page { /* these must be first (free area handling) */ struct page *next; @@ -48,7 +47,6 @@ typedef struct page { struct buffer_head * buffers; } mem_map_t; - extern opaque mm_private, pci_private, v86_private, console_private; #define CONSOLE_ON_SERIAL "console=ttyS0" @@ -74,7 +72,6 @@ static void exit(void) { while(1); } - void hang(const char *s, u_long x, ctxt *p) { u_long *r1; #ifdef DEBUG @@ -91,7 +88,6 @@ void hang(const char *s, u_long x, ctxt *p) { exit(); }; - void *zalloc(void *x, unsigned items, unsigned size) { void *p = salloc(items*size); @@ -115,7 +111,6 @@ void zfree(void *x, void *addr, unsigned nb) #define DEFLATED 8 - void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp) { z_stream s; @@ -422,7 +417,6 @@ setup_hw(void) *cp = 0; } - /* Functions to deal with the residual data */ static int same_DevID(unsigned short vendor, unsigned short Number, diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c b/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c index 4371ae6a0d..3cef24a30c 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c @@ -129,7 +129,6 @@ void print_maps(map *, const char *); * designed to properly handle MMU interrupts to fill the hash table. */ - void _handler(int vec, ctxt *p) { map *area; struct _mm_private *mm = (struct _mm_private *) bd->mm_private; @@ -261,7 +260,6 @@ int insert_map(map **head, map *p) { return 0; } - /* Removal from linked list */ static @@ -421,7 +419,6 @@ MEM_MAP seg_fix[] = { { 0x0480, 0x80800, 0x00800 }, { 0x0440, 0x80000, 0x00800 } }; - /* The Motorola NT firmware does not set up all required info in the residual * data. This routine changes some things in a way that the bootloader and * linux are happy. diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c index 8f17d06b46..dfa31a2a16 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c @@ -15,7 +15,6 @@ * $Id$ */ - #include <sys/types.h> #include <rtems/bspIo.h> #include <libcpu/spr.h> @@ -27,16 +26,13 @@ #include <string.h> - typedef unsigned int u32; - /* #define DEBUG #define PCI_DEBUG */ - /* Used to reorganize PCI space on stupid machines which spread resources * across a wide address space. This is bad when P2P bridges are present * or when it limits the mappings that a resource hog like a PCI<->VME @@ -166,19 +162,15 @@ static struct blacklist_entry blacklist[] = { {0xffff, 0, 0, 0} }; - /* This function filters resources and then inserts them into a list of * configurable pci resources. */ - #define AREA(r) \ (((r->type&PCI_BASE_ADDRESS_SPACE)==PCI_BASE_ADDRESS_SPACE_IO) ? PCI_AREA_IO :\ ((r->type&PCI_BASE_ADDRESS_MEM_PREFETCH) ? PCI_AREA_PREFETCHABLE :\ PCI_AREA_MEMORY)) - - static int insert_before(pci_resource *e, pci_resource *t) { if (e->dev->bus->number != t->dev->bus->number) return e->dev->bus->number > t->dev->bus->number; @@ -186,10 +178,6 @@ static int insert_before(pci_resource *e, pci_resource *t) { return (e->size > t->size); } - - - - static void insert_resource(pci_resource *r) { struct blacklist_entry *b; pci_resource *p; @@ -280,10 +268,6 @@ static void insert_resource(pci_resource *r) { } } - - - - /* This version only works for bus 0. I don't have any P2P bridges to test * a more sophisticated version which has therefore not been implemented. * Prefetchable memory is not yet handled correctly either. @@ -323,11 +307,6 @@ static u_long find_range(u_char bus, u_char type, return total; } - - - - - static inline void init_free_area(pci_area_head *h, u_long start, u_long end, u_int mask, int high) { pci_area *p; @@ -342,11 +321,6 @@ static inline void init_free_area(pci_area_head *h, u_long start, h->high = high; } - - - - - static void insert_area(pci_area_head *h, pci_area *p) { pci_area *q = h->head; if (!p) return; @@ -371,10 +345,6 @@ static void insert_area(pci_area_head *h, pci_area *p) { } } - - - - static void remove_area(pci_area_head *h, pci_area *p) { @@ -390,11 +360,6 @@ void remove_area(pci_area_head *h, pci_area *p) if (q) q->next=p->next; } - - - - - static pci_area * alloc_area(pci_area_head *h, struct pci_bus *bus, u_long required, u_long mask, u_int flags) { pci_area *p; @@ -460,10 +425,6 @@ static pci_area * alloc_area(pci_area_head *h, struct pci_bus *bus, return new; } - - - - static inline void alloc_space(pci_area *p, pci_resource *r) { @@ -476,10 +437,6 @@ void alloc_space(pci_area *p, pci_resource *r) } } - - - - static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h) { pci_resource *first, *past, *r; @@ -500,12 +457,6 @@ static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h) } } - - - - - - #define BUS0_IO_START 0x10000 #define BUS0_IO_END 0x1ffff #define BUS0_MEM_START 0x1000000 @@ -516,10 +467,6 @@ static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h) #define BUSREST_MEM_START 0xb000000 #define BUSREST_MEM_END 0x10000000 - - - - static void reconfigure_pci(void) { pci_resource *r; struct pci_dev *dev; @@ -535,7 +482,6 @@ static void reconfigure_pci(void) { init_free_area(&pci->io, BUS0_IO_START, BUS0_IO_END, 0xfff, 0); init_free_area(&pci->mem, BUS0_MEM_START, BUS0_MEM_END, 0xfffff, 0); - /* First reconfigure the I/O space, this will be more * complex when there is more than 1 bus. And 64 bits * devices are another kind of problems. @@ -586,11 +532,6 @@ static void reconfigure_pci(void) { } } - - - - - static int indirect_pci_read_config_byte(unsigned char bus, unsigned char dev_fn, unsigned char offset, unsigned char *val) { @@ -660,7 +601,6 @@ static const struct pci_config_access_functions indirect_functions = { indirect_pci_write_config_dword }; - static int direct_pci_read_config_byte(unsigned char bus, unsigned char dev_fn, unsigned char offset, unsigned char *val) { @@ -750,11 +690,6 @@ static const struct pci_config_access_functions direct_functions = { direct_pci_write_config_dword }; - - - - - void pci_read_bases(struct pci_dev *dev, unsigned int howmany) { unsigned int reg, nextreg; @@ -821,13 +756,6 @@ void pci_read_bases(struct pci_dev *dev, unsigned int howmany) } } - - - - - - - u_int pci_scan_bus(struct pci_bus *bus) { unsigned int devfn, l, max, class; @@ -1018,15 +946,6 @@ u_int pci_scan_bus(struct pci_bus *bus) return max; } - - - - - - - - - #if 0 void @@ -1043,11 +962,6 @@ pci_fixup(void) } } - - - - - static void print_pci_info() { pci_resource *r; @@ -1102,17 +1016,6 @@ static void print_pci_info() #endif - - - - - - - - - - - static struct _addr_start { uint32_t start_pcimem; @@ -1120,10 +1023,6 @@ static struct _addr_start uint32_t start_prefetch; } astart; - - - - static pci_resource *enum_device_resources( struct pci_dev *pdev, int i ) { pci_resource *r; @@ -1138,21 +1037,12 @@ static pci_resource *enum_device_resources( struct pci_dev *pdev, int i ) return r; } - - - - - - - - static void recursive_bus_reconfigure( struct pci_bus *pbus ) { struct pci_dev *pdev; struct pci_bus *childbus; int isroot = 0; - if( !pbus ) { /* start with the root bus */ @@ -1164,13 +1054,11 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) isroot = -1; } - #define WRITE_BRIDGE_IO #define WRITE_BRIDGE_MEM #define WRITE_BRIDGE_PF #define WRITE_BRIDGE_ENABLE - /* ** Run thru the p2p bridges on this bus and recurse into subordinate busses */ @@ -1198,8 +1086,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) childbus->subordinate ); #endif - - /* **use the current values & the saved ones to figure out ** the address spaces for the bridge @@ -1230,9 +1116,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) pcibios_write_config_byte(pdev->bus->number, pdev->devfn, PCI_IO_LIMIT, limit8 ); #endif - - - if( addrhold.start_pcimem == astart.start_pcimem ) { limit16 = 0; @@ -1252,8 +1135,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_MEMORY_LIMIT, limit16 ); #endif - - if( astart.start_prefetch == addrhold.start_prefetch ) { limit16 = 0; @@ -1289,11 +1170,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) } } - - - - - if( !isroot ) { #ifdef PCI_DEBUG @@ -1370,15 +1246,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) } - - - - - - - - - void pci_init(void) { PPC_DEVICE *hostbridge; @@ -1439,5 +1306,4 @@ void pci_init(void) print_pci_resources("Allocated PCI resources:\n"); } - /* eof */ diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h index 3884760c8b..619497d5b7 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h @@ -1155,5 +1155,4 @@ extern struct pci_dev *pci_devices; /* list of all devices */ #define PCIBIOS_SET_FAILED 0x88 #define PCIBIOS_BUFFER_TOO_SMALL 0x89 - #endif /* BOOTLOADER_PCI_H */ diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c b/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c index 70e97abb6e..2eb7c1b777 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c @@ -105,7 +105,6 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */ # define Tracecv(c,x) #endif - typedef uLong (*check_func) OF((uLong check, Bytef *buf, uInt len)); /* voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); */ @@ -229,7 +228,6 @@ local int inflate_trees_free OF(( inflate_huft *, /* tables to free */ z_stream *)); /* for zfree function */ - /*+++++*/ /* infcodes.h -- header to use infcodes.c * Copyright (C) 1995 Mark Adler @@ -258,7 +256,6 @@ local void inflate_codes_free OF(( inflate_codes_statef *, z_stream *)); - /*+++++*/ /* inflate.c -- zlib interface to inflate modules * Copyright (C) 1995 Mark Adler @@ -299,7 +296,6 @@ struct internal_state { }; - int inflateReset(z) z_stream *z; { @@ -315,7 +311,6 @@ z_stream *z; return Z_OK; } - int inflateEnd(z) z_stream *z; { @@ -331,7 +326,6 @@ z_stream *z; return Z_OK; } - int inflateInit2(z, w) z_stream *z; int w; @@ -377,14 +371,12 @@ int w; return Z_OK; } - int inflateInit(z) z_stream *z; { return inflateInit2(z, DEF_WBITS); } - #define NEEDBYTE {if(z->avail_in==0)goto empty;r=Z_OK;} #define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++) @@ -513,7 +505,6 @@ z_stream *z; return inflate_addhistory(z->state->blocks, z); } - int inflateSync(z) z_stream *z; { @@ -625,7 +616,6 @@ struct inflate_blocks_state { }; - /* defines for inflate input/output */ /* update pointers and return */ #define UPDBITS {s->bitb=b;s->bitk=k;} @@ -681,7 +671,6 @@ local int inflate_fast OF(( inflate_blocks_statef *, z_stream *)); - /*+++++*/ /* infblock.c -- interpret and process block types to last block * Copyright (C) 1995 Mark Adler @@ -737,7 +726,6 @@ local uInt border[] = { /* Order of the bit length code lengths */ the two sets of lengths. */ - local void inflate_blocks_reset(s, z, c) inflate_blocks_statef *s; z_stream *z; @@ -762,7 +750,6 @@ uLongf *c; Trace("inflate: blocks reset\n"); } - local inflate_blocks_statef *inflate_blocks_new(z, c, w) z_stream *z; check_func c; @@ -786,7 +773,6 @@ uInt w; return s; } - local int inflate_blocks(s, z, r) inflate_blocks_statef *s; z_stream *z; @@ -1049,7 +1035,6 @@ int r; } } - local int inflate_blocks_free(s, z, c) inflate_blocks_statef *s; z_stream *z; @@ -1115,7 +1100,6 @@ z_stream *z; return Z_OK; } - /* * At the end of a Deflate-compressed PPP packet, we expect to have seen * a `stored' block type value but not the (zero) length bytes. @@ -1129,7 +1113,6 @@ local int inflate_packet_flush(s) return Z_OK; } - /*+++++*/ /* inftrees.c -- generate Huffman trees for efficient decoding * Copyright (C) 1995 Mark Adler @@ -1142,7 +1125,6 @@ local int inflate_packet_flush(s) #define exop word.what.Exop #define bits word.what.Bits - local int huft_build OF(( uIntf *, /* code lengths in bits */ uInt, /* number of codes */ @@ -1212,7 +1194,6 @@ local uInt cpdext[] = { /* Extra bits for distance codes */ possibly even between compilers. Your mileage may vary. */ - /* If BMAX needs to be larger than 16, then h and x[] should be uLong. */ #define BMAX 15 /* maximum bit length of any code */ #define N_MAX 288 /* maximum number of codes in any set */ @@ -1257,7 +1238,6 @@ z_stream *zs; /* for zalloc function */ int y; /* number of dummy codes added */ uInt z; /* number of entries in current table */ - /* Generate counts for each bit length */ p = c; #define C0 *p++ = 0; @@ -1275,7 +1255,6 @@ z_stream *zs; /* for zalloc function */ return Z_OK; } - /* Find minimum and maximum length, bound *m by those */ l = *m; for (j = 1; j <= BMAX; j++) @@ -1292,7 +1271,6 @@ z_stream *zs; /* for zalloc function */ l = i; *m = l; - /* Adjust last length count to fill out codes, if needed */ for (y = 1 << j; j < i; j++, y <<= 1) if ((y -= c[j]) < 0) @@ -1301,7 +1279,6 @@ z_stream *zs; /* for zalloc function */ return Z_DATA_ERROR; c[i] += y; - /* Generate starting offsets into the value table for each length */ x[1] = j = 0; p = c + 1; xp = x + 2; @@ -1309,7 +1286,6 @@ z_stream *zs; /* for zalloc function */ *xp++ = (j += *p++); } - /* Make a table of values in order of bit lengths */ p = b; i = 0; do { @@ -1317,7 +1293,6 @@ z_stream *zs; /* for zalloc function */ v[x[j]++] = i; } while (++i < n); - /* Generate the Huffman codes and for each, make the table entries */ x[0] = i = 0; /* first Huffman code is zero */ p = v; /* grab values in bit order */ @@ -1418,12 +1393,10 @@ z_stream *zs; /* for zalloc function */ } } - /* Return Z_BUF_ERROR if we were given an incomplete table */ return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK; } - local int inflate_trees_bits(c, bb, tb, z) uIntf *c; /* 19 code lengths */ uIntf *bb; /* bits tree desired/actual depth */ @@ -1444,7 +1417,6 @@ z_stream *z; /* for zfree function */ return r; } - local int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, z) uInt nl; /* number of literal/length codes */ uInt nd; /* number of distance codes */ @@ -1494,7 +1466,6 @@ z_stream *z; /* for zfree function */ return Z_OK; } - /* build fixed tables only once--keep them here */ local int fixed_lock = 0; local int fixed_built = 0; @@ -1506,7 +1477,6 @@ local uInt fixed_bd; local inflate_huft *fixed_tl; local inflate_huft *fixed_td; - local voidpf falloc(q, n, s) voidpf q; /* opaque pointer (not used) */ uInt n; /* number of items */ @@ -1519,7 +1489,6 @@ uInt s; /* size of item */ return (voidpf)(fixed_mem + fixed_left); } - local void ffree(q, p, n) voidpf q; voidpf p; @@ -1529,7 +1498,6 @@ uInt n; if (q) q = p; /* to make some compilers happy */ } - local int inflate_trees_fixed(bl, bd, tl, td) uIntf *bl; /* literal desired/actual bit depth */ uIntf *bd; /* distance desired/actual bit depth */ @@ -1579,7 +1547,6 @@ inflate_huft * FAR *td; /* distance tree result */ return Z_OK; } - local int inflate_trees_free(t, z) inflate_huft *t; /* table to free */ z_stream *z; /* for zfree function */ @@ -1651,7 +1618,6 @@ struct inflate_codes_state { }; - local inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z) uInt bl, bd; inflate_huft *tl, *td; @@ -1672,7 +1638,6 @@ z_stream *z; return c; } - local int inflate_codes(s, z, r) inflate_blocks_statef *s; z_stream *z; @@ -1832,7 +1797,6 @@ int r; } } - local void inflate_codes_free(c, z) inflate_codes_statef *c; z_stream *z; @@ -1913,7 +1877,6 @@ int r; return r; } - /*+++++*/ /* inffast.c -- process literals and length/distance pairs fast * Copyright (C) 1995 Mark Adler @@ -2074,7 +2037,6 @@ z_stream *z; return Z_OK; } - /*+++++*/ /* zutil.c -- target dependent utility functions for the compression library * Copyright (C) 1995 Jean-loup Gailly. @@ -2095,7 +2057,6 @@ char *z_errmsg[] = { "buffer error", /* Z_BUF_ERROR (-5) */ ""}; - /*+++++*/ /* adler32.c -- compute the Adler-32 checksum of a data stream * Copyright (C) 1995 Mark Adler diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h b/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h index 11b040595c..cce54696dc 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h @@ -274,7 +274,6 @@ extern int inflateInit OF((z_stream *strm)); inflate(). */ - extern int inflate OF((z_stream *strm, int flush)); /* Performs one or both of the following actions: @@ -325,7 +324,6 @@ extern int inflate OF((z_stream *strm, int flush)); when Z_FINISH is used. In the Z_DATA_ERROR case, the application may then call inflateSync to look for a good compression block. */ - extern int inflateEnd OF((z_stream *strm)); /* All dynamically allocated data structures for this stream are freed. diff --git a/c/src/lib/libbsp/powerpc/shared/clock/p_clock.c b/c/src/lib/libbsp/powerpc/shared/clock/p_clock.c index fe90a3d01e..c181d398bb 100644 --- a/c/src/lib/libbsp/powerpc/shared/clock/p_clock.c +++ b/c/src/lib/libbsp/powerpc/shared/clock/p_clock.c @@ -24,7 +24,6 @@ static rtems_irq_connect_data clockIrqData = {BSP_DECREMENTER, (rtems_irq_disable)clockOff, (rtems_irq_is_enabled) clockIsOn}; - int BSP_disconnect_clock_handler (void) { return BSP_remove_rtems_irq_handler (&clockIrqData); diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.c b/c/src/lib/libbsp/powerpc/shared/console/console.c index 2a3a1d6c60..510cd6ede5 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/console.c +++ b/c/src/lib/libbsp/powerpc/shared/console/console.c @@ -75,7 +75,6 @@ static TtySTblRec ttyS[]={ }, }; - /*-------------------------------------------------------------------------+ | Console device driver INITIALIZE entry point. +--------------------------------------------------------------------------+ @@ -157,7 +156,6 @@ static int console_first_open(int major, int minor, void *arg) return 0; } - static int console_last_close(int major, int minor, void *arg) { BSP_uart_remove_isr(minor, ttyS[minor].isr); @@ -219,7 +217,6 @@ console_close(rtems_device_major_number major, return res; } /* console_close */ - /*-------------------------------------------------------------------------+ | Console device driver READ entry point. +--------------------------------------------------------------------------+ @@ -234,7 +231,6 @@ console_read(rtems_device_major_number major, return rtems_termios_read (arg); } /* console_read */ - /*-------------------------------------------------------------------------+ | Console device driver WRITE entry point. +--------------------------------------------------------------------------+ @@ -250,8 +246,6 @@ console_write(rtems_device_major_number major, } /* console_write */ - - /* * Handle ioctl request. */ diff --git a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h b/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h index 98441d22de..02dcaae386 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h +++ b/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h @@ -13,7 +13,6 @@ #ifndef __CONSOLE_IO_H #define __CONSOLE_IO_H - typedef enum { CONSOLE_LOG = 1, CONSOLE_SERIAL = 2, @@ -38,5 +37,4 @@ extern int debug_getc(void); extern int debug_tstc(void); int kbdreset(void); - #endif diff --git a/c/src/lib/libbsp/powerpc/shared/console/inch.c b/c/src/lib/libbsp/powerpc/shared/console/inch.c index 4b30a22978..42c3cc7df7 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/inch.c +++ b/c/src/lib/libbsp/powerpc/shared/console/inch.c @@ -209,7 +209,6 @@ void _IBMPC_keyboard_isr() } } /* _IBMPC_keyboard_isr */ - /*-------------------------------------------------------------------------+ | Function: _IBMPC_chrdy | Description: Check keyboard ISR buffer and return character if not empty. @@ -233,7 +232,6 @@ _IBMPC_chrdy(char *c) return FALSE; } /* _IBMPC_chrdy */ - /*-------------------------------------------------------------------------+ | Function: _IBMPC_inch | Description: Poll keyboard until a character is ready and return it. @@ -251,7 +249,6 @@ _IBMPC_inch(void) return c; } /* _IBMPC_inch */ - /* * Routine that can be used before interrupt management is initialized. */ diff --git a/c/src/lib/libbsp/powerpc/shared/console/keyboard.h b/c/src/lib/libbsp/powerpc/shared/console/keyboard.h index 72643617fb..4e7e272d80 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/keyboard.h +++ b/c/src/lib/libbsp/powerpc/shared/console/keyboard.h @@ -308,7 +308,6 @@ #define K_F245 K(KT_FN,254) #define K_UNDO K(KT_FN,255) - #define K_HOLE K(KT_SPEC,0) #define K_ENTER K(KT_SPEC,1) #define K_SH_REGS K(KT_SPEC,2) diff --git a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c index 7172e8d222..9d7985be7f 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/polled_io.c +++ b/c/src/lib/libbsp/powerpc/shared/console/polled_io.c @@ -316,9 +316,6 @@ struct kbdiacr accent_table[MAX_DIACR] = { unsigned int accent_table_size = 68; - - - /* These #defines have been copied from drivers/char/pc_keyb.h, by * Martin Mares (mj@ucw.cz). * converted to offsets by Till Straumann <strauman@slac.stanford.edu> @@ -384,7 +381,6 @@ SPR_RO(PVR) #endif /* USE_KBD_SUPPORT */ - /* Early messages after mm init but before console init are kept in log * buffers. */ @@ -411,7 +407,6 @@ static board_memory_map mem_map = { board_memory_map *ptr_mem_map = &mem_map; - struct _console_global_data { console_log *log; int vacuum_sent; @@ -494,7 +489,6 @@ int vacuum_tstc(void) { #define LSR_TEMT 0x40 /* Xmitter empty */ #define LSR_ERR 0x80 /* Error */ - #ifdef STATIC_LOG_ALLOC static int global_index = 0; @@ -510,7 +504,6 @@ static void pfree(void* p) } #endif - void log_putc(const u_char c) { console_log *l; for(l=console_global_data.log; l; l=l->next) { @@ -544,7 +537,6 @@ void puts(const u_char *s) } } - static void flush_log(void) { console_log *p, *next; @@ -884,7 +876,6 @@ int select_console(ioType t) { /* we use this so that we can do without the ctype library */ #define is_digit(c) ((c) >= '0' && (c) <= '9') - /* provide this for the bootloader only; otherwise * use libcpu implementation */ diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.c b/c/src/lib/libbsp/powerpc/shared/console/uart.c index 7fb5597873..2532bef720 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/uart.c +++ b/c/src/lib/libbsp/powerpc/shared/console/uart.c @@ -167,7 +167,6 @@ BSP_uart_init(int uart, int baud, int hwFlow) /* 8-bit, no parity , 1 stop */ uwrite(uart, LCR, CHR_8_BITS); - /* Set DTR, RTS and OUT2 high */ uwrite(uart, MCR, DTR | RTS | OUT_2); @@ -374,7 +373,6 @@ BSP_uart_polled_status(int uart) return BSP_UART_STATUS_ERROR; } - /* * Polled mode write function */ @@ -489,7 +487,6 @@ BSP_uart_remove_isr(int uart, rtems_irq_hdl handler) return doit(uart, handler, BSP_remove_rtems_irq_handler); } - /* ================ Termios support =================*/ static volatile int termios_stopped_com[2] = {0,0}; @@ -539,7 +536,6 @@ BSP_uart_termios_write_com(int minor, const char *buf, int len) /* If there TX buffer is busy - something is royally screwed up */ /* assert((uread(BSP_UART_COM1, LSR) & THRE) != 0); */ - if(termios_stopped_com[uart]) { /* CTS low */ diff --git a/c/src/lib/libbsp/powerpc/shared/include/bsp.h b/c/src/lib/libbsp/powerpc/shared/include/bsp.h index fb79919160..c2abd385a5 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/shared/include/bsp.h @@ -52,7 +52,6 @@ #include <bsp/openpic.h> #define BSP_PIC_DO_EOI openpic_eoi(0) - #ifndef ASM #define outport_byte(port,value) outb(value,port) #define outport_word(port,value) outw(value,port) @@ -105,7 +104,6 @@ extern int BSP_connect_clock_handler (void); */ extern unsigned long _BSP_clear_hostbridge_errors(int enableMCP, int quiet); - /* * TM27 stuff */ @@ -137,7 +135,6 @@ void Install_tm27_vector(void (*_handler)()) asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) - #define Clear_tm27_intr() \ do { \ uint32_t _clicks = 0xffffffff; \ @@ -154,7 +151,6 @@ void Install_tm27_vector(void (*_handler)()) } while (0) #endif - #endif #endif diff --git a/c/src/lib/libbsp/powerpc/shared/include/nvram.h b/c/src/lib/libbsp/powerpc/shared/include/nvram.h index 3f6f77988a..a822382e51 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/nvram.h +++ b/c/src/lib/libbsp/powerpc/shared/include/nvram.h @@ -13,7 +13,6 @@ #define NVRAM_AS1 0x75 #define NVRAM_DATA 0x77 - /* RTC Offsets */ #define MOTO_RTC_SECONDS 0x1FF9 diff --git a/c/src/lib/libbsp/powerpc/shared/irq/i8259.c b/c/src/lib/libbsp/powerpc/shared/irq/i8259.c index 806a7eb19b..a5090cd18f 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/i8259.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/i8259.c @@ -107,7 +107,6 @@ int BSP_irq_enabled_at_i8259s (const rtems_irq_symbolic_name irqLine) return (~(i8259s_cache & mask)); } - /*-------------------------------------------------------------------------+ | Function: BSP_irq_ack_at_i8259s | Description: Signal generic End Of Interrupt (EOI) to appropriate PIC. diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.c b/c/src/lib/libbsp/powerpc/shared/irq/irq.c index 356c7921f9..7cdd46b13f 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.c @@ -76,7 +76,6 @@ static inline int is_processor_irq(const rtems_irq_symbolic_name irqLine) ); } - /* * ------------------------ RTEMS Irq helper functions ---------------- */ @@ -118,7 +117,6 @@ static int isValidInterrupt(int irq) return 1; } - /* * ------------------------ RTEMS Shared Irq Handler Mngt Routines ---------------- */ @@ -153,7 +151,6 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq) /* link chain to new topmost handler */ rtems_hdl_tbl[irq->name].next_handler = (void *)vchain; - if (is_isa_irq(irq->name)) { /* * Enable interrupt at PIC level @@ -183,7 +180,6 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq) return 1; } - /* * ------------------------ RTEMS Single Irq Handler Mngt Routines ---------------- */ @@ -245,7 +241,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) { unsigned int level; @@ -517,7 +512,6 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) register unsigned msr; register unsigned new_msr; - if (excNum == ASM_DEC_VECTOR) { _CPU_MSR_GET(msr); new_msr = msr | MSR_EE; @@ -566,7 +560,6 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) } } - _CPU_MSR_SET(msr); if (isaIntr) { @@ -586,8 +579,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/shared/irq/irq.h b/c/src/lib/libbsp/powerpc/shared/irq/irq.h index f2457d36e5..c9b38606a2 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq.h +++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.h @@ -21,7 +21,6 @@ #ifndef LIBBSP_POWERPC_MCP750_IRQ_IRQ_H #define LIBBSP_POWERPC_MCP750_IRQ_IRQ_H - /* * 8259 edge/level control definitions at VIA */ @@ -63,7 +62,6 @@ extern "C" { #endif - /* * Symblolic IRQ names and related definitions. */ @@ -128,9 +126,6 @@ typedef enum { }rtems_irq_symbolic_name; - - - /* * Type definition for RTEMS managed interrupts */ @@ -213,9 +208,6 @@ typedef struct { rtems_irq_prio* irqPrioTbl; }rtems_irq_global_settings; - - - /*-------------------------------------------------------------------------+ | Function Prototypes. +--------------------------------------------------------------------------*/ diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S index 7eb018d606..dbdfc964c8 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S +++ b/c/src/lib/libbsp/powerpc/shared/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/shared/motorola/motorola.c b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c index f30cfc5d2d..c196228776 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c +++ b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c @@ -12,13 +12,11 @@ * $Id$ */ - #include <bsp/motorola.h> #include <rtems/bspIo.h> #include <libcpu/io.h> #include <string.h> - /* ** Board-specific table that maps interrupt names to onboard pci ** peripherals as well as local pci busses. This table is used at @@ -67,8 +65,6 @@ #define NULL_PINMAP {-1,{-1,-1,-1,-1}} #define NULL_INTMAP {-1,-1,-1,{}} - - static struct _int_map mcp750_intmap[] = { { 0, 16, 0, {{1, {5, 19,-1,-1}}, /* pmc slot */ @@ -85,9 +81,6 @@ static struct _int_map mcp750_intmap[] = { NULL_INTMAP }; - - - static struct _int_map mtx603_intmap[] = { {0, 14, 0, {{1, {10,16,-1,-1}}, /* onboard ethernet */ @@ -116,13 +109,6 @@ static struct _int_map mtx603_intmap[] = { NULL_INTMAP }; - - - - - - - /* * This table represents the standard PCI swizzle defined in the * PCI bus specification. Table taken from Linux 2.4.18, prep_pci.c, @@ -141,14 +127,6 @@ static int prep_pci_swizzle(int slot, int pin) return prep_pci_intpins[ slot % 4 ][ pin-1 ]; } - - - - - - - - typedef struct { /* * 0x100 mask assumes for Raven and Hawk boards @@ -163,7 +141,6 @@ typedef struct { int (*swizzler)(int, int); } mot_info_t; - static const mot_info_t mot_boards[] = { {0x300, 0x00, "MVME 2400", NULL, NULL}, {0x010, 0x00, "Genesis", NULL, NULL}, @@ -188,8 +165,6 @@ static const mot_info_t mot_boards[] = { {0x000, 0x00, ""} }; - - prep_t currentPrepType; motorolaBoard currentBoard; prep_t checkPrepBoardType(RESIDUAL *res) @@ -250,21 +225,18 @@ motorolaBoard getMotorolaBoard() return currentBoard; } - const char* motorolaBoardToString(motorolaBoard board) { if (board == MOTOROLA_UNKNOWN) return "Unknown motorola board"; return (mot_boards[board].name); } - const struct _int_map *motorolaIntMap(motorolaBoard board) { if (board == MOTOROLA_UNKNOWN) return NULL; return mot_boards[board].intmap; } - const void *motorolaIntSwizzle(motorolaBoard board) { if (board == MOTOROLA_UNKNOWN) return NULL; diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h index 11d3fff4c4..f690f9ea24 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h +++ b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h @@ -18,13 +18,6 @@ #include <bsp/residual.h> #include <bsp/pci.h> - - - - - - - typedef enum { PREP_IBM = 0, PREP_Radstone = 1, @@ -72,5 +65,4 @@ extern const char* motorolaBoardToString(motorolaBoard); extern const struct _int_map *motorolaIntMap(motorolaBoard board); extern const void *motorolaIntSwizzle(motorolaBoard board); - #endif /* LIBBSP_POWERPC_SHARED_MOTOROLA_MOTOROLA_H */ diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c index 0a619ba1c2..b7aa4777ce 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c +++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c @@ -34,13 +34,11 @@ #define REGISTER_DEBUG #undef REGISTER_DEBUG - volatile struct OpenPIC *OpenPIC = NULL; static unsigned int NumProcessors; static unsigned int NumSources; - /* * Accesses to the current processor's registers */ @@ -48,7 +46,6 @@ static unsigned int NumSources; #define THIS_CPU Processor[cpu] #define CHECK_THIS_CPU check_arg_cpu(cpu) - /* * Sanity checks */ @@ -84,8 +81,6 @@ static unsigned int NumSources; #define check_arg_cpu(cpu) do {} while (0) #endif - - /* * I/O functions */ @@ -109,7 +104,6 @@ static inline void openpic_write(volatile unsigned int *addr, unsigned int val) out_le32(addr, val); } - static inline unsigned int openpic_readfield(volatile unsigned int *addr, unsigned int mask) { unsigned int val = openpic_read(addr); @@ -133,7 +127,6 @@ static inline void openpic_setfield(volatile unsigned int *addr, unsigned int ma openpic_writefield(addr, mask, mask); } - /* * Update a Vector/Priority register in a safe manner. The interrupt will * be disabled. @@ -148,10 +141,8 @@ static void openpic_safe_writefield(volatile unsigned int *addr, unsigned int ma openpic_writefield(addr, mask | OPENPIC_MASK, field | OPENPIC_MASK); } - /* -------- Global Operations ---------------------------------------------- */ - /* * Initialize the OpenPIC * @@ -272,7 +263,6 @@ void openpic_init(int main_pic, unsigned char *polarities, unsigned char *senses } } - /* * Reset the OpenPIC */ @@ -283,7 +273,6 @@ void openpic_reset(void) OPENPIC_CONFIG_RESET); } - /* * Enable/disable 8259 Pass Through Mode */ @@ -300,7 +289,6 @@ void openpic_disable_8259_pass_through(void) OPENPIC_CONFIG_8259_PASSTHROUGH_DISABLE); } - /* * Find out the current interrupt */ @@ -315,7 +303,6 @@ unsigned int openpic_irq(unsigned int cpu) return vec; } - /* * Signal end of interrupt (EOI) processing */ @@ -326,7 +313,6 @@ void openpic_eoi(unsigned int cpu) openpic_write(&OpenPIC->THIS_CPU.EOI, 0); } - /* * Get/set the current task priority */ @@ -363,7 +349,6 @@ void openpic_set_spurious(unsigned int vec) vec); } - /* * Initialize one or more CPUs */ @@ -373,10 +358,8 @@ void openpic_init_processor(unsigned int cpumask) openpic_write(&OpenPIC->Global.Processor_Initialization, cpumask); } - /* -------- Interprocessor Interrupts -------------------------------------- */ - /* * Initialize an interprocessor interrupt (and disable it) * @@ -395,7 +378,6 @@ void openpic_initipi(unsigned int ipi, unsigned int pri, unsigned int vec) (pri << OPENPIC_PRIORITY_SHIFT) | vec); } - /* * Send an IPI to one or more CPUs */ @@ -407,10 +389,8 @@ void openpic_cause_IPI(unsigned int cpu, unsigned int ipi, unsigned int cpumask) openpic_write(&OpenPIC->THIS_CPU.IPI_Dispatch(ipi), cpumask); } - /* -------- Timer Interrupts ----------------------------------------------- */ - /* * Initialize a timer interrupt (and disable it) * @@ -429,7 +409,6 @@ void openpic_inittimer(unsigned int timer, unsigned int pri, unsigned int vec) (pri << OPENPIC_PRIORITY_SHIFT) | vec); } - /* * Map a timer interrupt to one or more CPUs */ @@ -440,10 +419,8 @@ void openpic_maptimer(unsigned int timer, unsigned int cpumask) openpic_write(&OpenPIC->Global.Timer[timer].Destination, cpumask); } - /* -------- Interrupt Sources ---------------------------------------------- */ - /* * Enable/disable an interrupt source */ @@ -466,7 +443,6 @@ unsigned long flags; rtems_interrupt_enable(flags); } - /* * Initialize an interrupt source (and disable it!) * @@ -490,7 +466,6 @@ void openpic_initirq(unsigned int irq, unsigned int pri, unsigned int vec, int p (sense ? OPENPIC_SENSE_LEVEL : 0)); } - /* * Map an interrupt source to one or more CPUs */ diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h index e6b83138db..776b5ec723 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h +++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h @@ -37,7 +37,6 @@ #ifndef _RTEMS_OPENPIC_H #define _RTEMS_OPENPIC_H - /* * OpenPIC supports up to 2048 interrupt sources and up to 32 processors */ @@ -50,7 +49,6 @@ #define OPENPIC_NUM_PRI 16 #define OPENPIC_NUM_VECTORS 256 - /* * Vector numbers */ @@ -60,7 +58,6 @@ #define OPENPIC_VEC_IPI 0x50 /* and up */ #define OPENPIC_VEC_SPURIOUS 99 - /* * OpenPIC Registers are 32 bits and aligned on 128 bit boundaries */ @@ -70,7 +67,6 @@ typedef struct _OpenPIC_Reg { char Pad[0xc]; } OpenPIC_Reg; - /* * Per Processor Registers */ @@ -103,7 +99,6 @@ typedef struct _OpenPIC_Processor { char Pad5[0xf40]; } OpenPIC_Processor; - /* * Timer Registers */ @@ -115,7 +110,6 @@ typedef struct _OpenPIC_Timer { OpenPIC_Reg _Destination; /* Read/Write */ } OpenPIC_Timer; - /* * Global Registers */ @@ -159,7 +153,6 @@ typedef struct _OpenPIC_Global { char Pad1[0xee00]; } OpenPIC_Global; - /* * Interrupt Source Registers */ @@ -169,7 +162,6 @@ typedef struct _OpenPIC_Source { OpenPIC_Reg _Destination; /* Read/Write */ } OpenPIC_Source; - /* * OpenPIC Register Map */ @@ -192,7 +184,6 @@ struct OpenPIC { extern volatile struct OpenPIC *OpenPIC; - /* * Current Task Priority Register */ @@ -243,7 +234,6 @@ extern volatile struct OpenPIC *OpenPIC; #define OPENPIC_PRIORITY_SHIFT 16 #define OPENPIC_VECTOR_MASK 0x000000ff - /* * Interrupt Source Registers */ @@ -251,7 +241,6 @@ extern volatile struct OpenPIC *OpenPIC; #define OPENPIC_SENSE_POLARITY 0x00800000 /* Undoc'd */ #define OPENPIC_SENSE_LEVEL 0x00400000 - /* * Timer Registers */ @@ -260,7 +249,6 @@ extern volatile struct OpenPIC *OpenPIC; #define OPENPIC_TIMER_TOGGLE 0x80000000 #define OPENPIC_TIMER_COUNT_INHIBIT 0x80000000 - /* * Aliases to make life simpler */ @@ -293,7 +281,6 @@ extern volatile struct OpenPIC *OpenPIC; #define Vector_Priority _Vector_Priority.Reg #define Destination _Destination.Reg - /* * Vendor and Device IDs */ @@ -301,7 +288,6 @@ extern volatile struct OpenPIC *OpenPIC; #define OPENPIC_VENDOR_ID_APPLE 0x14 #define OPENPIC_DEVICE_ID_APPLE_HYDRA 0x46 - /* * OpenPIC Operations */ diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.c b/c/src/lib/libbsp/powerpc/shared/pci/pci.c index ba5a97d44d..b822100f3d 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/pci/pci.c @@ -216,22 +216,9 @@ const pci_config_access_functions pci_direct_functions = { direct_pci_write_config_dword }; - - - - - - - - - - - - #define PRINT_MSG() \ printk("pci : Device %d:%02x routed to interrupt_line %d\n", pbus, pslot, int_name ) - /* ** Validate a test interrupt name and print a warning if its not one of ** the names defined in the routing record. @@ -269,16 +256,11 @@ static int test_intname( return 0; } - - - - struct pcibridge { int bus,slot; }; - static int FindPCIbridge( int mybus, struct pcibridge *pb ) { int pbus, pslot; @@ -321,19 +303,11 @@ static int FindPCIbridge( int mybus, struct pcibridge *pb ) #endif } - } } return -1; } - - - - - - - void FixupPCI( const struct _int_map *bspmap, int (*swizzler)(int,int) ) { unsigned char cvalue; @@ -406,7 +380,6 @@ void FixupPCI( const struct _int_map *bspmap, int (*swizzler)(int,int) ) } } - if( !ismatch ) { /* @@ -444,7 +417,6 @@ void FixupPCI( const struct _int_map *bspmap, int (*swizzler)(int,int) ) */ if( tbus ) int_pin = (*swizzler)(tslot,int_pin); - /* ** int_pin points to the interrupt channel ** this card ends up delivering interrupts @@ -476,7 +448,6 @@ void FixupPCI( const struct _int_map *bspmap, int (*swizzler)(int,int) ) } } - if( !ismatch ) { struct pcibridge pb; @@ -511,27 +482,16 @@ void FixupPCI( const struct _int_map *bspmap, int (*swizzler)(int,int) ) } donesearch: - if( !ismatch && int_pin != 0 && int_name == 255 ) { printk("pci : Unable to match device %d:%d with an int routing table entry\n", pbus, pslot ); } - } } } } - - - - - - - - - /* * This routine determines the maximum bus number in the system */ diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.h b/c/src/lib/libbsp/powerpc/shared/pci/pci.h index 4ce74f7307..3385dac78e 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pci.h +++ b/c/src/lib/libbsp/powerpc/shared/pci/pci.h @@ -1153,7 +1153,6 @@ pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char func extern unsigned char BusCountPCI(); extern void InitializePCI(); - struct _pin_routes { int pin, int_name[4]; @@ -1166,7 +1165,6 @@ struct _int_map void FixupPCI( const struct _int_map *, int (*swizzler)(int,int) ); - /* scan for a specific device */ /* find a particular PCI device * (currently, only bus0 is scanned for device/fun0) diff --git a/c/src/lib/libbsp/powerpc/shared/residual/residual.c b/c/src/lib/libbsp/powerpc/shared/residual/residual.c index 7d5b1a4aa8..4d5ce41640 100644 --- a/c/src/lib/libbsp/powerpc/shared/residual/residual.c +++ b/c/src/lib/libbsp/powerpc/shared/residual/residual.c @@ -19,7 +19,6 @@ #include <libcpu/io.h> #include <libcpu/byteorder.h> - static int same_DevID(unsigned short vendor, unsigned short Number, char * str) diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S index 8c90a442f0..cf88c54903 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/start.S +++ b/c/src/lib/libbsp/powerpc/shared/start/start.S @@ -28,7 +28,6 @@ li r10,0x63 ; \ sc - .text .globl __rtems_entry_point .type __rtems_entry_point,@function @@ -146,7 +145,6 @@ MMUoff: .globl _return_to_ppcbug .type _return_to_ppcbug,@function - _return_to_ppcbug: mflr r30 bl MMUoff @@ -198,5 +196,4 @@ flush_tlbs: sync blr - .comm environ,4,4 diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c index 82ade603ef..319a37b15b 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c @@ -149,7 +149,6 @@ void bsp_pretasking_hook(void) bsp_libc_init((void *) 0, heap_size, heap_sbrk_spared); - #ifdef RTEMS_DEBUG rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); #endif @@ -319,7 +318,6 @@ void bsp_start( void ) printk("pci : Interrupt routing not available for this bsp\n"); } - #ifdef SHOW_MORE_INIT_SETTINGS printk("Number of PCI buses found is : %d\n", BusCountPCI()); #endif @@ -336,7 +334,6 @@ void bsp_start( void ) __asm__ __volatile ("sc"); #endif - BSP_mem_size = residualCopy.TotalMemory; BSP_bus_frequency = residualCopy.VitalProductData.ProcessorBusHz; BSP_processor_frequency = residualCopy.VitalProductData.ProcessorHz; @@ -348,7 +345,6 @@ void bsp_start( void ) */ _BSP_clear_hostbridge_errors(0 /* enableMCP */, 0/*quiet*/); - /* Allocate and set up the page table mappings * This is only available on >604 CPUs. * @@ -401,7 +397,6 @@ void bsp_start( void ) */ BSP_rtems_irq_mng_init(0); - /* Activate the page table mappings only after * initializing interrupts because the irq_mng_init() * routine needs to modify the text diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c index 7f957bfc48..67cfe3ad9d 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c @@ -6,7 +6,6 @@ #include <rtems/bspIo.h> #include <libcpu/pte121.h> - /* Default setup of the page tables. This is a weak * alias, so applications may easily override this * default setup. @@ -24,7 +23,6 @@ Triv121PgTbl BSP_pgtbl_setup(unsigned long) __attribute__ (( weak, alias("__BSP_default_pgtbl_setup") )); - Triv121PgTbl __BSP_default_pgtbl_setup(unsigned int *pmemsize) { diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S index 55f990ec33..8d5c76521d 100644 --- a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S +++ b/c/src/lib/libbsp/powerpc/shared/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/shared/vectors/vectors.h b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.h index 976af3d7f4..4e5ce04d41 100644 --- a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.h +++ b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.h @@ -135,7 +135,6 @@ typedef struct { unsigned EXC_DAR; }BSP_Exception_frame; - typedef void (*exception_handler_t) (BSP_Exception_frame* excPtr); extern exception_handler_t globalExceptHdl; /* diff --git a/c/src/lib/libbsp/powerpc/ss555/console/console.c b/c/src/lib/libbsp/powerpc/ss555/console/console.c index fdfbf88a73..64d4503fee 100644 --- a/c/src/lib/libbsp/powerpc/ss555/console/console.c +++ b/c/src/lib/libbsp/powerpc/ss555/console/console.c @@ -84,7 +84,6 @@ static void _BSP_null_char( char c ) {return;} BSP_output_char_function_type BSP_output_char = _BSP_null_char; - /* * do_poll_read * @@ -126,7 +125,6 @@ static rtems_status_code do_poll_read( return RTEMS_SUCCESSFUL; } - /* * do_poll_write * @@ -168,7 +166,6 @@ static rtems_status_code do_poll_write( return RTEMS_SUCCESSFUL; } - /* * Print functions prototyped in bspIo.h */ @@ -187,7 +184,6 @@ static void _BSP_output_char( char c ) m5xx_uart_pollWrite( PRINTK_MINOR, &cr, 1 ); } - /* *************** * BOILERPLATE * @@ -237,7 +233,6 @@ rtems_device_driver console_initialize( return RTEMS_SUCCESSFUL; } - /* * Open the device */ @@ -296,7 +291,6 @@ rtems_device_driver console_open( return sc; } - /* * Close the device */ @@ -316,7 +310,6 @@ rtems_device_driver console_close( #endif } - /* * Read from the device */ @@ -336,7 +329,6 @@ rtems_device_driver console_read( #endif } - /* * Write to the device */ @@ -356,7 +348,6 @@ rtems_device_driver console_write( #endif } - /* * Handle ioctl request. */ diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c index 626b510732..95df3b3e25 100644 --- a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c @@ -35,7 +35,6 @@ #include <bsp/irq.h> #include <bsp.h> - SPR_RW(SPRG0) SPR_RW(SPRG1) @@ -117,7 +116,6 @@ void bsp_pretasking_hook(void) #endif } - /* * bsp_start() * diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c b/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c index 133fad3b2d..66e851cc1b 100644 --- a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c +++ b/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c @@ -26,7 +26,6 @@ SPR_RW(MI_GRA); SPR_RW(L2U_GRA); SPR_RW(BBCMCR); - /* * Initialize SS555 */ diff --git a/c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu.c b/c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu.c index 660747d5b8..27f7282143 100644 --- a/c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu.c +++ b/c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu.c @@ -34,7 +34,6 @@ #include <rtems/score/thread.h> #include <rtems/score/interr.h> - /* _CPU_Initialize * * This routine performs processor dependent initialization. @@ -140,8 +139,6 @@ void _CPU_Context_Initialize( #endif } - - /*PAGE * * _CPU_Install_interrupt_stack diff --git a/c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu_asm.S b/c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu_asm.S index 74845982b2..b121b1c0c8 100644 --- a/c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu_asm.S +++ b/c/src/lib/libbsp/powerpc/support/new_exception_processing/cpu_asm.S @@ -253,7 +253,6 @@ PROC (_CPU_Context_restore_fp): #endif blr - /* _CPU_Context_switch * * This routine performs a normal non-FP context switch. diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c index 11ddae9bf6..702506251c 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.c @@ -302,7 +302,6 @@ void _CPU_Context_Initialize( #endif } - /* _CPU_ISR_install_vector * * This kernel routine installs the RTEMS handler for the @@ -410,7 +409,6 @@ void _CPU_Fatal_error(uint32_t _error) #define PPC_SYNCHRONOUS_TRAP ( _trap ) ((_trap)+PPC_SYNCHRONOUS_TRAP_BIT_MASK) #define PPC_REAL_TRAP_NUMBER ( _trap ) ((_trap)%PPC_SYNCHRONOUS_TRAP_BIT_MASK) - const CPU_Trap_table_entry _CPU_Trap_slot_template = { #if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) @@ -444,7 +442,6 @@ uint32_t ppc_exception_vector_addr( uint32_t vector ); - /*PAGE * * _CPU_ISR_install_raw_handler diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu_asm.S b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu_asm.S index cd35eb02af..7b578bafca 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu_asm.S +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu_asm.S @@ -224,7 +224,6 @@ PROC (_CPU_Context_restore_fp): #endif blr - /* _CPU_Context_switch * * This routine performs a normal non-FP context switch. diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/ppccache.c b/c/src/lib/libbsp/powerpc/support/old_exception_processing/ppccache.c index 622adc58a3..d2b6be2e15 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/ppccache.c +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/ppccache.c @@ -28,7 +28,6 @@ ); \ } while (0) - void powerpc_instruction_cache_enable () { uint32_t value; |