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/m68k | |
| parent | Remove stray white spaces. (diff) | |
| download | rtems-f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c.tar.bz2 | |
Remove duplicate white lines.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
70 files changed, 3 insertions, 305 deletions
diff --git a/c/src/lib/libbsp/m68k/dmv152/configure.ac b/c/src/lib/libbsp/m68k/dmv152/configure.ac index f15b64dc4e..9dc8c80b77 100644 --- a/c/src/lib/libbsp/m68k/dmv152/configure.ac +++ b/c/src/lib/libbsp/m68k/dmv152/configure.ac @@ -23,7 +23,6 @@ RTEMS_BSPOPTS_SET([USE_CHANNEL_B],[*],[0]) RTEMS_BSPOPTS_HELP([USE_CHANNEL_B], [set to 1 to indicate this serial port to be used as RTEMS_CONSOLE]) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/m68k/dmv152/console/console.c b/c/src/lib/libbsp/m68k/dmv152/console/console.c index 78ceca83c1..e9f708d2b2 100644 --- a/c/src/lib/libbsp/m68k/dmv152/console/console.c +++ b/c/src/lib/libbsp/m68k/dmv152/console/console.c @@ -111,7 +111,6 @@ void DEBUG_puts( /* should enable interrupts here */ } - /* * Console Termios Support Entry Points * diff --git a/c/src/lib/libbsp/m68k/dmv152/timer/timer.c b/c/src/lib/libbsp/m68k/dmv152/timer/timer.c index a16c37a0ae..cc315e670d 100644 --- a/c/src/lib/libbsp/m68k/dmv152/timer/timer.c +++ b/c/src/lib/libbsp/m68k/dmv152/timer/timer.c @@ -17,7 +17,6 @@ * $Id$ */ - #include <rtems.h> #include <bsp.h> diff --git a/c/src/lib/libbsp/m68k/gen68302/console/console.c b/c/src/lib/libbsp/m68k/gen68302/console/console.c index 84363fb735..8e98d42ec2 100644 --- a/c/src/lib/libbsp/m68k/gen68302/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68302/console/console.c @@ -122,7 +122,6 @@ rtems_boolean is_character_ready( } } - /* inbyte * * Receive a character from the MC68302's SCC2. @@ -155,7 +154,6 @@ char inbyte( void ) return ch; } - /* outbyte * * Transmit a character out on the MC68302's SCC2. diff --git a/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h b/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h index 0bbe9515bc..3c7f91c90a 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h +++ b/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h @@ -43,7 +43,6 @@ #define EDMA_BLIM_MASK 0x0007 #define EDMA_BLIM_8ACCESS 0x0003 - /* Ethernet Maximum Receive Buffer Length EMRBLR */ #define EMRBLR_MASK 0x07FFE @@ -104,7 +103,6 @@ #define AR_CNTRL_MULTI_MASK (AR_CNTRL_BIT_MULTI0 | AR_CNTRL_BIT_MULTI1) - /* Ethernet buffer Status TX */ #define BUF_STAT_CARRIER_LOST 0x0001 #define BUF_STAT_UNDERRUN 0x0002 @@ -120,7 +118,6 @@ #define BUF_STAT_TO 0x4000 #define BUF_STAT_READY 0x8000 - /* Ethernet buffer Status RX */ #define BUF_STAT_COLLISION 0x0001 #define BUF_STAT_OVERRUN 0x0002 @@ -280,8 +277,6 @@ struct m68302_imp { uchar reserved_3[0x74A]; - - /****************** 68 EN 302 specific registers **********************/ /** only available here if M68302_INTERNAL_RAM_BASE_ADD+0x1000=M68EN302_INTERNAL_RAM_BASE_ADD*/ @@ -303,7 +298,6 @@ struct m68302_imp { uchar dram_reserved[0x7E8]; - /* Ethernet Controller Registers */ ushort ecntrl; /* Ethernet Control Register */ @@ -387,7 +381,6 @@ struct m68302_imp { #define M68302imp_sccm(i) (M68302imp_ scc_regs[i].sccm) #define M68302imp_sccs(i) (M68302imp_ scc_regs[i].sccs) - /*----------------------------------------------------------------------------*/ #define M68en302imp_mbc (M68302imp_ mbc) @@ -399,7 +392,6 @@ struct m68302_imp { #define M68en302imp_drfrsh (M68302imp_ drfrsh) #define M68en302imp_dba(i) (M68302imp_ dba[i]) - #define M68en302imp_ecntrl (M68302imp_ ecntrl) #define M68en302imp_edma (M68302imp_ edma) #define M68en302imp_emrblr (M68302imp_ emrblr) @@ -517,7 +509,6 @@ struct m68302_imp { #define M68302_CS_WRITE_ONLY 0x22 /* write only memory access */ #define M68302_CS_READ_AND_WRITE 0x00 /* read and write memory access */ - #define M68302_cs_install(cs_nb,base_add,range,nb_wait_state,read_write) \ do { \ M68302imp_cs_option(cs_nb) = (((~(range - 1)) >> 11) & 0x1FFC) | \ diff --git a/c/src/lib/libbsp/m68k/gen68302/network/network.c b/c/src/lib/libbsp/m68k/gen68302/network/network.c index b1d47be756..41614f0fc8 100644 --- a/c/src/lib/libbsp/m68k/gen68302/network/network.c +++ b/c/src/lib/libbsp/m68k/gen68302/network/network.c @@ -158,15 +158,12 @@ m302Enet_initialize_hardware (struct scc_softc *sc) #define DSQE 0x0010 #define FDE 0x0020 - - /* * standard loopback */ M68302imp_port_data (1) &= ~(LBK); M68302imp_port_data (1) |= (FDE); - M68en302imp_ecntrl=0x0001; /* * Set dma configuration status register EDMA @@ -189,7 +186,6 @@ m302Enet_initialize_hardware (struct scc_softc *sc) */ M68en302imp_intr_vect = M302_ETHER_IVECTOR; - M68en302imp_intr_mask=0x0; /* @@ -232,13 +228,11 @@ m302Enet_initialize_hardware (struct scc_softc *sc) cam[5] = (hwaddr[2] << 8) | hwaddr[3]; cam[6] = (hwaddr[4] << 8) | hwaddr[5]; - /* * Set receiver and transmitter buffer descriptor bases */ a_bd = M68302imp_a_eth_bd (0); /* point to first BD */ - for (i=0;i<128;i++){ M68302_scc_bd_stat_ctrl (a_bd + i) = 0; @@ -246,7 +240,6 @@ m302Enet_initialize_hardware (struct scc_softc *sc) M68302_scc_bd_p_buffer (a_bd + i) = NULL; } - sc->txBdBase = M68302imp_a_eth_bd ( 0 ); /* point to first BD */ sc->rxBdBase = M68302imp_a_eth_bd ( sc->txBdCount); /* point to first RX BD atfer all TX*/ @@ -306,7 +299,6 @@ m302Enet_retire_tx_bd (struct scc_softc *sc) BUF_STAT_UNDERRUN)) { int j; - if (status & BUF_STAT_LATE_COLLISION) sc->txLateCollision++; if (status & BUF_STAT_RETRY_LIMIT) @@ -403,7 +395,6 @@ scc_rxDaemon (void *arg) sc->rxMbuf[rxBdIndex] = m; rxBd->p_buffer = mtod (m, void *); - if (++rxBdIndex == sc->rxBdCount) { rxBd->stat_ctrl = BUF_STAT_EMPTY | BUF_STAT_INTERRUPT | BUF_STAT_WRAP; break; @@ -452,7 +443,6 @@ scc_rxDaemon (void *arg) } } - /* * Check that packet is valid */ @@ -777,7 +767,6 @@ scc_init (void *arg) */ m302Enet_initialize_hardware (sc); - sc->txDaemonTid = rtems_bsdnet_newproc ("SCtx", 4096, scc_txDaemon, sc); sc->rxDaemonTid = rtems_bsdnet_newproc ("SCrx", 4096, scc_rxDaemon, sc); @@ -821,7 +810,6 @@ scc_stop (struct scc_softc *sc) } - /* * Show interface statistics */ @@ -903,7 +891,6 @@ scc_ioctl (struct ifnet *ifp, int command, caddr_t data) } - /* * Attach an SCC driver to the system */ diff --git a/c/src/lib/libbsp/m68k/gen68302/start/start.S b/c/src/lib/libbsp/m68k/gen68302/start/start.S index c6ade9af55..8c2a6fe6bc 100644 --- a/c/src/lib/libbsp/m68k/gen68302/start/start.S +++ b/c/src/lib/libbsp/m68k/gen68302/start/start.S @@ -40,7 +40,6 @@ .set tmpSRAM_BASE, 0x400000 | start of temporary SRAM .set FLASH_BASE, 0xc00000 | start of FLASH''s normal location - BEGIN_CODE PUBLIC (M68Kvec) | Vector Table SYM (M68Kvec): | standard location for vectors @@ -232,7 +231,6 @@ Bad: bra Bad nop END_CODE - BEGIN_DATA PUBLIC (start_frame) @@ -257,6 +255,5 @@ SYM (environ): PUBLIC (stack_size) .set SYM (stack_size),0x1000 - END_DATA END diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c index b3927487c7..f69569c174 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c @@ -19,12 +19,10 @@ * $Id$ */ - #include <rtems.h> #include <bsp.h> #include <rtems/m68k/m68302.h> - #define TMR2_VAL 0x071b /* Timer mode register * (section 3.5.2.1 in 68302 manual) * 15-8: "7" prescaler divide by 8 (x+1) @@ -110,7 +108,6 @@ int Read_timer( void ) return (total - AVG_OVERHEAD) >> 1; } - /* * Empty function call used in loops to measure basic cost of looping * in Timing Test Suite. diff --git a/c/src/lib/libbsp/m68k/gen68340/console/Modif_cpu_asm.S b/c/src/lib/libbsp/m68k/gen68340/console/Modif_cpu_asm.S index 3895962722..bc6176c59f 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/Modif_cpu_asm.S +++ b/c/src/lib/libbsp/m68k/gen68340/console/Modif_cpu_asm.S @@ -15,7 +15,6 @@ * $Id$ */ - #include <rtems/asm.h> .text @@ -76,7 +75,6 @@ SYM (_Debug_ISR_Handler_Console): movew a7@(SAVED+FVO_OFFSET),d0 | d0 = F/VO andl #0x0fff,d0 | d0 = vector offset in vbr - #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 ) movew sr,d1 | Save status register oriw #0x700,sr | Disable interrupts @@ -147,7 +145,6 @@ SYM (_Debug_ISR_Handler_Console): | while in interrupt handler? beq Debug_exit | No, then Debug_exit - bframe: clrl SYM (_ISR_Signals_to_thread_executing) | If sent, will be processed #if ( M68K_HAS_SEPARATE_STACKS == 1 ) diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h b/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h index 4b0050b5d4..b829a23b17 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h @@ -77,5 +77,4 @@ extern void (*Restart_Check_B_Timer)(); #define m340_OUT (1<<9) #define m340_COM (1<<8) - #endif diff --git a/c/src/lib/libbsp/m68k/gen68340/start/start.S b/c/src/lib/libbsp/m68k/gen68340/start/start.S index 1f2976f96e..aa5cdce516 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start/start.S +++ b/c/src/lib/libbsp/m68k/gen68340/start/start.S @@ -622,7 +622,6 @@ _csepld_clear1: moves.b REG_PDCS(crt0_glue),crt0_pdcs /* move.b #0x3F,crt0_pdcs pour test */ - /*---------------------------------------*/ /* -- EPLD chip-select initialization -- */ /*---------------------------------------*/ @@ -719,7 +718,6 @@ _init_cache_end: move.l #68349,crt0_cpu_type - /* -- jump back to PROM -- */ jmp.l (_fill_test) | must be absolute long @@ -762,7 +760,6 @@ _b_cs340: move.b #0,crt0_csswitch | CPU move.b #1,crt0_buswidth | 16 bits - /*------------------------------------------------- fill RAM if COLDSTART -------------------------------------------------*/ diff --git a/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.S b/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.S index 1367314057..2a66ea2d90 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.S +++ b/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.S @@ -335,7 +335,6 @@ _crt0_init_stack: ds.l 0x1000 _crt0_init_stktop: - BEGIN_CODE dc.l _crt0_init_stktop /* reset SP */ dc.l _crt0_cold_start /* reset PC */ diff --git a/c/src/lib/libbsp/m68k/gen68360/network/network.c b/c/src/lib/libbsp/m68k/gen68360/network/network.c index 5c3f67d0f7..b69781e074 100644 --- a/c/src/lib/libbsp/m68k/gen68360/network/network.c +++ b/c/src/lib/libbsp/m68k/gen68360/network/network.c @@ -858,7 +858,6 @@ scc_stop (struct scc_softc *sc) m360.scc1.gsmr_l &= ~0x30; } - /* * Show interface statistics */ diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c index daa16fec28..46a6c9ebea 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c @@ -58,7 +58,6 @@ void bsp_start( void ) * BSP, it is dynamically set in start.S. */ - /* * 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/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c index 6838af3c9b..bf3f4df2d6 100644 --- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c @@ -48,7 +48,6 @@ void Clock_exit( void ); rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; - /* * ISR Handler * diff --git a/c/src/lib/libbsp/m68k/idp/console/console.c b/c/src/lib/libbsp/m68k/idp/console/console.c index 6aa96bf5a7..5319aca174 100644 --- a/c/src/lib/libbsp/m68k/idp/console/console.c +++ b/c/src/lib/libbsp/m68k/idp/console/console.c @@ -74,7 +74,6 @@ rtems_device_driver console_initialize( return RTEMS_SUCCESSFUL; } - /* is_character_ready * * This routine returns TRUE if a character is available. @@ -146,7 +145,6 @@ char inbyte( return tmp_char; } - /* outbyte * * This routine transmits a character out the M68681. It supports diff --git a/c/src/lib/libbsp/m68k/idp/console/duart.c b/c/src/lib/libbsp/m68k/idp/console/duart.c index 194b4ecc09..c8f0d20edb 100644 --- a/c/src/lib/libbsp/m68k/idp/console/duart.c +++ b/c/src/lib/libbsp/m68k/idp/console/duart.c @@ -152,7 +152,6 @@ volatile void init_pit() */ MC68681_WRITE(DUART_ADDR, MC68681_CLOCK_SELECT_REG_B, MC68681_BAUD_RATE_MASK_9600); - #define EIGHT_BITS_NO_PARITY #ifdef EIGHT_BITS_NO_PARITY /* @@ -168,7 +167,6 @@ volatile void init_pit() (MC68681_WITH_PARITY | MC68681_7BIT_CHARS) ); #endif - /* * Set Stop Bit length to 1 * Disable Recieve and transmit on B @@ -246,7 +244,6 @@ void transmit_char(char ch) MC68681_WRITE(DUART_ADDR, MC68681_TRANSMIT_BUFFER_A, ch); } - /*##################################################################### # This is the routine that actually transmits a character one at a time # This routine transmits on port B of the IDP board diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index 0675e666ca..6f08a45ff3 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c @@ -78,7 +78,6 @@ void bsp_start( void ) for ( index=2 ; index<=255 ; index++ ) M68Kvec[ index ] = monitors_vector_table[ 32 ]; - M68Kvec[ 2 ] = monitors_vector_table[ 2 ]; /* bus error vector */ M68Kvec[ 4 ] = monitors_vector_table[ 4 ]; /* breakpoints vector */ M68Kvec[ 9 ] = monitors_vector_table[ 9 ]; /* trace vector */ diff --git a/c/src/lib/libbsp/m68k/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c index 28f15ddbd2..934bdc9db4 100644 --- a/c/src/lib/libbsp/m68k/idp/timer/timer.c +++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c @@ -25,7 +25,6 @@ * $Id$ */ - #include <rtems.h> #include <bsp.h> #include <rtems/motorola/mc68230.h> diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c b/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c index c3cb1ae5bf..e4f7075154 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c @@ -21,7 +21,6 @@ #include "mcf5206/mcf5206e.h" #include "mcf5206/mcfuart.h" - /* Descriptor structures for two on-chip UART channels */ static mcfuart uart[2]; diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c index 32c8809584..55773a479b 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c @@ -155,7 +155,6 @@ i2c_transfer_wait(i2c_bus_number bus, i2c_message *msg, int nmsg) return I2C_SUCCESSFUL; } - /* i2c_write -- * Send single message over specified I2C bus to addressed device and * wait while transfer is finished. diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c index 8850ab8aaa..b12c25c5c5 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c @@ -79,7 +79,6 @@ static int i2cdrv_bus_clock_div_current; /* Forward function declaration */ static void i2cdrv_unload(void); - /* i2cdrv_done -- * Callback function which is called from MBus low-level driver when * transfer is finished. @@ -189,7 +188,6 @@ i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg, return RTEMS_SUCCESSFUL; } - /* i2cdrv_initialize -- * I2C driver initialization (rtems I/O driver primitive) */ @@ -249,7 +247,6 @@ i2c_select_clock_rate(i2c_bus_number bus, int bps) return RTEMS_SUCCESSFUL; } - /* i2c_poll -- * Poll I2C bus controller for events and hanle it. This function is * used when I2C driver operates in poll-driven mode. diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h index 1d0d753a75..9b6860d24a 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h @@ -27,7 +27,6 @@ /*** Board resources allocation ***/ - /* * To achieve some compatibility with dBUG monitor, we use the same * memory resources allocation as it is used in dBUG. diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c b/c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c index 09edc4c361..822e55f789 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c @@ -25,7 +25,6 @@ #include <i2c.h> #include <ds1307.h> - /* nvram_driver_initialize -- * Non-volatile memory device driver initialization. */ diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S b/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S index 58bdaeb34f..cace337ace 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S +++ b/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S @@ -414,7 +414,6 @@ _avec7_int: nop jmp _unexp_int - END_CODE END diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c b/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c index 64be2e5354..bd0a1704f9 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c @@ -60,7 +60,6 @@ #define mcf5206e_enable_cache() \ m68k_set_cacr( MCF5206E_CACR_CENB ) - #define mcf5206e_disable_cache() \ asm volatile ( "nop\n\t" \ "movec %0,%%cacr\n\t" \ diff --git a/c/src/lib/libbsp/m68k/mrm332/console/console.c b/c/src/lib/libbsp/m68k/mrm332/console/console.c index 757b196dc6..909adaec50 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/console.c +++ b/c/src/lib/libbsp/m68k/mrm332/console/console.c @@ -138,7 +138,6 @@ rtems_device_driver console_initialize( */ rtems_termios_initialize(); - /* * register the SCI device name for termios * do this over in the sci driver init routine? @@ -151,7 +150,6 @@ rtems_device_driver console_initialize( rtems_fatal_error_occurred(status); } - /* * Link the uart device to the console device */ diff --git a/c/src/lib/libbsp/m68k/mrm332/console/sci.c b/c/src/lib/libbsp/m68k/mrm332/console/sci.c index 97c4a5c1b5..823ee215b2 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/sci.c +++ b/c/src/lib/libbsp/m68k/mrm332/console/sci.c @@ -36,6 +36,9 @@ * $Id$ * * $Log$ +* Revision 1.7 2004/04/21 10:42:52 ralf +* Remove stray white spaces. +* * Revision 1.6 2004/04/15 13:26:13 ralf * Remove stray white spaces. * @@ -162,14 +165,12 @@ #define SCI_MINOR 0 // minor device number - // IMPORTANT - if the device driver api is opened, it means the sci is being // used for direct hardware access, so other users (like termios) get ignored #define DRIVER_CLOSED 0 // the device driver api is closed #define DRIVER_OPENED 1 // the device driver api is opened - // system clock definitions, i dont have documentation on this... #if 0 // Not needed, this is provided in mrm332.h @@ -188,7 +189,6 @@ Section C - External Data *****************************************************************************/ - /***************************************************************************** @@ -266,7 +266,6 @@ void SciPrintStats(); // test routine static struct rtems_termios_tty *SciTermioTty; - static uint8_t SciInited = 0; // has the driver been inited static uint8_t SciOpened; // has the driver been opened @@ -292,7 +291,6 @@ BSP_polling_getchar_function_type BSP_poll_char = NULL; #endif - // cvs id string so you can use the unix ident command on the object #ifdef ID_STRINGS @@ -338,7 +336,6 @@ static const rtems_termios_callbacks SciInterruptCallbacks = TRUE // output uses interrupts }; - /***************************************************************************** Section I - RTEMS termios callbacks for the polled version of the driver *****************************************************************************/ @@ -363,7 +360,6 @@ static const rtems_termios_callbacks SciPolledCallbacks = // ///////////////////////////////////////////////////////////////////////////// - /**************************************************************************** * Func: SCI_output_char * Desc: used by rtems printk function to send a char to the uart @@ -419,13 +415,11 @@ rtems_isr SciIsr( rtems_vector_number vector ) { uint8_t ch; - if ( (*SCSR) & SCI_ERROR_PARITY ) SciErrorsParity ++; if ( (*SCSR) & SCI_ERROR_FRAMING ) SciErrorsFraming ++; if ( (*SCSR) & SCI_ERROR_NOISE ) SciErrorsNoise ++; if ( (*SCSR) & SCI_ERROR_OVERRUN ) SciErrorsOverrun ++; - // see if it was a transmit interrupt if ( (*SCSR) & SCI_XMTR_AVAILABLE ) // data reg empty, xmt complete @@ -474,7 +468,6 @@ rtems_isr SciIsr( rtems_vector_number vector ) // ///////////////////////////////////////////////////////////////////////////// - /**************************************************************************** * Func: SciRcvBufGetChar * Desc: read a character from the circular buffer @@ -511,7 +504,6 @@ static int8_t SciRcvBufGetChar() } - /**************************************************************************** * Func: SciRcvBufPutChar * Desc: put a character into the rcv data circular buffer @@ -584,7 +576,6 @@ static void SciRcvBufFlush( void ) // ///////////////////////////////////////////////////////////////////////////// - /**************************************************************************** * Func: SciInterruptOpen * Desc: open routine for the interrupt based device driver @@ -635,7 +626,6 @@ SciSetBaud( 19200); // set the baud rate SciSetDataBits(SCI_8_DATA_BITS); // set data bits to 8 - // Install our interrupt handler into RTEMS, where does 66 come from? rtems_interrupt_catch( SciIsr, 66, &old_vector ); @@ -778,7 +768,6 @@ int32_t SciSetAttributes( sci_parity = SCI_PARITY_NONE; // no parity, most common } - // set the number of data bits, 8 is most common if (t->c_cflag & CSIZE) // was it specified? @@ -794,7 +783,6 @@ int32_t SciSetAttributes( sci_databits = SCI_8_DATA_BITS; // default to 8 data bits } - // the number of stop bits; always 1 for SCI if (t->c_cflag & CSTOPB) @@ -802,7 +790,6 @@ int32_t SciSetAttributes( // do nothing } - // setup the hardware with these serial port parameters SciSetBaud(sci_rate); // set the baud rate @@ -811,7 +798,6 @@ int32_t SciSetAttributes( SciSetDataBits(sci_databits); // set the data bits - return RTEMS_SUCCESSFUL; } @@ -978,7 +964,6 @@ int32_t SciPolledWrite( // ///////////////////////////////////////////////////////////////////////////// - /**************************************************************************** * Func: SciInit * Desc: Initialize the lasers device driver and hardware @@ -1000,7 +985,6 @@ rtems_device_driver SciInitialize ( //printk("%s\r\n", __FUNCTION__); - // register the SCI device name for termios console i/o // this is done over in console.c which doesn't seem exactly right // but there were problems doing it here... @@ -1010,15 +994,12 @@ rtems_device_driver SciInitialize ( // if (status != RTEMS_SUCCESSFUL) // rtems_fatal_error_occurred(status); - SciMajor = major; // save the rtems major number SciOpened = DRIVER_CLOSED; // initial state is closed - // if you have an interrupt handler, install it here - SciInited = 1; // set the inited flag return RTEMS_SUCCESSFUL; @@ -1129,7 +1110,6 @@ rtems_device_driver SciRead ( rw_args = (rtems_libio_rw_args_t *) arg; // arguments to read() - if (minor != SCI_MINOR) { return RTEMS_INVALID_NAME; // check the minor number @@ -1281,7 +1261,6 @@ rtems_device_driver SciControl ( // ///////////////////////////////////////////////////////////////////////////// - /**************************************************************************** * Func: SciSetBaud * Desc: setup the uart based on the termios modules requests @@ -1299,7 +1278,6 @@ static void SciSetBaud(uint32_t rate) // when you open the console you need to set the termio struct baud rate // it has a default value of 9600, when someone calls tcsetattr it reverts! - SciBaud = rate; // save the rate // calculate the register value as a float and convert to an int @@ -1499,7 +1477,6 @@ void SciWriteCharWait(uint8_t c) return; } - /**************************************************************************** * Func: SciWriteCharNoWait * Desc: if no room in the fifo throw the char on the floor @@ -1554,7 +1531,6 @@ uint8_t inline SciReadCharWait( void ) return ch; // return the char } - /**************************************************************************** * Func: SciReadCharNoWait * Desc: try to get a char but dont wait for one @@ -1579,7 +1555,6 @@ uint8_t inline SciReadCharNoWait( void ) } - /**************************************************************************** * Func: SciCharAvailable * Desc: is there a receive character in the data register @@ -1628,7 +1603,6 @@ void SciSendBreak( void ) // ///////////////////////////////////////////////////////////////////////////// - /**************************************************************************** * Func: SciUnitTest * Desc: test the device driver @@ -1646,17 +1620,14 @@ void SciUnitTest() uint16_t fd; // file descriptor for device uint16_t result; // result of ioctl - fd = open("/dev/sci",O_RDWR); // open the device printk("SCI open fd=%d\r\n",fd); - result = write(fd, "abcd\r\n", 6); // send a string printk("SCI write result=%d\r\n",result); - result = read(fd, &byte, 1); // read a byte printk("SCI read result=%d,byte=%x\r\n",result,byte); diff --git a/c/src/lib/libbsp/m68k/mrm332/console/sci.h b/c/src/lib/libbsp/m68k/mrm332/console/sci.h index a5d780b10f..237c2897aa 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/sci.h +++ b/c/src/lib/libbsp/m68k/mrm332/console/sci.h @@ -8,11 +8,9 @@ * $Id$ ****************************************************************************/ - #ifndef _sci_h_ #define _sci_h_ - /******************************************************************************* IOCTL commands for the sci driver. I'm still working on these... @@ -46,12 +44,10 @@ #define SCI_IOCTL_MODE_9_BIT 0x82 // 9600,forced,8,1 command mode - /******************************************************************************* SCI Registers *******************************************************************************/ - // SCI Control Register 0 (SCCR0) $FFFC08 // 8 4 2 1 - 8 4 2 1 - 8 4 2 1 - 8 4 2 1 @@ -79,7 +75,6 @@ // 0 0 0 0 - 0 0 0 0 - 0 0 0 0 - 0 1 0 0 reset value - (64k baud?) - #define SCI_BAUD_57_6K 9 #define SCI_BAUD_38_4K 14 #define SCI_BAUD_19_2K 27 @@ -89,7 +84,6 @@ #define SCI_BAUD_1200 437 - // SCI Control Register 1 (SCCR1) $FFFC0A // 8 4 2 1 - 8 4 2 1 - 8 4 2 1 - 8 4 2 1 @@ -182,7 +176,6 @@ // 0 0 0 0 - 0 0 0 1 - 1 0 0 0 - 0 0 0 0 reset value - #define SCI_ERROR_PARITY 0x0001 // 0000-0000-0000-0001 #define SCI_ERROR_FRAMING 0x0002 // 0000-0000-0000-0010 #define SCI_ERROR_NOISE 0x0004 // 0000-0000-0000-0100 @@ -211,17 +204,14 @@ extern "C" { #endif - // look at console_open to see how this is called const rtems_termios_callbacks * SciGetTermiosHandlers( int32_t polled ); - /* SCI interrupt */ //rtems_isr SciIsr( rtems_vector_number vector ); - //int32_t SciOpenPolled ( int32_t major, int32_t minor, void *arg ); //int32_t SciOpenInterrupt ( int32_t major, int32_t minor, void *arg ); @@ -234,10 +224,8 @@ const rtems_termios_callbacks * SciGetTermiosHandlers( int32_t polled ); //int32_t SciSetAttributes ( int32_t minor, const struct termios *t ); - #ifdef __cplusplus } #endif - #endif // _sci_h_ diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h index 8e385f8079..947fd9efce 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h @@ -6,14 +6,12 @@ #ifndef _MRM332_H_ #define _MRM332_H_ - /* SIM_MM (SIM Module Mapping) determines the location of the control register block. When MM=0, register addresses range fom 0x7ff000 to 0x7FFFFF. When MM=1, register addresses range from 0xfff000 to 0xffffff. */ #define SIM_MM 1 - /* Interrupt related definitions */ #define SIM_IARB 15 #define QSM_IARB 10 @@ -28,8 +26,6 @@ #define EFI_INT1 25 /* CTS interrupt */ #define ISRL_SCI 6 - - /* System Clock definitions */ #define XTAL 32768.0 /* crystal frequency in Hz */ @@ -57,7 +53,6 @@ #define SYS_CLOCK (XTAL*4.0*(MRM_Y+1)*(1 << (2*MRM_W+MRM_X))) #define SCI_BAUD 19200 /* RS232 Baud Rate */ - /* macros/functions */ #ifndef ASM diff --git a/c/src/lib/libbsp/m68k/mrm332/start/start.S b/c/src/lib/libbsp/m68k/mrm332/start/start.S index fec7bbee81..05bb23348d 100644 --- a/c/src/lib/libbsp/m68k/mrm332/start/start.S +++ b/c/src/lib/libbsp/m68k/mrm332/start/start.S @@ -25,7 +25,6 @@ BEGIN_CODE movel d0,sp movel d0,a6 - /* include in ram_init.S */ /* * Initalize the SIM module. diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S b/c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S index edc0b633f4..a40f694e22 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S +++ b/c/src/lib/libbsp/m68k/mrm332/startup/except_vect_332_ROM.S @@ -280,7 +280,6 @@ .long reboot /* exception vector: 254 */ .long reboot /* exception vector: 255 */ - _reboot: move #0x2700,%sr /* mask interrupts */ movea.l (0x0).w,%a7 /* load stack */ diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c index 8100914286..5d2f050cf7 100644 --- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c @@ -19,7 +19,6 @@ * $Id$ */ - #include <bsp.h> rtems_boolean Timer_driver_Find_average_overhead; @@ -64,7 +63,6 @@ int Read_timer( void ) return (total - AVG_OVERHEAD); } - /* * Empty function call used in loops to measure basic cost of looping * in Timing Test Suite. diff --git a/c/src/lib/libbsp/m68k/mvme136/console/console.c b/c/src/lib/libbsp/m68k/mvme136/console/console.c index 53e074fe4f..7045eeb054 100644 --- a/c/src/lib/libbsp/m68k/mvme136/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme136/console/console.c @@ -50,7 +50,6 @@ rtems_device_driver console_initialize( return RTEMS_SUCCESSFUL; } - /* is_character_ready * * This routine returns TRUE if a character is available. @@ -91,7 +90,6 @@ char inbyte( void ) return _Read_m681->rbb; } - /* outbyte * * This routine transmits a character out the M68681. It supports diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index eafdfa2579..0ce7f6b443 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -89,7 +89,6 @@ extern "C" { #define PARITYERR 0x20 /* status reg parity error mask */ #define FRAMEERR 0x40 /* status reg frame error mask */ - #define FOREVER 1 /* infinite loop */ /* Structures */ diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c index 7a760c5f1c..167f8aad37 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c @@ -23,7 +23,6 @@ * $Id$ */ - #include <bsp.h> #include <rtems/zilog/z8036.h> diff --git a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c index 9898fabb70..6681819045 100644 --- a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c @@ -43,7 +43,6 @@ void Clock_exit( void ); rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; - /* * ISR Handler */ diff --git a/c/src/lib/libbsp/m68k/mvme147/console/console.c b/c/src/lib/libbsp/m68k/mvme147/console/console.c index 130ecf6473..4ac4bd55d4 100644 --- a/c/src/lib/libbsp/m68k/mvme147/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme147/console/console.c @@ -23,7 +23,6 @@ #include <rtems/libio.h> #include <rtems/zilog/z8530.h> - /* console_initialize * * This routine initializes the console IO driver. diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h index 57d6f6915a..fbe6b5a02e 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h @@ -94,7 +94,6 @@ struct pcc_map { #define z8530 0xfffe3001 - /* interrupt vectors - see MVME146/D1 4.14 */ #define PCC_BASE_VECTOR 0x40 /* First user int */ #define SCC_VECTOR PCC_BASE_VECTOR+3 @@ -114,8 +113,6 @@ struct pcc_map { #define CONSOLE_DATA 0xfffe3001 #endif - - #define FOREVER 1 /* infinite loop */ #ifdef M147_INIT @@ -155,7 +152,6 @@ struct pcc_map { #define Lower_tm27_intr() - /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h index ebe109d34d..abc5a12f52 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h @@ -129,7 +129,6 @@ struct vme_lcsr_map { #define vme_lcsr ((volatile struct vme_lcsr_map * const) 0xfffe2000) - struct vme_gcsr_map { uint8_t unused_1; uint8_t global_0; /* 0xfffe2021 */ @@ -151,11 +150,8 @@ struct vme_gcsr_map { #define vme_gcsr ((volatile struct vme_gcsr_map * const) 0xfffe2020) - - #define z8530 0xfffe3001 - /* interrupt vectors - see MVME147/D1 4.14 */ #define PCC_BASE_VECTOR 0x40 /* First user int */ #define SCC_VECTOR PCC_BASE_VECTOR+3 @@ -178,8 +174,6 @@ struct vme_gcsr_map { #define CONSOLE_DATA 0xfffe3001 #endif - - #define FOREVER 1 /* infinite loop */ #ifdef M147_INIT @@ -219,7 +213,6 @@ struct vme_gcsr_map { #define Lower_tm27_intr() - /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c index 6e5ba65fe7..b97c2e3501 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c @@ -93,7 +93,6 @@ void bsp_start( void ) /* Make VME access round-robin */ } - node_number = (uint8_t) (Configuration.User_multiprocessing_table->node - 1) & 0xF; diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c index 9f8ddabb0d..b4d7b0854a 100644 --- a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c @@ -46,7 +46,6 @@ void Clock_exit( void ); rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; - /* * ISR Handler */ diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index 1b9f06454c..e25baef9e1 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -44,7 +44,6 @@ extern "C" { #include <mvme16x_hw.h> - /*----------------------------------------------------------------*/ typedef volatile struct { diff --git a/c/src/lib/libbsp/m68k/mvme162/include/tod.h b/c/src/lib/libbsp/m68k/mvme162/include/tod.h index 87f4bd6e86..7335b2b4f1 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/tod.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/tod.h @@ -17,7 +17,6 @@ * $Id$ */ - #ifndef TOD_H #define TOD_H diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c b/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c index 2629aa053c..ffcd810959 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c @@ -71,8 +71,6 @@ static unsigned long *table_alloc(int size){ return addr; } - - /* void page_table_init(); diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c index 9072e3ce54..3866bf6fde 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c @@ -78,7 +78,6 @@ int Read_timer() return (total-AVG_OVERHEAD) >> 1; } - rtems_status_code Empty_function( void ) { return RTEMS_SUCCESSFUL; diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/sload.c b/c/src/lib/libbsp/m68k/mvme162/tools/sload.c index 4cb1e659de..86e5e4b1bb 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/sload.c +++ b/c/src/lib/libbsp/m68k/mvme162/tools/sload.c @@ -23,7 +23,6 @@ #include <string.h> #include <ctype.h> - #include <sys/types.h> #include <sys/fcntl.h> #include <sys/resource.h> diff --git a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c index b2576028d8..a4c28bce50 100644 --- a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c @@ -58,7 +58,6 @@ rtems_device_minor_number rtems_clock_minor; */ volatile uint32_t Clock_driver_ticks; - /* * Clock_isrs is the number of clock ISRs until the next invocation of the * RTEMS clock tick routine. This clock tick device driver gets an interrupt @@ -70,19 +69,16 @@ volatile uint32_t Clock_driver_ticks; */ uint32_t Clock_isrs; - /* * Records the previous clock ISR (should be NULL) */ rtems_isr_entry Old_ticker; - /* * Called when the kernel exits. */ void clock_exit( void ); - /* * VMEchip2_T2_isr * @@ -132,7 +128,6 @@ rtems_isr VMEchip2_T2_isr( Clock_isrs -= overflow; } - /* * VMEchip2_T2_initialize * @@ -171,7 +166,6 @@ void VMEchip2_T2_initialize( void ) atexit( clock_exit ); /* Turn off T2 interrupts when we exit */ } - /* * clock_exit * @@ -194,7 +188,6 @@ void clock_exit( void ) set_vector( Old_ticker, CLOCK_VECTOR, 1 ); } - /* * Clock_initialize() * prototyped in rtems/c/src/lib/include/clockdrv.h. @@ -229,7 +222,6 @@ rtems_device_driver Clock_initialize( return RTEMS_SUCCESSFUL; } - /* * Clock_control(). * Prototyped in rtems/c/src/lib/include/clockdrv.h diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h b/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h index 9aa0d597b8..f4c1eae9aa 100644 --- a/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h +++ b/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h @@ -24,7 +24,6 @@ #define CD2401_RECORD_DRAIN_OUTPUT #define CD2401_RECORD_DELAY - /* Call the data recording functions */ #ifdef CD2401_RECORD_WRITE #define CD2401_RECORD_WRITE_INFO( args ) cd2401_record_write_info args @@ -104,7 +103,6 @@ #define CD2401_RECORD_DELAY_INFO( args ) #endif - /* Define the data and the recording functions */ #define CD2401_DEBUG_BUFFER_SIZE 256 #define CD2401_DEBUG_CHAR_BUFSIZE 64 @@ -124,7 +122,6 @@ #define CD2401_DRAIN_OUTPUT_INFO 14 #define CD2401_DELAY_INFO 15 - struct cd2401_debug_info { short discriminant; short record_size; @@ -244,7 +241,6 @@ int cd2401_get_record_size( return size + 4; } - void cd2401_record_write_info( int len, const char * buf, @@ -266,7 +262,6 @@ void cd2401_record_write_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_tx_isr_info( unsigned char ch, unsigned char status, @@ -288,7 +283,6 @@ void cd2401_record_tx_isr_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_tx_isr_spurious_info( unsigned char ch, unsigned char status, @@ -312,7 +306,6 @@ void cd2401_record_tx_isr_spurious_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_tx_isr_buserr_info( unsigned char ch, unsigned char status, @@ -336,7 +329,6 @@ void cd2401_record_tx_isr_buserr_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_rx_isr_info( unsigned char ch, unsigned char total, @@ -357,7 +349,6 @@ void cd2401_record_rx_isr_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_rx_isr_spurious_info( unsigned char ch, unsigned char status, @@ -377,7 +368,6 @@ void cd2401_record_rx_isr_spurious_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_re_isr_spurious_info( unsigned char ch, uint32_t spur_dev, @@ -395,7 +385,6 @@ void cd2401_record_re_isr_spurious_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_modem_isr_spurious_info( unsigned char ch, uint32_t spur_dev, @@ -413,7 +402,6 @@ void cd2401_record_modem_isr_spurious_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_first_open_info( unsigned char ch, uint8_t init_count @@ -429,7 +417,6 @@ void cd2401_record_first_open_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_last_close_info( unsigned char ch, uint8_t init_count @@ -445,7 +432,6 @@ void cd2401_record_last_close_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_start_remote_tx_info( unsigned char ch ) @@ -459,7 +445,6 @@ void cd2401_record_start_remote_tx_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_stop_remote_tx_info( unsigned char ch ) @@ -473,7 +458,6 @@ void cd2401_record_stop_remote_tx_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_set_attributes_info( int minor, uint8_t need_reinit, @@ -530,7 +514,6 @@ void cd2401_record_set_attributes_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_drain_output_info( uint8_t txEmpty, uint8_t own_buf_A, @@ -548,7 +531,6 @@ void cd2401_record_drain_output_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - void cd2401_record_delay_info( rtems_interval start, rtems_interval end, @@ -568,7 +550,6 @@ void cd2401_record_delay_info( cd2401_debug_index = (cd2401_debug_index + 1 ) % CD2401_DEBUG_BUFFER_SIZE; } - #else /* Do not call the data recording functions */ diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console.c b/c/src/lib/libbsp/m68k/mvme167/console/console.c index 3d760e14a8..60880b6289 100644 --- a/c/src/lib/libbsp/m68k/mvme167/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme167/console/console.c @@ -157,12 +157,10 @@ int cd2401_drainOutput( int minor ); int _167Bug_pollRead( int minor ); int _167Bug_pollWrite( int minor, const char *buf, int len ); - /* Printk function */ static void _BSP_output_char( char c ); BSP_output_char_function_type BSP_output_char = _BSP_output_char; - /* Channel info */ /* static */ volatile struct { void *tty; /* Really a struct rtems_termios_tty * */ @@ -188,19 +186,16 @@ BSP_output_char_function_type BSP_output_char = _BSP_output_char; */ uint8_t Init_count; - /* Record previous handlers */ rtems_isr_entry Prev_re_isr; /* Previous rx exception isr */ rtems_isr_entry Prev_rx_isr; /* Previous rx isr */ rtems_isr_entry Prev_tx_isr; /* Previous tx isr */ rtems_isr_entry Prev_modem_isr; /* Previous modem/timer isr */ - /* Define the following symbol to trace the calls to this driver */ /* #define CD2401_RECORD_DEBUG_INFO */ #include "console-recording.h" - /* * Utility functions. */ @@ -236,7 +231,6 @@ rtems_isr_entry Prev_modem_isr; /* Previous modem/timer isr */ CD2401_RECORD_DELAY_INFO(( start_ticks, end_ticks, current_ticks, i )); } - /* * cd2401_chan_cmd * @@ -274,7 +268,6 @@ void cd2401_chan_cmd( } } - /* * cd2401_bitrate_divisor * @@ -314,7 +307,6 @@ uint16_t cd2401_bitrate_divisor( return( clksource | divisor ); } - /* * cd2401_initialize * @@ -401,7 +393,6 @@ void cd2401_initialize( void ) cd2401->tpr = 0x0A; /* Same value as 167Bug */ } - /* * cd2401_interrupts_initialize * @@ -445,7 +436,6 @@ void cd2401_interrupts_initialize( } } - /* ISRs */ /* @@ -481,7 +471,6 @@ rtems_isr cd2401_modem_isr( CD2401_Channel_Info[ch].spur_cnt )); } - /* * cd2401_re_isr * @@ -519,7 +508,6 @@ rtems_isr cd2401_re_isr( CD2401_Channel_Info[ch].spur_cnt )); } - /* * cd2401_rx_isr * @@ -567,7 +555,6 @@ rtems_isr cd2401_rx_isr( } } - /* * cd2401_tx_isr * @@ -664,7 +651,6 @@ rtems_isr cd2401_tx_isr( } } - /* * termios callbacks */ @@ -751,7 +737,6 @@ int cd2401_firstOpen( return RTEMS_SUCCESSFUL; } - /* * cd2401_lastClose * @@ -794,7 +779,6 @@ int cd2401_lastClose( return RTEMS_SUCCESSFUL; } - /* * cd2401_setAttributes * @@ -1083,7 +1067,6 @@ int cd2401_setAttributes( return RTEMS_SUCCESSFUL; } - /* * cd2401_startRemoreTx * @@ -1124,7 +1107,6 @@ int cd2401_startRemoteTx( return RTEMS_SUCCESSFUL; } - /* * cd2401_stopRemoteTx * @@ -1166,7 +1148,6 @@ int cd2401_stopRemoteTx( return RTEMS_SUCCESSFUL; } - /* * cd2401_write * @@ -1266,7 +1247,6 @@ int cd2401_drainOutput( } #endif - /* * _167Bug_pollRead * @@ -1324,7 +1304,6 @@ int _167Bug_pollRead( return (int)c; } - /* * _167Bug_pollWrite * @@ -1362,7 +1341,6 @@ int _167Bug_pollWrite( return RTEMS_SUCCESSFUL; } - /* * do_poll_read * @@ -1443,7 +1421,6 @@ rtems_status_code do_poll_write( return RTEMS_SUCCESSFUL; } - /* * _BSP_output_char * @@ -1469,7 +1446,6 @@ void _BSP_output_char(char c) _167Bug_pollWrite(printk_minor, &cr, 1); } - /* *************** * BOILERPLATE * @@ -1601,7 +1577,6 @@ rtems_device_driver console_open( #endif } - /* * Close the device */ @@ -1631,7 +1606,6 @@ rtems_device_driver console_close( #endif } - /* * Read from the device */ @@ -1661,7 +1635,6 @@ rtems_device_driver console_read( #endif } - /* * Write to the device */ @@ -1691,7 +1664,6 @@ rtems_device_driver console_write( #endif } - /* * Handle ioctl request. */ diff --git a/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c b/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c index b93a08fee1..142e25395a 100644 --- a/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c +++ b/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c @@ -41,7 +41,6 @@ static int mystrcat( return i; } - /* * bsp_fatal_error_occurred * diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h index a1aa2727c7..e60ba54483 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h @@ -21,7 +21,6 @@ #ifndef __MVME167_H #define __MVME167_H - #ifdef __cplusplus extern "C" { #endif @@ -34,7 +33,6 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/bspIo.h> - /* * confdefs.h overrides for this BSP: * - termios serial ports (defaults to 1) @@ -142,7 +140,6 @@ typedef volatile struct memc040_regs_ { #define memc040_1 ((memc040_regs * const) 0xFFF43000) #define memc040_2 ((memc040_regs * const) 0xFFF43100) - /* * The MVME167 may be equiped with error-correcting RAM cards. In this case, * each MEMC040 is replaced by two MCECC ECC DRAM controllers. This port @@ -154,7 +151,6 @@ typedef volatile struct memc040_regs_ { * can be used to read those first eight registers. */ - /* * Representation of the Cirrus Logic CL-CD2401 Multi-Protocol Controller */ @@ -298,14 +294,12 @@ typedef volatile struct cd2401_regs_ { unsigned char dr; /* 0xFFF450F8 - Receive/Transmit Data */ } cd2401_regs; - /* * Base address of the CD2401. * This is not configurable in the MVME167. */ #define cd2401 ((cd2401_regs * const) 0xFFF45000) - /* CD2401 is clocked at 20 MHz */ #define CD2401_CLK_RATE 20000000 @@ -345,14 +339,12 @@ m68k_isr_entry set_vector( #define BSP_LIBIO_MAX_FDS 20 - /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; extern m68k_isr_entry M68Kvec[]; /* vector table address */ - /* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These diff --git a/c/src/lib/libbsp/m68k/mvme167/network/network.c b/c/src/lib/libbsp/m68k/mvme167/network/network.c index 8ab46e8ee9..e3d7abb278 100644 --- a/c/src/lib/libbsp/m68k/mvme167/network/network.c +++ b/c/src/lib/libbsp/m68k/mvme167/network/network.c @@ -49,7 +49,6 @@ #define START_TRANSMIT_EVENT RTEMS_EVENT_2 #define NIC_RESET_EVENT RTEMS_EVENT_3 - #include <bsp.h> #include <stdio.h> #include <string.h> @@ -120,7 +119,6 @@ char uti596initSetup[] = { 0x3f /* Byte 13: no multi IA, backoff enabled */ }; - /* Local Routines */ static unsigned long word_swap ( unsigned long ); @@ -155,7 +153,6 @@ static void uti596_append ( i596_rfd ** , i596_rfd * ); static void uti596_supplyFD ( i596_rfd * ); static void send_packet ( struct ifnet *, struct mbuf * ); - /* Required RTEMS network driver functions and tasks (plus reset daemon) */ static void uti596_start ( struct ifnet * ); @@ -178,8 +175,6 @@ static void print_pkt ( unsigned char * ); static void print_echo ( unsigned char * ); #endif - - /* * word_swap * @@ -200,7 +195,6 @@ static unsigned long word_swap( return (((val >> 16)&(0x0000ffff)) | ((val << 16)&(0xffff0000))); } - /* * malloc_16byte_aligned * @@ -236,7 +230,6 @@ static void * malloc_16byte_aligned( return *adjusted_pointer; } - /* * uti596_scp_alloc * @@ -273,7 +266,6 @@ static i596_scp * uti596_scp_alloc( return sc->pScp; } - /* * uti596_writePortFunction * @@ -298,7 +290,6 @@ RTEMS_INLINE_ROUTINE void uti596_writePortFunction( i82596->port_upper = (unsigned short)(((unsigned long)addr >> 16 ) & 0xFFFF); } - /* * uti596_portReset * @@ -315,7 +306,6 @@ RTEMS_INLINE_ROUTINE void uti596_portReset( void ) uti596_writePortFunction( NULL, UTI596_RESET_PORT_FUNCTION ); } - /* currently unused by RTEMS */ #if 0 /* @@ -370,7 +360,6 @@ static unsigned long uti596_portSelfTest( } #endif - /* currently unused by RTEMS */ #if 0 /* @@ -423,7 +412,6 @@ static int uti596_portDump( } #endif - /* * uti596_wait * @@ -458,7 +446,6 @@ static int uti596_wait( case UTI596_NO_WAIT: return 0; - case UTI596_WAIT_FOR_CU_ACCEPT: do { if (sc->scb.command == 0) @@ -521,7 +508,6 @@ static int uti596_wait( return -1; } - /* * uti596_issueCA * @@ -550,7 +536,6 @@ static int uti596_issueCA( return (uti596_wait ( sc, waitType )); } - /* * uti596_addCmd * @@ -604,7 +589,6 @@ static void uti596_addCmd( #endif } - /* * uti596_addPolledCmd * @@ -648,7 +632,6 @@ void uti596_addPolledCmd( #endif } - /* currently unused by RTEMS */ #if 0 /* @@ -678,7 +661,6 @@ static void uti596_CU_dump ( i596_dump_result * drp) } #endif - /* * uti596_dump_scb * @@ -707,7 +689,6 @@ static void uti596_dump_scb ( void ) printk(("t_off 0x%x\n",uti596_softc.scb.t_off)) } - /* * uti596_setScpAndScb * @@ -740,7 +721,6 @@ static int uti596_setScpAndScb( return ( uti596_issueCA ( sc, UTI596_WAIT_FOR_INITIALIZATION ) ); } - /* * uti596_diagnose * @@ -768,7 +748,6 @@ static int uti596_diagnose( void ) #endif } - /* * uti596_configure * @@ -796,7 +775,6 @@ static int uti596_configure ( return ( uti596_wait ( sc, UTI596_WAIT_FOR_STAT_C ) ); } - /* * uti596_IAsetup * @@ -829,7 +807,6 @@ static int uti596_IAsetup ( return ( uti596_wait ( sc, UTI596_WAIT_FOR_STAT_C ) ); } - /* * uti596_initTBD * @@ -877,7 +854,6 @@ static int uti596_initTBD ( uti596_softc_ * sc ) return 0; } - /* * uti596_initRFA * @@ -961,7 +937,6 @@ static int uti596_initRFA( int num ) return (i); /* the number of allocated buffers */ } - /* * uti596_initMem * @@ -1075,7 +1050,6 @@ void uti596_initialize( sc->scb.command = 0; } - /* * uti596_initialize_hardware * @@ -1125,7 +1099,6 @@ void uti596_initialize_hardware( #endif } - /* * uti596_reset_hardware * @@ -1175,7 +1148,6 @@ void uti596_reset_hardware( #endif } - /* * uti596_clearListStatus * @@ -1198,7 +1170,6 @@ void uti596_clearListStatus( } } - /* * uti596_reset * @@ -1241,7 +1212,6 @@ void uti596_reset( void ) sc->pCmdHead = sc->pCmdTail = sc->scb.pCmd = I596_NULL; - /* restore the RFA */ if ( sc->pLastUnkRFD != I596_NULL ) { @@ -1278,7 +1248,6 @@ void uti596_reset( void ) #endif } - /* * uti596_dequeue * @@ -1319,7 +1288,6 @@ i596_rfd * uti596_dequeue( return pRfd; } - /* * uti596_append * @@ -1367,7 +1335,6 @@ void uti596_append( } } - /* * uti596_supplyFD * @@ -1503,7 +1470,6 @@ void uti596_supplyFD ( } } - /* * send_packet * @@ -1645,7 +1611,6 @@ void send_packet( } } - /*********************************************************************** * Function: uti596_attach * @@ -1934,8 +1899,6 @@ void uti596_init( i82596->chan_attn = 0x00000000; } - - /*********************************************************************** * Function: void uti596_txDaemon * @@ -2124,7 +2087,6 @@ void uti596_txDaemon( #endif } - /*********************************************************************** * Function: void uti596_resetDaemon * @@ -2158,7 +2120,6 @@ void uti596_resetDaemon( } } - /*********************************************************************** * Function: uti596_DynamicInterruptHandler * @@ -2209,7 +2170,6 @@ void uti596_resetDaemon( uti596_softc.nic_reset = 1; } - if ( (scbStatus & SCB_STAT_CX) && !(scbStatus & SCB_STAT_CNA) ) { printk(("\n*****ERROR: Command Complete, and CNA available: 0x%x\nResetting...", scbStatus)) uti596_softc.nic_reset = 1; @@ -2325,7 +2285,6 @@ void uti596_resetDaemon( } } /* end if ( scbStatus & SCB_STAT_FR ) */ - /* * Command Unit Control * a command is completed @@ -2474,7 +2433,6 @@ void uti596_resetDaemon( } } /* end if command complete */ - /* * If the receiver has stopped, * check if this is a No Resources scenario, @@ -2607,7 +2565,6 @@ void uti596_resetDaemon( #endif count_rx=0; - /* Do this last, to ensure that the reset is called at the right time. */ if ( uti596_softc.nic_reset ) { uti596_softc.nic_reset = 0; @@ -2618,7 +2575,6 @@ void uti596_resetDaemon( return; } - /*********************************************************************** * Function: uti596_ioctl * @@ -2688,7 +2644,6 @@ static int uti596_ioctl( return error; } - /*********************************************************************** * Function: uti596_stats * @@ -2739,9 +2694,6 @@ void uti596_stats( #endif } - - - /************************ PACKET DEBUG ROUTINES ************************/ #ifdef DBG_PACKETS @@ -2781,7 +2733,6 @@ static void dumpQ( void ) } } - /* * show_buffers * @@ -2825,7 +2776,6 @@ static void show_buffers (void) printk(("\nUnknown: %p\n",uti596_softc.pLastUnkRFD)) } - /* * show_queues * @@ -2861,7 +2811,6 @@ static void show_queues(void) printk(("uti596_softc.pEndRFA: %p\n",uti596_softc.pEndRFA)) } - /* * print_eth * @@ -2924,7 +2873,6 @@ static void print_eth( printk (("%u\n", add[41])) } - if ( add[12] == 0x08 && add[13] == 0x00 ) { /* an IP packet */ printk (("*********************IP HEADER******************\n")) @@ -2950,7 +2898,6 @@ static void print_eth( } } - /* * print_hdr * @@ -2979,7 +2926,6 @@ static void print_hdr( printk (("print_hdr: completed")) } - /* * Function: print_pkt * @@ -3065,7 +3011,6 @@ static void print_pkt( } } - /* * print_echo * diff --git a/c/src/lib/libbsp/m68k/mvme167/network/uti596.h b/c/src/lib/libbsp/m68k/mvme167/network/uti596.h index bc97ac2455..ac1d454da9 100644 --- a/c/src/lib/libbsp/m68k/mvme167/network/uti596.h +++ b/c/src/lib/libbsp/m68k/mvme167/network/uti596.h @@ -101,7 +101,6 @@ struct enet_statistics{ #define I596_NULL ( ( void * ) 0xffffffff) #define UTI_596_END_OF_FRAME 0x8000 - struct i596_tbd; /* necessary forward declaration */ enum commands { diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c index f4c640063d..1d07234879 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c @@ -18,7 +18,6 @@ * $Id$ */ - #include <string.h> #include <bsp.h> @@ -95,7 +94,6 @@ void bsp_start( void ) rom_monitor_vector_table = (m68k_isr_entry *)0xFFE00000; m68k_set_vbr( rom_monitor_vector_table ); - /* * Copy 167Bug Bus Error handler into our exception vector. All 167Bug * exception vectors are the same and point to the generalized exception diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/page_table.c b/c/src/lib/libbsp/m68k/mvme167/startup/page_table.c index 985144224d..06ae67815c 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/page_table.c +++ b/c/src/lib/libbsp/m68k/mvme167/startup/page_table.c @@ -131,7 +131,6 @@ void page_table_init( :: "d" (0), "d" (dtt0), "d" (0xFF00C040), "d" (cacr)); } - /* * page_table_teardown * diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c index 2d78f91685..0dc5343352 100644 --- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c @@ -92,7 +92,6 @@ void Timer_initialize() /* (3 countdowns) to start/stop the timer. */ #define LEAST_VALID 3UL /* Don't trust a value lower than this */ - /* * This routine reads the Tick Timer 1 on the MVME167 board. * @@ -121,7 +120,6 @@ int Read_timer() return total - AVG_OVERHEAD; } - /* * Empty function call used in loops to measure basic cost of looping * in Timing Test Suite. @@ -135,7 +133,6 @@ rtems_status_code Empty_function( void ) return RTEMS_SUCCESSFUL; } - /* * This routine sets the Timer_driver_Find_average_overhead flag in this * module. diff --git a/c/src/lib/libbsp/m68k/ods68302/console/console.c b/c/src/lib/libbsp/m68k/ods68302/console/console.c index f471b44a71..37d0fd96f5 100644 --- a/c/src/lib/libbsp/m68k/ods68302/console/console.c +++ b/c/src/lib/libbsp/m68k/ods68302/console/console.c @@ -76,7 +76,6 @@ rtems_boolean is_character_ready( return FALSE; } - /* inbyte * * Receive a character from the MC68302's SCC2. @@ -97,7 +96,6 @@ char inbyte( void ) return ch; } - /* outbyte * * Transmit a character out on the MC68302's SCC2. diff --git a/c/src/lib/libbsp/m68k/ods68302/start/reset.S b/c/src/lib/libbsp/m68k/ods68302/start/reset.S index c6f80950f1..8581089b05 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start/reset.S +++ b/c/src/lib/libbsp/m68k/ods68302/start/reset.S @@ -854,7 +854,6 @@ vector_table: start_frame: .space 4,0 - | | Uninitialised data | diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c b/c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c index 957535389a..7a388e98d8 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/gdb-hooks.c @@ -7,7 +7,6 @@ */ /*****************************************************************************/ - #include <bsp.h> #include <rtems/m68k/m68302.h> #include <m68302scc.h> diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c b/c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c index 4b7c7d9440..d3211734e7 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/m68302scc.c @@ -7,7 +7,6 @@ */ /*****************************************************************************/ - #include <bsp.h> #include <rtems/m68k/m68302.h> #include <m68302scc.h> diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c b/c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c index 95e404677f..d9e230ea33 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c +++ b/c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c @@ -526,7 +526,6 @@ saveDone:\n\ "); #endif - /* * remcomHandler is a front end for handle_exception. It moves the * stack pointer into an area reserved for debugger use in case the @@ -638,7 +637,6 @@ void getpacket(char *buffer) /* send the packet in buffer. The host get's one chance to read it. This routine does not wait for a positive acknowledge. */ - void putpacket(char *buffer) { @@ -1026,7 +1024,6 @@ void handle_exception(int exceptionVector) } } - void initializeRemcomErrorFrame() { lastFrame = ((Frame *) &gdbFrameStack[FRAMESIZE-1]) - 1; diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c index b3927487c7..f69569c174 100644 --- a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c @@ -19,12 +19,10 @@ * $Id$ */ - #include <rtems.h> #include <bsp.h> #include <rtems/m68k/m68302.h> - #define TMR2_VAL 0x071b /* Timer mode register * (section 3.5.2.1 in 68302 manual) * 15-8: "7" prescaler divide by 8 (x+1) @@ -110,7 +108,6 @@ int Read_timer( void ) return (total - AVG_OVERHEAD) >> 1; } - /* * Empty function call used in loops to measure basic cost of looping * in Timing Test Suite. diff --git a/c/src/lib/libbsp/m68k/shared/gdbstub/gdb_if.h b/c/src/lib/libbsp/m68k/shared/gdbstub/gdb_if.h index 5dbb72185c..35afa770cd 100644 --- a/c/src/lib/libbsp/m68k/shared/gdbstub/gdb_if.h +++ b/c/src/lib/libbsp/m68k/shared/gdbstub/gdb_if.h @@ -32,7 +32,6 @@ struct rtems_gdb_stub_thread_info { int parse_zbreak(const char *in, int *type, unsigned char **addr, int *len); - char* mem2hstr(char *buf, const unsigned char *mem, int count); int hstr2mem(unsigned char *mem, const char *buf, int count); void set_mem_err(void); @@ -171,14 +170,9 @@ enum regnames {D0,D1,D2,D3,D4,D5,D6,D7, #define NUM_REGS 72 - - - - void mips_gdb_stub_install(int enableThreads) ; #endif /* defined (__mips__) */ - #define MEMOPT_READABLE 1 #define MEMOPT_WRITEABLE 2 @@ -186,6 +180,4 @@ void mips_gdb_stub_install(int enableThreads) ; int gdbstub_add_memsegment(unsigned,unsigned,int); - - #endif /* _GDB_IF_H */ diff --git a/c/src/lib/libbsp/m68k/shared/gdbstub/m68k-stub.c b/c/src/lib/libbsp/m68k/shared/gdbstub/m68k-stub.c index 4ad7482f27..3ca47623a8 100644 --- a/c/src/lib/libbsp/m68k/shared/gdbstub/m68k-stub.c +++ b/c/src/lib/libbsp/m68k/shared/gdbstub/m68k-stub.c @@ -129,11 +129,9 @@ int current_thread_registers[NUMREGBYTES/4]; typedef void (*ExceptionHook)(int); /* pointer to function with int parm */ typedef void (*Function)(); /* pointer to a function */ - extern void putDebugChar(); /* write a single character */ extern int getDebugChar(); /* read and return a single char */ - /************************/ /* FORWARD DECLARATIONS */ /************************/ @@ -154,7 +152,6 @@ const char gdb_hexchars[]="0123456789abcdef"; #define highhex(x) gdb_hexchars [(x >> 4) & 0xf] #define lowhex(x) gdb_hexchars [x & 0xf] - /* We keep a whole frame cache here. "Why?", I hear you cry, "doesn't GDB handle that sort of thing?" Well, yes, I believe the only @@ -206,7 +203,6 @@ static ExceptionHook oldExceptionHook; */ const short exceptionSize[] = { 4,4,6,6,4,4,4,30,29,10,16,46,12,4,4,4 }; - /************* jump buffer used for setjmp/longjmp **************************/ jmp_buf remcomEnv; @@ -322,7 +318,6 @@ asm(" lea 4(%sp),%sp"); /* pull off 68000 return address */ #endif asm(" rte"); - #if M68K_HAS_VBR /* This function is called when a 68020 exception occurs. It saves * all the cpu and fpcp regs in the _registers array, creates a frame on a @@ -493,7 +488,6 @@ saveDone: \n\ "); #endif - /* * remcomHandler is a front end for handle_exception. It moves the * stack pointer into an area reserved for debugger use in case the @@ -553,7 +547,6 @@ char ch; return (-1); } - /* scan for the sequence $<data>#<checksum> */ void getpacket(buffer) char * buffer; @@ -610,7 +603,6 @@ char * buffer; /* send the packet in buffer. The host get's one chance to read it. This routine does not wait for a positive acknowledge. */ - /* * Send the packet in buffer and wait for a positive acknowledgement. */ @@ -664,7 +656,6 @@ char remcomInBuffer[BUFMAX]; char remcomOutBuffer[BUFMAX]; static short error; - void debug_error( char * format, char * parm @@ -954,7 +945,6 @@ void handle_exception(int exceptionVector) mem2hex (regptr, remcomOutBuffer, sizeof registers); break; - case 'G': /* set the values of the CPU registers - return OK */ regptr = registers; #if defined(GDB_STUB_ENABLE_THREAD_SUPPORT) @@ -1243,7 +1233,6 @@ void handle_exception(int exceptionVector) } } - void initializeRemcomErrorFrame() { diff --git a/c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c b/c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c index 4cc1584087..55d12334d7 100644 --- a/c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c +++ b/c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c @@ -38,7 +38,6 @@ extern void *_RamBase; extern void *_WorkspaceBase; extern void *_HeapSize; - unsigned long _M68k_Ramsize; void bsp_pretasking_hook(void) diff --git a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h b/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h index 967faa8d24..8cbcb440d1 100644 --- a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h +++ b/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h @@ -55,7 +55,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig, int attaching ); */ #define GROUP_BASE_ADDRESS 0x0000CC00 - /* * Representation of the VMEchip2 LCSR. * Could be made more detailed. @@ -244,7 +243,6 @@ typedef volatile struct nvram_config_ { #endif - /* * Flag to indicate if J1-4 is on (and parameters should be * sought in User Area NVRAM) @@ -257,7 +255,6 @@ typedef volatile struct nvram_config_ { #define NVRAM_CONFIGURE 0 #endif - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/sim68000/clock/clockdrv.c b/c/src/lib/libbsp/m68k/sim68000/clock/clockdrv.c index f3aac18351..6422025812 100644 --- a/c/src/lib/libbsp/m68k/sim68000/clock/clockdrv.c +++ b/c/src/lib/libbsp/m68k/sim68000/clock/clockdrv.c @@ -11,7 +11,6 @@ #define Clock_driver_support_install_isr( _new, _old ) \ do { _old = (rtems_isr_entry) set_vector( _new, CLOCK_VECTOR, 1 ); } while(0) - typedef struct { volatile uint8_t cr; /* 0 - 0 : Timer Control Register */ volatile uint8_t pad0; /* 1 - 1 : pad */ @@ -44,7 +43,6 @@ void Clock_driver_support_at_tick() t->sr = 0xA0; /* Negate timer interrupt request */ } - void Clock_driver_support_shutdown_hardware() { timer_hw_t *t = TIMER_BASE; diff --git a/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c b/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c index 6d00ec26e9..08663b3ae1 100644 --- a/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c +++ b/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c @@ -37,8 +37,6 @@ #define MC68681_FUNCTIONS &mc68681_fns_polled #endif - - console_tbl Console_Port_Tbl[] = { { "/dev/com0", /* sDeviceName */ diff --git a/c/src/lib/libbsp/m68k/sim68000/start/start.S b/c/src/lib/libbsp/m68k/sim68000/start/start.S index 9c08095c91..23e34ebab9 100644 --- a/c/src/lib/libbsp/m68k/sim68000/start/start.S +++ b/c/src/lib/libbsp/m68k/sim68000/start/start.S @@ -391,7 +391,6 @@ zerobss_loop: bsp_exitted: jmp bsp_exitted - | | Initialised data | |