Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv16661/include/asm-mips
Modified Files:
au1000_dma.h
Log Message:
Au1000 sound updates.
Index: au1000_dma.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000_dma.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- au1000_dma.h 2001/11/06 20:23:55 1.5
+++ au1000_dma.h 2001/11/08 18:03:18 1.6
@@ -337,22 +337,15 @@
}
/*
- * Returns which buffer has its done bit set in the mode register.
- * Returns -1 if neither or both done bits set.
+ * Returns the buffer done bits.
*/
-static __inline__ int get_dma_buffer_done(unsigned int dmanr)
+static __inline__ unsigned int get_dma_buffer_done(unsigned int dmanr)
{
- unsigned int mode;
struct dma_chan *chan = get_dma_chan(dmanr);
if (!chan)
return 0;
- mode = inl(chan->io + DMA_MODE_SET);
- if (!(mode & (DMA_D0 | DMA_D1)) ||
- (mode & (DMA_D0 | DMA_D1)) == (DMA_D0 | DMA_D1))
- return -1;
-
- return (mode & DMA_D0) ? 0 : 1;
+ return inl(chan->io + DMA_MODE_SET) & (DMA_D0 | DMA_D1);
}
|
