diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/arm/kernel/dma-arc.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/arm/kernel/dma-arc.c')
| -rw-r--r-- | arch/arm/kernel/dma-arc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/kernel/dma-arc.c b/arch/arm/kernel/dma-arc.c index 9be27bdae..53ef12b1c 100644 --- a/arch/arm/kernel/dma-arc.c +++ b/arch/arm/kernel/dma-arc.c @@ -15,8 +15,11 @@ #include "dma.h" +#define DEBUG + int arch_request_dma(dmach_t channel, dma_t *dma, const char * dev_id) { + printk("arch_request_dma channel=%d F0=%d F1=%d\n",channel,DMA_VIRTUAL_FLOPPY0,DMA_VIRTUAL_FLOPPY1); if (channel == DMA_VIRTUAL_FLOPPY0 || channel == DMA_VIRTUAL_FLOPPY1) return 0; @@ -30,8 +33,9 @@ void arch_free_dma(dmach_t channel, dma_t *dma) void arch_enable_dma(dmach_t channel, dma_t *dma) { + printk("arch_enable_dma channel=%d F0=%d F1=%d\n",channel,DMA_VIRTUAL_FLOPPY0,DMA_VIRTUAL_FLOPPY1); switch (channel) { -#ifdef CONFIG_BLK_DEV_FD +#ifdef CONFIG_BLK_DEV_FD1772 case DMA_VIRTUAL_FLOPPY0: { /* Data DMA */ switch (dma->dma_mode) { case DMA_MODE_READ: /* read */ @@ -100,7 +104,7 @@ void arch_enable_dma(dmach_t channel, dma_t *dma) int arch_get_dma_residue(dmach_t channel, dma_t *dma) { switch (channel) { -#ifdef CONFIG_BLK_DEV_FD +#ifdef CONFIG_BLK_DEV_FD1772 case DMA_VIRTUAL_FLOPPY0: { /* Data DMA */ extern unsigned int fdc1772_bytestogo; @@ -139,7 +143,7 @@ int arch_set_dma_speed(dmach_t channel, dma_t *dma, int cycle_ns) return 0; } -__initfunc(void arch_dma_init(dma_t *dma)) +void __init arch_dma_init(dma_t *dma) { dma[DMA_VIRTUAL_FLOPPY0].dma_irq = 64; dma[DMA_VIRTUAL_FLOPPY1].dma_irq = 65; |