patch-2.4.9 linux/drivers/acorn/block/mfmhd.c

• Lines: 27
• Date: Sun Aug 12 10:38:48 2001
• Orig file: v2.4.8/linux/drivers/acorn/block/mfmhd.c
• Orig date: Sat Apr 28 11:27:53 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/acorn/block/mfmhd.c linux/drivers/acorn/block/mfmhd.c
@@ -560,7 +560,7 @@
 		};
 	};			/* Result read */
 
-	/*console_printf ("mfm_rw_intr nearexit [%02X]\n", inb(mfm_IRQPollLoc)); */
+	/*console_printf ("mfm_rw_intr nearexit [%02X]\n", __raw_readb(mfm_IRQPollLoc)); */
 
 	/* If end of command move on */
 	if (mfm_status & (STAT_CED)) {
@@ -1425,7 +1425,7 @@
 		}
 
 		mfm_addr	= ecard_address(ecs, ECARD_IOC, ECARD_MEDIUM) + 0x800;
-		mfm_IRQPollLoc	= mfm_addr + 0x400;
+		mfm_IRQPollLoc	= ioaddr(mfm_addr + 0x400);
 		mfm_irqenable	= mfm_IRQPollLoc;
 		mfm_irq		= ecs->irq;
 		irqmask		= 0x08;
@@ -1444,7 +1444,7 @@
 
 	/* Stuff for the assembler routines to get to */
 	hdc63463_baseaddress	= ioaddr(mfm_addr);
-	hdc63463_irqpolladdress	= ioaddr(mfm_IRQPollLoc);
+	hdc63463_irqpolladdress	= mfm_IRQPollLoc;
 	hdc63463_irqpollmask	= irqmask;
 
 	blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), DEVICE_REQUEST);