From cd352267d7d4e05933ae40e50fed2beff0b9584a Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 15 Jul 2007 14:52:16 +0100 Subject: [PATCH] --- yaml --- r: 62638 b: refs/heads/master c: 21d1ca04532005c50ed57c2b2948e465b2e90720 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/floppy.h | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 14fb8598ad52..282e9bc89132 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ad2cdbd0eaf0ddb3f634d10d01a2710b00b2051 +refs/heads/master: 21d1ca04532005c50ed57c2b2948e465b2e90720 diff --git a/trunk/include/asm-arm/floppy.h b/trunk/include/asm-arm/floppy.h index 54b5ae44ed94..d595c15166a4 100644 --- a/trunk/include/asm-arm/floppy.h +++ b/trunk/include/asm-arm/floppy.h @@ -30,15 +30,21 @@ #define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK) #define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK) +static inline int fd_dma_setup(void *data, unsigned int length, + unsigned int mode, unsigned long addr) +{ + set_dma_mode(DMA_FLOPPY, mode); + __set_dma_addr(DMA_FLOPPY, data); + set_dma_count(DMA_FLOPPY, length); + virtual_dma_port = addr; + enable_dma(DMA_FLOPPY); + return 0; +} +#define fd_dma_setup fd_dma_setup + #define fd_request_dma() request_dma(DMA_FLOPPY,"floppy") #define fd_free_dma() free_dma(DMA_FLOPPY) #define fd_disable_dma() disable_dma(DMA_FLOPPY) -#define fd_enable_dma() enable_dma(DMA_FLOPPY) -#define fd_clear_dma_ff() clear_dma_ff(DMA_FLOPPY) -#define fd_set_dma_mode(mode) set_dma_mode(DMA_FLOPPY, (mode)) -#define fd_set_dma_addr(addr) set_dma_addr(DMA_FLOPPY, virt_to_bus((addr))) -#define fd_set_dma_count(len) set_dma_count(DMA_FLOPPY, (len)) -#define fd_cacheflush(addr,sz) /* need to clean up dma.h */ #define DMA_FLOPPYDISK DMA_FLOPPY