diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-10-18 13:18:24 +0000 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-10-18 13:18:24 +0000 |
| commit | 6279071abcde94145c118d5a0d8aa0e4e984f269 (patch) | |
| tree | 9c9fc4fceeb80e42fc699e27aff2910539b358af /arch/mips/jazz | |
| parent | 0a08859614d131b3b3ad61432cd3843e3d5f86ec (diff) | |
made floppy on jazz plattforms working again
Diffstat (limited to 'arch/mips/jazz')
| -rw-r--r-- | arch/mips/jazz/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/jazz/floppy-jazz.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile index 3134c05eb..f1edea030 100644 --- a/arch/mips/jazz/Makefile +++ b/arch/mips/jazz/Makefile @@ -13,7 +13,8 @@ all: jazz.o O_TARGET := jazz.o -O_OBJS := hw-access.o int-handler.o jazzdma.o reset.o rtc-jazz.o setup.o +O_OBJS := hw-access.o int-handler.o jazzdma.o reset.o rtc-jazz.o setup.o \ + floppy-jazz.o int-handler.o: int-handler.S diff --git a/arch/mips/jazz/floppy-jazz.c b/arch/mips/jazz/floppy-jazz.c index d4ee03262..92c1f9506 100644 --- a/arch/mips/jazz/floppy-jazz.c +++ b/arch/mips/jazz/floppy-jazz.c @@ -14,11 +14,11 @@ #include <linux/types.h> #include <linux/mm.h> #include <asm/addrspace.h> -#include <asm/vector.h> #include <asm/jazz.h> #include <asm/jazzdma.h> #include <asm/keyboard.h> #include <asm/pgtable.h> +#include <asm/floppy.h> static unsigned char jazz_fd_inb(unsigned int port) { @@ -108,7 +108,7 @@ extern inline int __get_order(unsigned long size) return order; } -extern inline unsigned long jazz_fd_dma_mem_alloc(unsigned long size) +static unsigned long jazz_fd_dma_mem_alloc(unsigned long size) { int order = __get_order(size); unsigned long mem; @@ -121,14 +121,14 @@ extern inline unsigned long jazz_fd_dma_mem_alloc(unsigned long size) return mem; } -extern inline void jazz_fd_dma_mem_free(unsigned long addr, +static void jazz_fd_dma_mem_free(unsigned long addr, unsigned long size) { - vdma_free(PHYSADDR(addr)); + vdma_free(vdma_phys2log(PHYSADDR(addr))); free_pages(addr, __get_order(size)); } -static void std_fd_drive_type(unsigned long n) +static unsigned long jazz_fd_drive_type(unsigned long n) { /* XXX This is wrong for machines with ED 2.88mb disk drives like the Olivetti M700. Anyway, we should suck this from the ARC |