diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-30 05:27:08 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-30 05:27:08 +0000 |
commit | 023f1dd9275f19a97cfcace4ea224e594db063bc (patch) | |
tree | a3383a92e94267a605608137de358c813cd53cd7 /c/src/lib/libcpu/m68k/mcf548x | |
parent | Whitespace removal. (diff) | |
download | rtems-023f1dd9275f19a97cfcace4ea224e594db063bc.tar.bz2 |
Whitespace removal.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h | 24 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dmaApi.c | 14 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasks.c | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.c | 12 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.c | 4 |
5 files changed, 28 insertions, 28 deletions
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h b/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h index 54529b696a..ea6f8863cb 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h +++ b/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h @@ -294,53 +294,53 @@ int MCD_startDma ( u32 funcDesc /* a description of byte swapping, bit swapping, and CRC actions */ ); -/* - * MCD_initDma() initializes the DMA API by setting up a pointer to the DMA - * registers, relocating and creating the appropriate task structures, and +/* + * MCD_initDma() initializes the DMA API by setting up a pointer to the DMA + * registers, relocating and creating the appropriate task structures, and * setting up some global settings */ int MCD_initDma (dmaRegs *sDmaBarAddr, void *taskTableDest, u32 flags); -/* +/* * MCD_dmaStatus() returns the status of the DMA on the requested channel. */ int MCD_dmaStatus (int channel); -/* +/* * MCD_XferProgrQuery() returns progress of DMA on requested channel */ int MCD_XferProgrQuery (int channel, MCD_XferProg *progRep); -/* +/* * MCD_killDma() halts the DMA on the requested channel, without any * intention of resuming the DMA. */ int MCD_killDma (int channel); -/* +/* * MCD_continDma() continues a DMA which as stopped due to encountering an * unready buffer descriptor. */ int MCD_continDma (int channel); -/* +/* * MCD_pauseDma() pauses the DMA on the given channel ( if any DMA is - * running on that channel). + * running on that channel). */ int MCD_pauseDma (int channel); -/* +/* * MCD_resumeDma() resumes the DMA on a given channel (if any DMA is * running on that channel). */ int MCD_resumeDma (int channel); -/* +/* * MCD_csumQuery provides the checksum/CRC after performing a non-chained DMA */ int MCD_csumQuery (int channel, u32 *csum); -/* +/* * MCD_getCodeSize provides the packed size required by the microcoded task * and structures. */ diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dmaApi.c b/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dmaApi.c index 839fce1526..c3489c6b66 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dmaApi.c +++ b/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dmaApi.c @@ -246,9 +246,9 @@ int MCD_initDma (dmaRegs *dmaBarAddr, void *taskTableDest, u32 flags) entryPtr[i].TDTend = (u32)taskDescTabsOffset - 4; } #ifdef MCD_INCLUDE_EU /* Tack single DMA BDs onto end of code so API controls - where they are since DMA might write to them */ + where they are since DMA might write to them */ MCD_relocBuffDesc = (MCD_bufDesc*)(entryPtr[NUMOFVARIANTS - 1].TDTend + 4); -#else /* DMA does not touch them so they can be wherever and we don't need to +#else /* DMA does not touch them so they can be wherever and we don't need to waste SRAM on them */ MCD_relocBuffDesc = MCD_singleBufDescs; #endif @@ -379,14 +379,14 @@ int MCD_startDma ( if((channel < 0) || (channel >= NCHANNELS)) return(MCD_CHANNEL_INVALID); - - /* tbd - need to determine the proper response to a bad funcDesc when not + + /* tbd - need to determine the proper response to a bad funcDesc when not including EU functions, for now, assign a benign funcDesc, but maybe should return an error */ #ifndef MCD_INCLUDE_EU funcDesc = MCD_FUNC_NOEU1; #endif - + #ifdef MCD_DEBUG printf("startDma:Setting up params\n"); #endif @@ -562,7 +562,7 @@ printf("startDma:Setting up params\n"); * Notes: * MCD_XferProgrQuery() upon completing or after aborting a DMA, or * while the DMA is in progress, this function returns the first - * DMA-destination address not (or not yet) used in the DMA. When + * DMA-destination address not (or not yet) used in the DMA. When * encountering a non-ready buffer descriptor, the information for * the last completed descriptor is returned. * @@ -808,7 +808,7 @@ int MCD_continDma (int channel) * this means that bits 14 and 0 must enable debug functions before * bits 1 and 2, respectively, have any effect. * - * NOTE: It's extremely important to not pause more than one DMA channel + * NOTE: It's extremely important to not pause more than one DMA channel * at a time. ********************************************************************/ diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasks.c b/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasks.c index 76e8e37805..b184d099a1 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasks.c +++ b/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasks.c @@ -1982,7 +1982,7 @@ u32 MCD_modelTaskTableSrc[]= 0x00000000, 0x00000000, 0x00000000, -#endif +#endif (u32)MCD_ENetRcv_TDT, (u32)&((u8*)MCD_ENetRcv_TDT)[0x0000009c], 0x00000000, diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.c b/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.c index fd651b27ac..7b1761b88c 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.c +++ b/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.c @@ -18,7 +18,7 @@ extern dmaRegs *MCD_dmaBar; /* * Task 0 */ - + void MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, int xferSize, short xferSizeIncr, int *cSave, volatile TaskTableEntry *taskTable, int channel) { @@ -55,7 +55,7 @@ void MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, int xfer /* * Task 1 */ - + void MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel) { @@ -85,7 +85,7 @@ void MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, short /* * Task 2 */ - + void MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, int xferSize, short xferSizeIncr, int *cSave, volatile TaskTableEntry *taskTable, int channel) { @@ -125,7 +125,7 @@ void MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, int xferSi /* * Task 3 */ - + void MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, short destIncr, int dmaSize, short xferSizeIncr, int flags, int *currBD, int *cSave, volatile TaskTableEntry *taskTable, int channel) { @@ -159,7 +159,7 @@ void MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, short d /* * Task 4 */ - + void MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, volatile TaskTableEntry *taskTable, int channel) { @@ -189,7 +189,7 @@ void MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, volatile /* * Task 5 */ - + void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, volatile TaskTableEntry *taskTable, int channel) { diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.c b/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.c index a5c45c5445..193d7bb2bc 100644 --- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.c +++ b/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.c @@ -216,10 +216,10 @@ void mcdma_glue_init &old_handler)) { rtems_panic ("Can't attach MFC548x MCDma interrupt handler\n"); } - MCF548X_INTC_ICRn(MCDMA_IRQ_VECTOR - 64) = + MCF548X_INTC_ICRn(MCDMA_IRQ_VECTOR - 64) = MCF548X_INTC_ICRn_IL(MCDMA_IRQ_LEVEL) | MCF548X_INTC_ICRn_IP(MCDMA_IRQ_PRIORITY); - + MCF548X_INTC_IMRH &= ~(1 << (MCDMA_IRQ_VECTOR % 32)); } } |