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/vmeUniverse/vmeUniverse.c | 9 --------- c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h | 3 --- 2 files changed, 12 deletions(-) (limited to 'c/src/lib/libbsp/shared/vmeUniverse') 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