diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /include/asm-m68k/dvma.h | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'include/asm-m68k/dvma.h')
| -rw-r--r-- | include/asm-m68k/dvma.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/asm-m68k/dvma.h b/include/asm-m68k/dvma.h index b350911c6..afcb9b22b 100644 --- a/include/asm-m68k/dvma.h +++ b/include/asm-m68k/dvma.h @@ -14,18 +14,28 @@ #ifdef CONFIG_SUN3 /* sun3 dvma page support */ -/* memory and pmegs reserved for dvma */ +#define DVMA_RESERVED_PMEGS 2 /* 256k of dvma */ + +/* memory and pmegs potentially reserved for dvma */ #define DVMA_PMEG_START 10 #define DVMA_PMEG_END 16 #define DVMA_START 0xff00000 #define DVMA_END 0xffe0000 #define DVMA_SIZE (DVMA_END-DVMA_START) +/* empirical kludge -- dvma regions only seem to work right on 0x10000 + byte boundries */ +#define DVMA_REGION_SIZE 0x10000 +#define DVMA_ALIGN(addr) (((addr)+DVMA_REGION_SIZE-1) & \ + ~(DVMA_REGION_SIZE-1)) + + /* virt <-> phys conversions */ #define sun3_dvma_vtop(x) ((unsigned long)(x) & 0xffffff) #define sun3_dvma_ptov(x) ((unsigned long)(x) | 0xf000000) - -void *sun3_dvma_malloc(int len); + +extern void sun3_dvma_init(void); +extern void *sun3_dvma_malloc(int len); #else /* Sun3x */ /* Structure to describe the current status of DMA registers on the Sparc */ |