From f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Apr 2004 16:01:48 +0000 Subject: Remove duplicate white lines. --- c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c | 1 - c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac | 1 - c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c | 8 -------- c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h | 4 ---- c/src/lib/libbsp/powerpc/ppcn_60x/include/nvram.h | 1 - c/src/lib/libbsp/powerpc/ppcn_60x/include/tod.h | 1 - c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h | 2 -- c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c | 4 ---- c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c | 1 - c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c | 1 - c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c | 2 -- c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c | 3 --- c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c | 1 - c/src/lib/libbsp/powerpc/ppcn_60x/vectors/align_h.S | 1 - 14 files changed, 31 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/ppcn_60x') 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 #include @@ -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 #include - /* * 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 -- cgit v1.2.3