| .. | .. |
|---|
| 13 | 13 | |
|---|
| 14 | 14 | #include <asm/machdep.h> |
|---|
| 15 | 15 | |
|---|
| 16 | | -#define fd_inb(port) inb_p(port) |
|---|
| 17 | | -#define fd_outb(value,port) outb_p(value,port) |
|---|
| 16 | +#define fd_inb(base, reg) inb_p((base) + (reg)) |
|---|
| 17 | +#define fd_outb(value, base, reg) outb_p(value, (base) + (reg)) |
|---|
| 18 | 18 | |
|---|
| 19 | 19 | #define fd_enable_dma() enable_dma(FLOPPY_DMA) |
|---|
| 20 | 20 | #define fd_disable_dma() fd_ops->_disable_dma(FLOPPY_DMA) |
|---|
| .. | .. |
|---|
| 61 | 61 | st = 1; |
|---|
| 62 | 62 | for (lcount=virtual_dma_count, lptr=virtual_dma_addr; |
|---|
| 63 | 63 | lcount; lcount--, lptr++) { |
|---|
| 64 | | - st=inb(virtual_dma_port+4) & 0xa0 ; |
|---|
| 65 | | - if (st != 0xa0) |
|---|
| 64 | + st = inb(virtual_dma_port + FD_STATUS); |
|---|
| 65 | + st &= STATUS_DMA | STATUS_READY; |
|---|
| 66 | + if (st != (STATUS_DMA | STATUS_READY)) |
|---|
| 66 | 67 | break; |
|---|
| 67 | 68 | if (virtual_dma_mode) |
|---|
| 68 | | - outb_p(*lptr, virtual_dma_port+5); |
|---|
| 69 | + outb_p(*lptr, virtual_dma_port + FD_DATA); |
|---|
| 69 | 70 | else |
|---|
| 70 | | - *lptr = inb_p(virtual_dma_port+5); |
|---|
| 71 | + *lptr = inb_p(virtual_dma_port + FD_DATA); |
|---|
| 71 | 72 | } |
|---|
| 72 | 73 | virtual_dma_count = lcount; |
|---|
| 73 | 74 | virtual_dma_addr = lptr; |
|---|
| 74 | | - st = inb(virtual_dma_port+4); |
|---|
| 75 | + st = inb(virtual_dma_port + FD_STATUS); |
|---|
| 75 | 76 | |
|---|
| 76 | | - if (st == 0x20) |
|---|
| 77 | + if (st == STATUS_DMA) |
|---|
| 77 | 78 | return IRQ_HANDLED; |
|---|
| 78 | | - if (!(st & 0x20)) { |
|---|
| 79 | + if (!(st & STATUS_DMA)) { |
|---|
| 79 | 80 | virtual_dma_residue += virtual_dma_count; |
|---|
| 80 | 81 | virtual_dma_count=0; |
|---|
| 81 | 82 | doing_vdma = 0; |
|---|