diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
commit | 6128a4aa5e791ed4e0a655bfd346a52d92da7883 (patch) | |
tree | af53ca3f67ce405b6fbc6c98399c8e0c87e01a9e /c/src/lib/libbsp/shared/vmeUniverse | |
parent | 2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
download | rtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2 |
Remove stray white spaces.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c | 34 | ||||
-rw-r--r-- | c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h | 16 |
2 files changed, 25 insertions, 25 deletions
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c index 9a521446df..47c9d3d1d0 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c +++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c @@ -131,7 +131,7 @@ WRITE_LE( #warning "SYNC instruction unknown for this architecture" #endif -/* registers should be mapped to guarded, non-cached memory; hence +/* registers should be mapped to guarded, non-cached memory; hence * subsequent stores are ordered. eieio is only needed to enforce * ordering of loads with respect to stores. */ @@ -174,11 +174,11 @@ return READ_LE0((volatile LERegister *)(((unsigned long)adrs)+off)); } #define PORT_UNALIGNED(addr,port) \ - ( (port)%4 ? ((addr) & 0xffff) : ((addr) & 4095) ) + ( (port)%4 ? ((addr) & 0xffff) : ((addr) & 4095) ) #define UNIV_REV(base) (READ_LE(base,2*sizeof(LERegister)) & 0xff) - + #if defined(__rtems__) && 0 static int uprintk(char *fmt, va_list ap) @@ -213,7 +213,7 @@ va_list ap; * to a buffer. */ vprintk(fmt,ap); - } else + } else #endif { vfprintf(f,fmt,ap); @@ -440,7 +440,7 @@ unsigned long mode=0; */ if (ismaster) mode |= UNIV_MCTL_EN | UNIV_MCTL_PWEN | UNIV_MCTL_VDW64 | UNIV_MCTL_VCT; - else + else mode |= UNIV_SCTL_EN | UNIV_SCTL_PWEN | UNIV_SCTL_PREN; #ifdef TSILL @@ -521,7 +521,7 @@ showUniversePort( cntrl&UNIV_MCTL_PGM ? "Pgm" : "Dat", cntrl&UNIV_MCTL_SUPER ? "Sup" : "Usr"); } else { - uprintf(f,"%s %s %s %s", + uprintf(f,"%s %s %s %s", cntrl&UNIV_SCTL_PGM ? "Pgm," : " ", cntrl&UNIV_SCTL_DAT ? "Dat," : " ", cntrl&UNIV_SCTL_SUPER ? "Sup," : " ", @@ -614,7 +614,7 @@ int rval; uprintf(stderr,"unable to find the universe in pci config space\n"); return -1; } - rptr = (base + + rptr = (base + (ismaster ? UNIV_REGOFF_PCITGT0_CTRL : UNIV_REGOFF_VMESLV0_CTRL)/sizeof(LERegister)); #undef TSILL #ifdef TSILL @@ -629,7 +629,7 @@ int rval; /* only rev. 2 has 8 ports */ if (UNIV_REV(base)<2) return -1; - rptr = (base + + rptr = (base + (ismaster ? UNIV_REGOFF_PCITGT4_CTRL : UNIV_REGOFF_VMESLV4_CTRL)/sizeof(LERegister)); for (port=4; port<UNIV_NUM_MPORTS; port++) { if ((rval=func(ismaster,port,rptr,arg))) return rval; @@ -724,7 +724,7 @@ vmeUniverseReset(void) vmeUniverseDisableAllSlaves(); vmeUniverseDisableAllMasters(); - + vmeUniverseWriteReg(UNIV_VCSR_CLR_SYSFAIL, UNIV_REGOFF_VCSR_CLR); /* clear interrupt status bits */ @@ -955,14 +955,14 @@ register unsigned long status; * like this: * * - * VME IRQ ------ - * & ----- LINT_STAT ---- + * VME IRQ ------ + * & ----- LINT_STAT ---- * | & ---------- PCI LINE * | | - * | | - * LINT_EN --------------------------- + * | | + * LINT_EN --------------------------- * - * I.e. + * I.e. * - if LINT_EN is disabled, a VME IRQ will not set LINT_STAT. * - while LINT_STAT is set, it will pull the PCI line unless * masked by LINT_EN. @@ -999,7 +999,7 @@ unsigned long lvl,msk,lintstat,linten,status; /* try the special handler */ universeSpecialISR(); - /* + /* * let the pic end this cycle */ BSP_PIC_DO_EOI; @@ -1165,7 +1165,7 @@ vmeUniverseIntEnable(unsigned int level) if (!vmeUniverseIrqMgrInstalled || level<1 || level>7) return -1; vmeUniverseWriteReg( - (vmeUniverseReadReg(UNIV_REGOFF_LINT_EN) | + (vmeUniverseReadReg(UNIV_REGOFF_LINT_EN) | (UNIV_LINT_EN_VIRQ1 << (level-1)) ), UNIV_REGOFF_LINT_EN); @@ -1178,7 +1178,7 @@ vmeUniverseIntDisable(unsigned int level) if (!vmeUniverseIrqMgrInstalled || level<1 || level>7) return -1; vmeUniverseWriteReg( - (vmeUniverseReadReg(UNIV_REGOFF_LINT_EN) & + (vmeUniverseReadReg(UNIV_REGOFF_LINT_EN) & ~ (UNIV_LINT_EN_VIRQ1 << (level-1)) ), UNIV_REGOFF_LINT_EN); diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h index 6e62b9040f..06ecffedf9 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h +++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h @@ -361,7 +361,7 @@ typedef struct VmeUniverseDMAPacketRec_ { /* Location Monitor control register */ #define UNIV_REGOFF_LM_CTL 0xf64 -# define UNIV_LM_CTL_EN (1<<31) /* image enable */ +# define UNIV_LM_CTL_EN (1<<31) /* image enable */ # define UNIV_LM_CTL_PGM (1<<23) /* program AM */ # define UNIV_LM_CTL_DATA (1<<22) /* data AM */ # define UNIV_LM_CTL_SUPER (1<<21) /* supervisor AM */ @@ -375,7 +375,7 @@ typedef struct VmeUniverseDMAPacketRec_ { /* VMEbus register access image control register */ #define UNIV_REGOFF_VRAI_CTL 0xf70 -# define UNIV_VRAI_CTL_EN (1<<31) /* image enable */ +# define UNIV_VRAI_CTL_EN (1<<31) /* image enable */ # define UNIV_VRAI_CTL_PGM (1<<23) /* program AM */ # define UNIV_VRAI_CTL_DATA (1<<22) /* data AM */ # define UNIV_VRAI_CTL_SUPER (1<<21) /* supervisor AM */ @@ -453,7 +453,7 @@ vmeUniverseReset(void); * #include <vmeUniverse.h> */ #ifdef _VME_UNIVERSE_DECLARE_SHOW_ROUTINES -/* print the current configuration of all master ports to +/* print the current configuration of all master ports to * f (stderr if NULL) */ void @@ -638,7 +638,7 @@ vmeUniverseIntDisable(unsigned int level); /* use these special vectors to connect a handler to the - * universe specific interrupts (such as "DMA done", + * universe specific interrupts (such as "DMA done", * VOWN, error irqs etc.) * NOTE: The wrapper clears all status LINT bits (except * for regular VME irqs). Also note that it is the user's @@ -649,7 +649,7 @@ vmeUniverseIntDisable(unsigned int level); * DO NOT CHANGE THE ORDER OF THESE VECTORS - THE DRIVER * DEPENDS ON IT * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - * + * */ #define UNIV_VOWN_INT_VEC 256 #define UNIV_DMA_INT_VEC 257 @@ -674,7 +674,7 @@ vmeUniverseIntDisable(unsigned int level); * (VME) interrupts to 8 different lines (some of) which may be hooked up * in a (board specific) way to a PIC. * - * This driver only supports at most two lines. It routes the 7 VME + * This driver only supports at most two lines. It routes the 7 VME * interrupts to the main line and optionally, it routes the 'special' * interrupts generated by the universe itself (DMA done, VOWN etc.) * to a second line. If no second line is available, all IRQs are routed @@ -689,7 +689,7 @@ vmeUniverseIntDisable(unsigned int level); * are wired. * Optionally, the first PIC input line can be read from PCI config space * but the second must be passed to this routine. Note that the info read - * from PCI config space is wrong for many boards! + * from PCI config space is wrong for many boards! * * PARAMETERS: * vmeIrqUnivOut: to which output pin (of the universe) should the 7 @@ -705,7 +705,7 @@ vmeUniverseIntDisable(unsigned int level); * the PIC is determined by reading PCI config space. * * RETURNS: 0 on success, -1 on failure. - * + * */ int vmeUniverseInstallIrqMgr(int vmeIrqUnivOut, |