Commit 6ebaf254 authored by Dave Jones's avatar Dave Jones Committed by James Bottomley

[PATCH] fdomain isa_ API conversion.

parent 4a4c620f
...@@ -725,13 +725,13 @@ static int fdomain_isa_detect( int *irq, int *iobase ) ...@@ -725,13 +725,13 @@ static int fdomain_isa_detect( int *irq, int *iobase )
switch (Quantum) { switch (Quantum) {
case 2: /* ISA_200S */ case 2: /* ISA_200S */
case 3: /* ISA_250MG */ case 3: /* ISA_250MG */
base = readb(bios_base + 0x1fa2) + (readb(bios_base + 0x1fa3) << 8); base = isa_readb(bios_base + 0x1fa2) + (isa_readb(bios_base + 0x1fa3) << 8);
break; break;
case 4: /* ISA_200S (another one) */ case 4: /* ISA_200S (another one) */
base = readb(bios_base + 0x1fa3) + (readb(bios_base + 0x1fa4) << 8); base = isa_readb(bios_base + 0x1fa3) + (isa_readb(bios_base + 0x1fa4) << 8);
break; break;
default: default:
base = readb(bios_base + 0x1fcc) + (readb(bios_base + 0x1fcd) << 8); base = isa_readb(bios_base + 0x1fcc) + (isa_readb(bios_base + 0x1fcd) << 8);
break; break;
} }
...@@ -1777,7 +1777,7 @@ static int fdomain_16x0_biosparam(struct scsi_device *sdev, ...@@ -1777,7 +1777,7 @@ static int fdomain_16x0_biosparam(struct scsi_device *sdev,
offset = bios_base + 0x1f31 + drive * 25; offset = bios_base + 0x1f31 + drive * 25;
break; break;
} }
memcpy_fromio( &i, offset, sizeof( struct drive_info ) ); isa_memcpy_fromio( &i, offset, sizeof( struct drive_info ) );
info_array[0] = i.heads; info_array[0] = i.heads;
info_array[1] = i.sectors; info_array[1] = i.sectors;
info_array[2] = i.cylinders; info_array[2] = i.cylinders;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment