diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 17:57:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 17:57:09 +0000 |
| commit | a62a0f262e0179df8c632f529c95abf54ef78332 (patch) | |
| tree | 80e6a7a7d407d08e218332bb3fcccdaf9f28fcc1 /include/asm-i386/floppy.h | |
| parent | fd095d09f2d475dc2e8599b1b8bae1cd65e91685 (diff) | |
Part #2 merging back my changes ...
Diffstat (limited to 'include/asm-i386/floppy.h')
| -rw-r--r-- | include/asm-i386/floppy.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/include/asm-i386/floppy.h b/include/asm-i386/floppy.h index 0a7cf8563..eb7272ef6 100644 --- a/include/asm-i386/floppy.h +++ b/include/asm-i386/floppy.h @@ -9,23 +9,26 @@ #define fd_inb(port) inb_p(port) #define fd_outb(port,value) outb_p(port,value) -#define fd_enable_dma() SW._enable_dma(FLOPPY_DMA) -#define fd_disable_dma() SW._disable_dma(FLOPPY_DMA) -#define fd_request_dma() SW._request_dma(FLOPPY_DMA,"floppy") -#define fd_free_dma() SW._free_dma(FLOPPY_DMA) -#define fd_clear_dma_ff() SW._clear_dma_ff(FLOPPY_DMA) -#define fd_set_dma_mode(mode) SW._set_dma_mode(FLOPPY_DMA,mode) -#define fd_set_dma_addr(addr) SW._set_dma_addr(FLOPPY_DMA,addr) -#define fd_set_dma_count(count) SW._set_dma_count(FLOPPY_DMA,count) -#define fd_enable_irq() enable_irq(FLOPPY_IRQ) -#define fd_disable_irq() disable_irq(FLOPPY_IRQ) -#define fd_cacheflush(addr,size) /* nothing */ -#define fd_request_irq() SW._request_irq(FLOPPY_IRQ, floppy_interrupt, \ - SA_INTERRUPT|SA_SAMPLE_RANDOM, \ - "floppy", NULL) -#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) -#define fd_get_dma_residue() SW._get_dma_residue(FLOPPY_DMA) -#define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) +#define fd_enable_dma(channel) SW._enable_dma(channel) +#define fd_disable_dma(channel) SW._disable_dma(channel) +#define fd_request_dma(channel) SW._request_dma(channel, "floppy") +#define fd_free_dma(channel) SW._free_dma(channel) +#define fd_clear_dma_ff(channel) SW._clear_dma_ff(channel) +#define fd_set_dma_mode(channel,mode) SW._set_dma_mode(channel, mode) +#define fd_set_dma_addr(channel,addr) SW._set_dma_addr(channel, addr) +#define fd_set_dma_count(channel,count) SW._set_dma_count(channel ,count) +#define fd_enable_irq(irq) enable_irq(irq) +#define fd_disable_irq(irq) disable_irq(irq) +#define fd_cacheflush(addr,size) /* nothing */ +#define fd_request_irq(irq) SW._request_irq(irq, \ + floppy_interrupt, \ + SA_INTERRUPT \ + | SA_SAMPLE_RANDOM, \ + "floppy", NULL) +#define fd_free_irq(irq) free_irq(irq, NULL) +#define fd_get_dma_residue(channel) SW._get_dma_residue(channel) + +#define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) #define fd_dma_mem_free(addr,size) SW._dma_mem_free(addr,size) static int virtual_dma_count=0; |