patch-2.4.6 linux/include/asm-mips/jazzdma.h

Next file: linux/include/asm-mips/keyboard.h
Previous file: linux/include/asm-mips/irq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.5/linux/include/asm-mips/jazzdma.h linux/include/asm-mips/jazzdma.h
@@ -1,29 +1,28 @@
 /*
  * Helpfile for jazzdma.c -- Mips Jazz R4030 DMA controller support
- *
- * $Id:$
  */
-#ifndef __ASM_MIPS_JAZZDMA_H
-#define __ASM_MIPS_JAZZDMA_H
+#ifndef _ASM_JAZZDMA_H
+#define _ASM_JAZZDMA_H
 
 /*
  * Prototypes and macros
  */
-unsigned long vdma_init(unsigned long memory_start, unsigned long memory_end);
-unsigned long vdma_alloc(unsigned long paddr, unsigned long size);
-int vdma_free(unsigned long laddr);
-int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size);
-unsigned long vdma_phys2log(unsigned long paddr);
-unsigned long vdma_log2phys(unsigned long laddr);
-void vdma_stats(void);		/* for debugging only */
-
-void vdma_enable(int channel);
-void vdma_disable(int channel);
-void vdma_set_mode(int channel, int mode);
-void vdma_set_addr(int channel, long addr);
-void vdma_set_count(int channel, int count);
-int vdma_get_residue(int channel);
-int vdma_get_enable(int channel);
+extern void vdma_init(void);
+extern unsigned long vdma_alloc(unsigned long paddr, unsigned long size);
+extern int vdma_free(unsigned long laddr);
+extern int vdma_remap(unsigned long laddr, unsigned long paddr,
+                      unsigned long size);
+extern unsigned long vdma_phys2log(unsigned long paddr);
+extern unsigned long vdma_log2phys(unsigned long laddr);
+extern void vdma_stats(void);		/* for debugging only */
+
+extern void vdma_enable(int channel);
+extern void vdma_disable(int channel);
+extern void vdma_set_mode(int channel, int mode);
+extern void vdma_set_addr(int channel, long addr);
+extern void vdma_set_count(int channel, int count);
+extern int vdma_get_residue(int channel);
+extern int vdma_get_enable(int channel);
 
 /*
  * some definitions used by the driver functions
@@ -49,8 +48,7 @@
 /*
  * VDMA pagetable entry description
  */
-typedef volatile struct VDMA_PGTBL_ENTRY
-{
+typedef volatile struct VDMA_PGTBL_ENTRY {
 	unsigned int frame;		/* physical frame no. */
 	unsigned int owner;		/* owner of this entry (0=free) */
 } VDMA_PGTBL_ENTRY;
@@ -95,4 +93,4 @@
 #define R4030_MODE_BURST         (1<<6)	/* Rev. 2 only */
 #define R4030_MODE_FAST_ACK      (1<<7)	/* Rev. 2 only */
 
-#endif /* __ASM_MIPS_JAZZDMA_H */
+#endif /* _ASM_JAZZDMA_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)