Skip to content

Commit

Permalink
CRISv10: Trivial fixes.
Browse files Browse the repository at this point in the history
- Removed CVS id tag.
- Formatting fixes

Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
  • Loading branch information
Jesper Nilsson committed May 25, 2010
1 parent d708b41 commit 2f941a1
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions arch/cris/arch-v10/lib/dmacopy.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* $Id: dmacopy.c,v 1.1 2001/12/17 13:59:27 bjornw Exp $
*
/*
* memcpy for large blocks, using memory-memory DMA channels 6 and 7 in Etrax
*/

Expand All @@ -13,11 +12,11 @@ void *dma_memcpy(void *pdst,
unsigned int pn)
{
static etrax_dma_descr indma, outdma;
D(printk("dma_memcpy %d bytes... ", pn));

D(printk(KERN_DEBUG "dma_memcpy %d bytes... ", pn));

#if 0
*R_GEN_CONFIG = genconfig_shadow =
*R_GEN_CONFIG = genconfig_shadow =
(genconfig_shadow & ~0x3c0000) |
IO_STATE(R_GEN_CONFIG, dma6, intdma7) |
IO_STATE(R_GEN_CONFIG, dma7, intdma6);
Expand All @@ -32,11 +31,11 @@ void *dma_memcpy(void *pdst,
*R_DMA_CH7_FIRST = &outdma;
*R_DMA_CH6_CMD = IO_STATE(R_DMA_CH6_CMD, cmd, start);
*R_DMA_CH7_CMD = IO_STATE(R_DMA_CH7_CMD, cmd, start);

while(*R_DMA_CH7_CMD == 1) /* wait for completion */ ;

D(printk("done\n"));
while (*R_DMA_CH7_CMD == 1)
/* wait for completion */;

D(printk(KERN_DEBUG "done\n"));
}


Expand Down

0 comments on commit 2f941a1

Please sign in to comment.