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/shared/bootcard.c | 2 - c/src/lib/libbsp/shared/clock_driver_stub.c | 1 - c/src/lib/libbsp/shared/console-polled.c | 1 - c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c | 91 ----------------------- c/src/lib/libbsp/shared/tod.c | 2 - c/src/lib/libbsp/shared/tod.h | 1 - c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c | 9 --- c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h | 3 - 8 files changed, 110 deletions(-) (limited to 'c/src/lib/libbsp/shared') diff --git a/c/src/lib/libbsp/shared/bootcard.c b/c/src/lib/libbsp/shared/bootcard.c index dfecda6643..ca9d45693e 100644 --- a/c/src/lib/libbsp/shared/bootcard.c +++ b/c/src/lib/libbsp/shared/bootcard.c @@ -69,7 +69,6 @@ int boot_card(int argc, char **argv, char **envp) if ( envp ) envp_p = envp; - /* * Set default values for the CPU Table fields all ports must have. * These values can be overridden in bsp_start() but they are @@ -86,7 +85,6 @@ int boot_card(int argc, char **argv, char **envp) Cpu_table.stack_allocate_hook = NULL; Cpu_table.stack_free_hook = NULL; - /* * Copy the configuration table so we and the BSP wants to change it. */ diff --git a/c/src/lib/libbsp/shared/clock_driver_stub.c b/c/src/lib/libbsp/shared/clock_driver_stub.c index 1b7a77ac70..55e4c6b164 100644 --- a/c/src/lib/libbsp/shared/clock_driver_stub.c +++ b/c/src/lib/libbsp/shared/clock_driver_stub.c @@ -14,7 +14,6 @@ #define Clock_driver_support_install_isr( _new, _old ) \ do { _old = 0; } while(0) - #define Clock_driver_support_initialize_hardware() #define Clock_driver_support_shutdown_hardware() diff --git a/c/src/lib/libbsp/shared/console-polled.c b/c/src/lib/libbsp/shared/console-polled.c index e95863c51e..3cb2b36652 100644 --- a/c/src/lib/libbsp/shared/console-polled.c +++ b/c/src/lib/libbsp/shared/console-polled.c @@ -102,7 +102,6 @@ rtems_device_driver console_open( 0 /* outputUsesInterrupts */ }; - assert( minor <= 1 ); if ( minor > 2 ) return RTEMS_INVALID_NUMBER; diff --git a/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c b/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c index bbb038dfa1..cabf5598fa 100644 --- a/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c +++ b/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c @@ -39,7 +39,6 @@ extern const char gdb_hexchars[]; - /* * Prototypes for CPU dependent routines that are conditional * at the bottom of this file. @@ -50,12 +49,6 @@ void rtems_gdb_stub_get_registers_from_context( Thread_Control *th ); - - - - - - /* Check whether it is OK to enable thread support */ int rtems_gdb_stub_thread_support_ok(void) { @@ -65,10 +58,6 @@ int rtems_gdb_stub_thread_support_ok(void) return 0; } - - - - /* * rtems_gdb_stub_id_to_index * @@ -111,8 +100,6 @@ int rtems_gdb_stub_id_to_index( return first_posix_id + (thread_obj_id - min_id); } - - /* Return the RTEMS thread id from a gdb thread id */ Thread_Control *rtems_gdb_index_to_stub_id( int thread @@ -175,20 +162,12 @@ Thread_Control *rtems_gdb_index_to_stub_id( return th; } - - - - - /* Get id of the thread stopped by exception */ int rtems_gdb_stub_get_current_thread(void) { return rtems_gdb_stub_id_to_index( _Thread_Executing->Object.id ); } - - - /* Get id of the next thread after athread, if argument <= 0 find the first available thread, return thread if found or 0 if not */ int rtems_gdb_stub_get_next_thread(int athread) @@ -257,11 +236,6 @@ int rtems_gdb_stub_get_next_thread(int athread) return 0; } - - - - - /* Get thread registers, return 0 if thread does not exist, and 1 otherwise */ int rtems_gdb_stub_get_thread_regs( @@ -281,11 +255,6 @@ int rtems_gdb_stub_get_thread_regs( return 0; } - - - - - /* Set thread registers, return 0 if thread does not exist or register values will screw up the threads, and 1 otherwise */ @@ -302,11 +271,6 @@ int rtems_gdb_stub_set_thread_regs( return 1; } - - - - - /* Get thread information, return 0 if thread does not exist and 1 otherwise */ int rtems_gdb_stub_get_thread_info( @@ -432,11 +396,6 @@ int rtems_gdb_stub_get_thread_info( /*******************************************************/ - - - - - /* Format: x,,, where x is 'z' or 'Z' */ int parse_zbreak(const char *in, int *type, unsigned char **addr, int *len) { @@ -670,17 +629,6 @@ pack_qm_header(char *out, int count, int done, int athread) return; } - - - - - - - - - - - void rtems_gdb_process_query( char *inbuffer, char *outbuffer, @@ -705,9 +653,6 @@ void rtems_gdb_process_query( *optr = 0; break; - - - case 'P': /* Thread info query */ if (!do_threads) { @@ -737,10 +682,6 @@ void rtems_gdb_process_query( } break; - - - - case 'L': /* Thread list query */ if (!do_threads) { @@ -797,11 +738,6 @@ void rtems_gdb_process_query( } break; - - - - - default: if (memcmp(inbuffer, "qOffsets", 8) == 0) { unsigned char *t, *d, *b; @@ -849,11 +785,6 @@ void rtems_gdb_process_query( } } - - - - - /* Present thread in the variable length string format */ char* thread2vhstr(char *buf, int thread) @@ -957,7 +888,6 @@ vhstr2thread(const char *buf, int *thread) ASSERT(buf != NULL); ASSERT(thread != NULL); - /* If we have leading zeros, skip them */ found_zero = 0; @@ -1004,7 +934,6 @@ vhstr2thread(const char *buf, int *thread) return buf; } - /* Present integer in the variable length string format */ char* int2vhstr(char *buf, int val) @@ -1095,7 +1024,6 @@ vhstr2int(const char *buf, int *ival) ASSERT(buf != NULL); ASSERT(ival != NULL); - /* If we have leading zeros, skip them */ found_zero = 0; @@ -1194,8 +1122,6 @@ static volatile char mem_err = 0; void set_mem_err(void); static void (*volatile mem_fault_routine) (void) = NULL; - - /* convert count bytes of the memory pointed to by mem into hex string, placing result in buf, return pointer to next location in hex strng in case of success or NULL otherwise */ @@ -1270,7 +1196,6 @@ set_mem_err (void) mem_err = 1; } - /* These are separate functions so that they are so short and sweet that the compiler won't save any registers (if there is a fault to mem_fault, they won't get restored, so there better not be any @@ -1288,14 +1213,6 @@ set_byte (unsigned char *addr, int val) *addr = val; } - - - - - - - - /* * From here down, the code is CPU model specific and generally maps * the RTEMS thread context format to gdb's. @@ -1359,13 +1276,8 @@ int rtems_gdb_stub_get_offsets( return 1; } - - - - #elif defined(__mips__) - void rtems_gdb_stub_get_registers_from_context( int *registers, Thread_Control *th @@ -1387,7 +1299,6 @@ void rtems_gdb_stub_get_registers_from_context( registers[PC] = (unsigned)th->Registers.c0_epc; } - int rtems_gdb_stub_get_offsets( unsigned char **text_addr, unsigned char **data_addr, @@ -1411,7 +1322,6 @@ int rtems_gdb_stub_get_offsets( #elif defined(__mc68000__) - void rtems_gdb_stub_get_registers_from_context( int *registers, Thread_Control *th @@ -1448,7 +1358,6 @@ void rtems_gdb_stub_get_registers_from_context( #endif } - int rtems_gdb_stub_get_offsets( unsigned char **text_addr, unsigned char **data_addr, diff --git a/c/src/lib/libbsp/shared/tod.c b/c/src/lib/libbsp/shared/tod.c index 0f90f11915..3eac5c1e10 100644 --- a/c/src/lib/libbsp/shared/tod.c +++ b/c/src/lib/libbsp/shared/tod.c @@ -101,7 +101,6 @@ rtems_device_driver rtc_initialize( return RTEMS_SUCCESSFUL; } - /*PAGE * * This routine copies the time from the real time clock to RTEMS @@ -203,7 +202,6 @@ int setRealTime( return 0; } - /*PAGE * * checkRealTime diff --git a/c/src/lib/libbsp/shared/tod.h b/c/src/lib/libbsp/shared/tod.h index 8e3f115d90..3f5f9069da 100644 --- a/c/src/lib/libbsp/shared/tod.h +++ b/c/src/lib/libbsp/shared/tod.h @@ -13,7 +13,6 @@ * $Id$ */ - #ifndef TOD_H #define TOD_H diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c index 47c9d3d1d0..2006474e08 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c +++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c @@ -71,7 +71,6 @@ typedef unsigned int pci_ulong; #define PCI_TO_LOCAL_ADDR(memaddr) ((pci_ulong)(memaddr) + PCI_MEM_BASE) - #elif defined(__vxworks) typedef unsigned long pci_ulong; #define PCI_TO_LOCAL_ADDR(memaddr) (memaddr) @@ -176,7 +175,6 @@ return READ_LE0((volatile LERegister *)(((unsigned long)adrs)+off)); #define PORT_UNALIGNED(addr,port) \ ( (port)%4 ? ((addr) & 0xffff) : ((addr) & 4095) ) - #define UNIV_REV(base) (READ_LE(base,2*sizeof(LERegister)) & 0xff) #if defined(__rtems__) && 0 @@ -198,7 +196,6 @@ char buf[200]; } #endif - /* private printing wrapper */ static void uprintf(FILE *f, char *fmt, ...) @@ -468,7 +465,6 @@ unsigned long mode=0; #undef base } - static int showUniversePort( int ismaster, @@ -600,7 +596,6 @@ unsigned long cntrl, start, bound, offst, mask, x; return 0; } - static int mapOverAll(int ismaster, int (*func)(int,int,volatile LERegister *,void*), void *arg) { @@ -697,7 +692,6 @@ vmeUniverseReset(void) /* disable VME bus image of VME CSR */ vmeUniverseWriteReg(0, UNIV_REGOFF_VCSR_CTL); - /* I had problems with a Joerger vtr10012_8 card who would * only be accessible after tweaking the U2SPEC register * (the t27 parameter helped). @@ -1043,7 +1037,6 @@ unsigned long lvl,msk,lintstat,linten,status; UNIV_REGOFF_VINT_STAT); */ - /* re-enable the previous level */ vmeUniverseWriteReg(linten, UNIV_REGOFF_LINT_EN); } @@ -1123,7 +1116,6 @@ rtems_irq_connect_data aarrggh; return 0; } - int vmeUniverseInstallISR(unsigned long vector, VmeUniverseISR hdl, void *arg) { @@ -1185,5 +1177,4 @@ vmeUniverseIntDisable(unsigned int level) return 0; } - #endif diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h index 06ecffedf9..fc996dee04 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h +++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h @@ -203,7 +203,6 @@ typedef struct VmeUniverseDMAPacketRec_ { #define UNIV_REGOFF_D_LLUE 0x224 # define UNIV_D_LLUE_UPDATE (1<<31) - /* PCI (local) interrupt enable register */ #define UNIV_REGOFF_LINT_EN 0x300 # define UNIV_LINT_EN_LM3 (1<<23) /* location monitor 3 mask */ @@ -434,7 +433,6 @@ extern "C" { extern volatile LERegister *vmeUniverse0BaseAddr; extern int vmeUniverse0PciIrqLine; - /* Initialize the driver */ int vmeUniverseInit(void); @@ -636,7 +634,6 @@ vmeUniverseIntEnable(unsigned int level); int vmeUniverseIntDisable(unsigned int level); - /* use these special vectors to connect a handler to the * universe specific interrupts (such as "DMA done", * VOWN, error irqs etc.) -- cgit v1.2.3