hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/powerpc/include/asm/floppy.h
....@@ -13,8 +13,8 @@
1313
1414 #include <asm/machdep.h>
1515
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))
1818
1919 #define fd_enable_dma() enable_dma(FLOPPY_DMA)
2020 #define fd_disable_dma() fd_ops->_disable_dma(FLOPPY_DMA)
....@@ -61,21 +61,22 @@
6161 st = 1;
6262 for (lcount=virtual_dma_count, lptr=virtual_dma_addr;
6363 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))
6667 break;
6768 if (virtual_dma_mode)
68
- outb_p(*lptr, virtual_dma_port+5);
69
+ outb_p(*lptr, virtual_dma_port + FD_DATA);
6970 else
70
- *lptr = inb_p(virtual_dma_port+5);
71
+ *lptr = inb_p(virtual_dma_port + FD_DATA);
7172 }
7273 virtual_dma_count = lcount;
7374 virtual_dma_addr = lptr;
74
- st = inb(virtual_dma_port+4);
75
+ st = inb(virtual_dma_port + FD_STATUS);
7576
76
- if (st == 0x20)
77
+ if (st == STATUS_DMA)
7778 return IRQ_HANDLED;
78
- if (!(st & 0x20)) {
79
+ if (!(st & STATUS_DMA)) {
7980 virtual_dma_residue += virtual_dma_count;
8081 virtual_dma_count=0;
8182 doing_vdma = 0;