UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

floppy: use symbolic register names in the powerpc port 

Now we can use FD_STATUS and FD_DATA instead of 4 or 5, let's do
this, and also use STATUS_DMA and STATUS_READY for the status bits.

Link: https://lore.kernel.org/r/20200331094054.24441-6-w@1wt.eu
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Denis Efremov <efremov@linux.com>
This commit is contained in:
Willy Tarreau 2020-03-31 11:40:36 +02:00 committed by Denis Efremov
parent 40b7d1b690
commit 7fd3463188
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/include/asm/floppy.h
View File

@ -61,21 +61,22 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id)
st = 1; st = 1;
for (lcount=virtual_dma_count, lptr=virtual_dma_addr; for (lcount=virtual_dma_count, lptr=virtual_dma_addr;
lcount; lcount--, lptr++) { lcount; lcount--, lptr++) {
st=inb(virtual_dma_port+4) & 0xa0 ; st = inb(virtual_dma_port + FD_STATUS);
if (st != 0xa0) st &= STATUS_DMA | STATUS_READY;
if (st != (STATUS_DMA | STATUS_READY))
break; break;
if (virtual_dma_mode) if (virtual_dma_mode)
outb_p(*lptr, virtual_dma_port+5); outb_p(*lptr, virtual_dma_port + FD_DATA);
else else
*lptr = inb_p(virtual_dma_port+5); *lptr = inb_p(virtual_dma_port + FD_DATA);
} }
virtual_dma_count = lcount; virtual_dma_count = lcount;
virtual_dma_addr = lptr; virtual_dma_addr = lptr;
st = inb(virtual_dma_port+4); st = inb(virtual_dma_port + FD_STATUS);
if (st == 0x20) if (st == STATUS_DMA)
return IRQ_HANDLED; return IRQ_HANDLED;
if (!(st & 0x20)) { if (!(st & STATUS_DMA)) {
virtual_dma_residue += virtual_dma_count; virtual_dma_residue += virtual_dma_count;
virtual_dma_count=0; virtual_dma_count=0;
doing_vdma = 0; doing_vdma = 0;