diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-01-07 02:33:00 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-01-07 02:33:00 +0000 |
| commit | beb116954b9b7f3bb56412b2494b562f02b864b1 (patch) | |
| tree | 120e997879884e1b9d93b265221b939d2ef1ade1 /include/asm-mips/jazzdma.h | |
| parent | 908d4681a1dc3792ecafbe64265783a86c4cccb6 (diff) | |
Import of Linux/MIPS 2.1.14
Diffstat (limited to 'include/asm-mips/jazzdma.h')
| -rw-r--r-- | include/asm-mips/jazzdma.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/include/asm-mips/jazzdma.h b/include/asm-mips/jazzdma.h index 292a16177..c7f1730cf 100644 --- a/include/asm-mips/jazzdma.h +++ b/include/asm-mips/jazzdma.h @@ -1,14 +1,12 @@ /* * Helpfile for jazzdma.c -- Mips Jazz R4030 DMA controller support */ - -#ifndef __ASM_JAZZDMA_H -#define __ASM_JAZZDMA_H +#ifndef __ASM_MIPS_JAZZDMA_H +#define __ASM_MIPS_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); @@ -27,7 +25,6 @@ int vdma_get_residue(int channel); /* * some definitions used by the driver functions */ - #define VDMA_PAGESIZE 4096 #define VDMA_PGTBL_ENTRIES 4096 #define VDMA_PGTBL_SIZE (sizeof(VDMA_PGTBL_ENTRY) * VDMA_PGTBL_ENTRIES) @@ -44,13 +41,11 @@ int vdma_get_residue(int channel); * error code returned by vdma_alloc() * (See also arch/mips/kernel/jazzdma.c) */ - #define VDMA_ERROR 0xffffffff /* * VDMA pagetable entry description */ - typedef volatile struct VDMA_PGTBL_ENTRY { unsigned int frame; /* physical frame no. */ @@ -62,7 +57,6 @@ typedef volatile struct VDMA_PGTBL_ENTRY * DMA channel control registers * in the R4030 MCT_ADR chip */ - #define JAZZ_R4030_CHNL_MODE 0xE0000100 /* 8 DMA Channel Mode Registers, */ /* 0xE0000100,120,140... */ #define JAZZ_R4030_CHNL_ENABLE 0xE0000108 /* 8 DMA Channel Enable Regs, */ @@ -80,8 +74,9 @@ typedef volatile struct VDMA_PGTBL_ENTRY #define R4030_MEM_INTR (1<<9) #define R4030_ADDR_INTR (1<<10) -/* channel mode register bits */ - +/* + * Channel mode register bits + */ #define R4030_MODE_ATIME_40 (0) /* device access time on remote bus */ #define R4030_MODE_ATIME_80 (1) #define R4030_MODE_ATIME_120 (2) @@ -97,4 +92,4 @@ typedef volatile struct VDMA_PGTBL_ENTRY #define R4030_MODE_BURST (1<<6) /* Rev. 2 only */ #define R4030_MODE_FAST_ACK (1<<7) /* Rev. 2 only */ -#endif /* __ASM_JAZZDMA_H */ +#endif /* __ASM_MIPS_JAZZDMA_H */ |