Skip to content

L
linux
Commit 48502560 authored by Ondrej Zary's avatar Ondrej Zary Committed by Martin K. Petersen
Browse files
Options

atp870u: Convert is880() to use wrappers 

Subtract 0x40 to use _io access wrappers.  Now it's obvious that is870()
and is880() are very similar.
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Reviewed-by: default avatarHannes Reinicke <hare@suse.de>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 152c3ac5
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 176 deletions
drivers/scsi/atp870u.c
View file @ 48502560
...@@ -1594,7 +1594,7 @@ static void is870(struct atp_unit *dev) ...@@ -1594,7 +1594,7 @@ static void is870(struct atp_unit *dev)
atp_writeb_io(dev, 0, 0x3a, atp_readb_io(dev, 0, 0x3a) & 0xef); atp_writeb_io(dev, 0, 0x3a, atp_readb_io(dev, 0, 0x3a) & 0xef);
} }
static void is880(struct atp_unit *dev, unsigned int wkport) static void is880(struct atp_unit *dev)
{ {
unsigned char i, j, k, rmb, n, lvdmode; unsigned char i, j, k, rmb, n, lvdmode;
unsigned short int m; unsigned short int m;
...@@ -1608,7 +1608,7 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1608,7 +1608,7 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
static unsigned char wide[6] = { 0x80, 1, 2, 3, 1, 0 }; static unsigned char wide[6] = { 0x80, 1, 2, 3, 1, 0 };
static unsigned char u3[9] = { 0x80, 1, 6, 4, 0x09, 00, 0x0e, 0x01, 0x02 }; static unsigned char u3[9] = { 0x80, 1, 6, 4, 0x09, 00, 0x0e, 0x01, 0x02 };
lvdmode = inb(wkport + 0x3f) & 0x40; lvdmode = atp_readb_base(dev, 0x3f) & 0x40;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
m = 1; m = 1;
...@@ -1620,100 +1620,100 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1620,100 +1620,100 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
printk(KERN_INFO " ID: %2d Host Adapter\n", dev->host_id[0]); printk(KERN_INFO " ID: %2d Host Adapter\n", dev->host_id[0]);
continue; continue;
} }
outb(0x01, wkport + 0x5b); atp_writeb_io(dev, 0, 0x1b, 0x01);
outb(0x08, wkport + 0x41); atp_writeb_io(dev, 0, 1, 0x08);
outb(0x7f, wkport + 0x42); atp_writeb_io(dev, 0, 2, 0x7f);
outb(satn[0], wkport + 0x43); atp_writeb_io(dev, 0, 3, satn[0]);
outb(satn[1], wkport + 0x44); atp_writeb_io(dev, 0, 4, satn[1]);
outb(satn[2], wkport + 0x45); atp_writeb_io(dev, 0, 5, satn[2]);
outb(satn[3], wkport + 0x46); atp_writeb_io(dev, 0, 6, satn[3]);
outb(satn[4], wkport + 0x47); atp_writeb_io(dev, 0, 7, satn[4]);
outb(satn[5], wkport + 0x48); atp_writeb_io(dev, 0, 8, satn[5]);
outb(0, wkport + 0x4f); atp_writeb_io(dev, 0, 0x0f, 0);
outb(dev->id[0][i].devsp, wkport + 0x51); atp_writeb_io(dev, 0, 0x11, dev->id[0][i].devsp);
outb(0, wkport + 0x52); atp_writeb_io(dev, 0, 0x12, 0);
outb(satn[6], wkport + 0x53); atp_writeb_io(dev, 0, 0x13, satn[6]);
outb(satn[7], wkport + 0x54); atp_writeb_io(dev, 0, 0x14, satn[7]);
j = i; j = i;
if ((j & 0x08) != 0) { if ((j & 0x08) != 0) {
j = (j & 0x07) | 0x40; j = (j & 0x07) | 0x40;
} }
outb(j, wkport + 0x55); atp_writeb_io(dev, 0, 0x15, j);
outb(satn[8], wkport + 0x58); atp_writeb_io(dev, 0, 0x18, satn[8]);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if (inb(wkport + 0x57) != 0x11 && inb(wkport + 0x57) != 0x8e) if (atp_readb_io(dev, 0, 0x17) != 0x11 && atp_readb_io(dev, 0, 0x17) != 0x8e)
continue; continue;
while (inb(wkport + 0x57) != 0x8e) while (atp_readb_io(dev, 0, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
dev->active_id[0] |= m; dev->active_id[0] |= m;
outb(0x30, wkport + 0x50); atp_writeb_io(dev, 0, 0x10, 0x30);
outb(0x00, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x00);
phase_cmd: phase_cmd:
outb(0x08, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x08);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x57); j = atp_readb_io(dev, 0, 0x17);
if (j != 0x16) { if (j != 0x16) {
outb(0x41, wkport + 0x50); atp_writeb_io(dev, 0, 0x10, 0x41);
goto phase_cmd; goto phase_cmd;
} }
sel_ok: sel_ok:
outb(inqd[0], wkport + 0x43); atp_writeb_io(dev, 0, 3, inqd[0]);
outb(inqd[1], wkport + 0x44); atp_writeb_io(dev, 0, 4, inqd[1]);
outb(inqd[2], wkport + 0x45); atp_writeb_io(dev, 0, 5, inqd[2]);
outb(inqd[3], wkport + 0x46); atp_writeb_io(dev, 0, 6, inqd[3]);
outb(inqd[4], wkport + 0x47); atp_writeb_io(dev, 0, 7, inqd[4]);
outb(inqd[5], wkport + 0x48); atp_writeb_io(dev, 0, 8, inqd[5]);
outb(0, wkport + 0x4f); atp_writeb_io(dev, 0, 0x0f, 0);
outb(dev->id[0][i].devsp, wkport + 0x51); atp_writeb_io(dev, 0, 0x11, dev->id[0][i].devsp);
outb(0, wkport + 0x52); atp_writeb_io(dev, 0, 0x12, 0);
outb(inqd[6], wkport + 0x53); atp_writeb_io(dev, 0, 0x13, inqd[6]);
outb(inqd[7], wkport + 0x54); atp_writeb_io(dev, 0, 0x14, inqd[7]);
outb(inqd[8], wkport + 0x58); atp_writeb_io(dev, 0, 0x18, inqd[8]);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if (inb(wkport + 0x57) != 0x11 && inb(wkport + 0x57) != 0x8e) if (atp_readb_io(dev, 0, 0x17) != 0x11 && atp_readb_io(dev, 0, 0x17) != 0x8e)
continue; continue;
while (inb(wkport + 0x57) != 0x8e) while (atp_readb_io(dev, 0, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
outb(0x00, wkport + 0x5b); atp_writeb_io(dev, 0, 0x1b, 0x00);
outb(0x08, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x08);
j = 0; j = 0;
rd_inq_data: rd_inq_data:
k = inb(wkport + 0x5f); k = atp_readb_io(dev, 0, 0x1f);
if ((k & 0x01) != 0) { if ((k & 0x01) != 0) {
mbuf[j++] = inb(wkport + 0x59); mbuf[j++] = atp_readb_io(dev, 0, 0x19);
goto rd_inq_data; goto rd_inq_data;
} }
if ((k & 0x80) == 0) { if ((k & 0x80) == 0) {
goto rd_inq_data; goto rd_inq_data;
} }
j = inb(wkport + 0x57); j = atp_readb_io(dev, 0, 0x17);
if (j == 0x16) { if (j == 0x16) {
goto inq_ok; goto inq_ok;
} }
outb(0x46, wkport + 0x50); atp_writeb_io(dev, 0, 0x10, 0x46);
outb(0, wkport + 0x52); atp_writeb_io(dev, 0, 0x12, 0);
outb(0, wkport + 0x53); atp_writeb_io(dev, 0, 0x13, 0);
outb(0, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0);
outb(0x08, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x08);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if (inb(wkport + 0x57) != 0x16) if (atp_readb_io(dev, 0, 0x17) != 0x16)
goto sel_ok; goto sel_ok;
inq_ok: inq_ok:
...@@ -1736,43 +1736,43 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1736,43 +1736,43 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
goto chg_wide; goto chg_wide;
} }
outb(0x01, wkport + 0x5b); atp_writeb_io(dev, 0, 0x1b, 0x01);
outb(satn[0], wkport + 0x43); atp_writeb_io(dev, 0, 3, satn[0]);
outb(satn[1], wkport + 0x44); atp_writeb_io(dev, 0, 4, satn[1]);
outb(satn[2], wkport + 0x45); atp_writeb_io(dev, 0, 5, satn[2]);
outb(satn[3], wkport + 0x46); atp_writeb_io(dev, 0, 6, satn[3]);
outb(satn[4], wkport + 0x47); atp_writeb_io(dev, 0, 7, satn[4]);
outb(satn[5], wkport + 0x48); atp_writeb_io(dev, 0, 8, satn[5]);
outb(0, wkport + 0x4f); atp_writeb_io(dev, 0, 0x0f, 0);
outb(dev->id[0][i].devsp, wkport + 0x51); atp_writeb_io(dev, 0, 0x11, dev->id[0][i].devsp);
outb(0, wkport + 0x52); atp_writeb_io(dev, 0, 0x12, 0);
outb(satn[6], wkport + 0x53); atp_writeb_io(dev, 0, 0x13, satn[6]);
outb(satn[7], wkport + 0x54); atp_writeb_io(dev, 0, 0x14, satn[7]);
outb(satn[8], wkport + 0x58); atp_writeb_io(dev, 0, 0x18, satn[8]);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if (inb(wkport + 0x57) != 0x11 && inb(wkport + 0x57) != 0x8e) if (atp_readb_io(dev, 0, 0x17) != 0x11 && atp_readb_io(dev, 0, 0x17) != 0x8e)
continue; continue;
while (inb(wkport + 0x57) != 0x8e) while (atp_readb_io(dev, 0, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
try_u3: try_u3:
j = 0; j = 0;
outb(0x09, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x09);
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
while ((inb(wkport + 0x5f) & 0x80) == 0) { while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x5f) & 0x01) != 0) if ((atp_readb_io(dev, 0, 0x1f) & 0x01) != 0)
outb(u3[j++], wkport + 0x59); atp_writeb_io(dev, 0, 0x19, u3[j++]);
} }
while ((inb(wkport + 0x57) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x17) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x57) & 0x0f; j = atp_readb_io(dev, 0, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto u3p_in; goto u3p_in;
} }
...@@ -1784,12 +1784,12 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1784,12 +1784,12 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
u3p_out: u3p_out:
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
while ((inb(wkport + 0x5f) & 0x80) == 0) { while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x5f) & 0x01) != 0) if ((atp_readb_io(dev, 0, 0x1f) & 0x01) != 0)
outb(0, wkport + 0x59); atp_writeb_io(dev, 0, 0x19, 0);
} }
j = inb(wkport + 0x57) & 0x0f; j = atp_readb_io(dev, 0, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto u3p_in; goto u3p_in;
} }
...@@ -1801,19 +1801,19 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1801,19 +1801,19 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
u3p_in: u3p_in:
outb(0x09, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x09);
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
k = 0; k = 0;
u3p_in1: u3p_in1:
j = inb(wkport + 0x5f); j = atp_readb_io(dev, 0, 0x1f);
if ((j & 0x01) != 0) { if ((j & 0x01) != 0) {
mbuf[k++] = inb(wkport + 0x59); mbuf[k++] = atp_readb_io(dev, 0, 0x19);
goto u3p_in1; goto u3p_in1;
} }
if ((j & 0x80) == 0x00) { if ((j & 0x80) == 0x00) {
goto u3p_in1; goto u3p_in1;
} }
j = inb(wkport + 0x57) & 0x0f; j = atp_readb_io(dev, 0, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto u3p_in; goto u3p_in;
} }
...@@ -1825,14 +1825,14 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1825,14 +1825,14 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
u3p_cmd: u3p_cmd:
outb(0x30, wkport + 0x50); atp_writeb_io(dev, 0, 0x10, 0x30);
outb(0x00, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x00);
outb(0x08, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x08);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x57); j = atp_readb_io(dev, 0, 0x17);
if (j != 0x16) { if (j != 0x16) {
if (j == 0x4e) { if (j == 0x4e) {
goto u3p_out; goto u3p_out;
...@@ -1856,42 +1856,42 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1856,42 +1856,42 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
continue; continue;
} }
chg_wide: chg_wide:
outb(0x01, wkport + 0x5b); atp_writeb_io(dev, 0, 0x1b, 0x01);
outb(satn[0], wkport + 0x43); atp_writeb_io(dev, 0, 3, satn[0]);
outb(satn[1], wkport + 0x44); atp_writeb_io(dev, 0, 4, satn[1]);
outb(satn[2], wkport + 0x45); atp_writeb_io(dev, 0, 5, satn[2]);
outb(satn[3], wkport + 0x46); atp_writeb_io(dev, 0, 6, satn[3]);
outb(satn[4], wkport + 0x47); atp_writeb_io(dev, 0, 7, satn[4]);
outb(satn[5], wkport + 0x48); atp_writeb_io(dev, 0, 8, satn[5]);
outb(0, wkport + 0x4f); atp_writeb_io(dev, 0, 0x0f, 0);
outb(dev->id[0][i].devsp, wkport + 0x51); atp_writeb_io(dev, 0, 0x11, dev->id[0][i].devsp);
outb(0, wkport + 0x52); atp_writeb_io(dev, 0, 0x12, 0);
outb(satn[6], wkport + 0x53); atp_writeb_io(dev, 0, 0x13, satn[6]);
outb(satn[7], wkport + 0x54); atp_writeb_io(dev, 0, 0x14, satn[7]);
outb(satn[8], wkport + 0x58); atp_writeb_io(dev, 0, 0x18, satn[8]);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if (inb(wkport + 0x57) != 0x11 && inb(wkport + 0x57) != 0x8e) if (atp_readb_io(dev, 0, 0x17) != 0x11 && atp_readb_io(dev, 0, 0x17) != 0x8e)
continue; continue;
while (inb(wkport + 0x57) != 0x8e) while (atp_readb_io(dev, 0, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
try_wide: try_wide:
j = 0; j = 0;
outb(0x05, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x05);
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
while ((inb(wkport + 0x5f) & 0x80) == 0) { while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x5f) & 0x01) != 0) if ((atp_readb_io(dev, 0, 0x1f) & 0x01) != 0)
outb(wide[j++], wkport + 0x59); atp_writeb_io(dev, 0, 0x19, wide[j++]);
} }
while ((inb(wkport + 0x57) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x17) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x57) & 0x0f; j = atp_readb_io(dev, 0, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto widep_in; goto widep_in;
} }
...@@ -1903,12 +1903,12 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1903,12 +1903,12 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
widep_out: widep_out:
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
while ((inb(wkport + 0x5f) & 0x80) == 0) { while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x5f) & 0x01) != 0) if ((atp_readb_io(dev, 0, 0x1f) & 0x01) != 0)
outb(0, wkport + 0x59); atp_writeb_io(dev, 0, 0x19, 0);
} }
j = inb(wkport + 0x57) & 0x0f; j = atp_readb_io(dev, 0, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto widep_in; goto widep_in;
} }
...@@ -1920,19 +1920,19 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1920,19 +1920,19 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
widep_in: widep_in:
outb(0xff, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0xff);
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
k = 0; k = 0;
widep_in1: widep_in1:
j = inb(wkport + 0x5f); j = atp_readb_io(dev, 0, 0x1f);
if ((j & 0x01) != 0) { if ((j & 0x01) != 0) {
mbuf[k++] = inb(wkport + 0x59); mbuf[k++] = atp_readb_io(dev, 0, 0x19);
goto widep_in1; goto widep_in1;
} }
if ((j & 0x80) == 0x00) { if ((j & 0x80) == 0x00) {
goto widep_in1; goto widep_in1;
} }
j = inb(wkport + 0x57) & 0x0f; j = atp_readb_io(dev, 0, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto widep_in; goto widep_in;
} }
...@@ -1944,14 +1944,14 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1944,14 +1944,14 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
widep_cmd: widep_cmd:
outb(0x30, wkport + 0x50); atp_writeb_io(dev, 0, 0x10, 0x30);
outb(0x00, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x00);
outb(0x08, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x08);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x57); j = atp_readb_io(dev, 0, 0x17);
if (j != 0x16) { if (j != 0x16) {
if (j == 0x4e) { if (j == 0x4e) {
goto widep_out; goto widep_out;
...@@ -1996,56 +1996,56 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -1996,56 +1996,56 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
if ((m & dev->wide_id[0]) != 0) { if ((m & dev->wide_id[0]) != 0) {
j |= 0x01; j |= 0x01;
} }
outb(j, wkport + 0x5b); atp_writeb_io(dev, 0, 0x1b, j);
outb(satn[0], wkport + 0x43); atp_writeb_io(dev, 0, 3, satn[0]);
outb(satn[1], wkport + 0x44); atp_writeb_io(dev, 0, 4, satn[1]);
outb(satn[2], wkport + 0x45); atp_writeb_io(dev, 0, 5, satn[2]);
outb(satn[3], wkport + 0x46); atp_writeb_io(dev, 0, 6, satn[3]);
outb(satn[4], wkport + 0x47); atp_writeb_io(dev, 0, 7, satn[4]);
outb(satn[5], wkport + 0x48); atp_writeb_io(dev, 0, 8, satn[5]);
outb(0, wkport + 0x4f); atp_writeb_io(dev, 0, 0x0f, 0);
outb(dev->id[0][i].devsp, wkport + 0x51); atp_writeb_io(dev, 0, 0x11, dev->id[0][i].devsp);
outb(0, wkport + 0x52); atp_writeb_io(dev, 0, 0x12, 0);
outb(satn[6], wkport + 0x53); atp_writeb_io(dev, 0, 0x13, satn[6]);
outb(satn[7], wkport + 0x54); atp_writeb_io(dev, 0, 0x14, satn[7]);
outb(satn[8], wkport + 0x58); atp_writeb_io(dev, 0, 0x18, satn[8]);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if ((inb(wkport + 0x57) != 0x11) && (inb(wkport + 0x57) != 0x8e)) { if (atp_readb_io(dev, 0, 0x17) != 0x11 && atp_readb_io(dev, 0, 0x17) != 0x8e) {
continue; continue;
} }
while (inb(wkport + 0x57) != 0x8e) while (atp_readb_io(dev, 0, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
try_sync: try_sync:
j = 0; j = 0;
outb(0x06, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x06);
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
while ((inb(wkport + 0x5f) & 0x80) == 0) { while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x5f) & 0x01) != 0) { if ((atp_readb_io(dev, 0, 0x1f) & 0x01) != 0) {
if ((m & dev->wide_id[0]) != 0) { if ((m & dev->wide_id[0]) != 0) {
if ((m & dev->ultra_map[0]) != 0) { if ((m & dev->ultra_map[0]) != 0) {
outb(synuw[j++], wkport + 0x59); atp_writeb_io(dev, 0, 0x19, synuw[j++]);
} else { } else {
outb(synw[j++], wkport + 0x59); atp_writeb_io(dev, 0, 0x19, synw[j++]);
} }
} else { } else {
if ((m & dev->ultra_map[0]) != 0) { if ((m & dev->ultra_map[0]) != 0) {
outb(synu[j++], wkport + 0x59); atp_writeb_io(dev, 0, 0x19, synu[j++]);
} else { } else {
outb(synn[j++], wkport + 0x59); atp_writeb_io(dev, 0, 0x19, synn[j++]);
} }
} }
} }
} }
while ((inb(wkport + 0x57) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x17) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x57) & 0x0f; j = atp_readb_io(dev, 0, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto phase_ins; goto phase_ins;
} }
...@@ -2057,12 +2057,12 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -2057,12 +2057,12 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
phase_outs: phase_outs:
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) { while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00) {
if ((inb(wkport + 0x5f) & 0x01) != 0x00) if ((atp_readb_io(dev, 0, 0x1f) & 0x01) != 0x00)
outb(0x00, wkport + 0x59); atp_writeb_io(dev, 0, 0x19, 0x00);
} }
j = inb(wkport + 0x57); j = atp_readb_io(dev, 0, 0x17);
if (j == 0x85) { if (j == 0x85) {
goto tar_dcons; goto tar_dcons;
} }
...@@ -2078,23 +2078,23 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -2078,23 +2078,23 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
phase_ins: phase_ins:
outb(0x06, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x06);
outb(0x20, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x20);
k = 0; k = 0;
phase_ins1: phase_ins1:
j = inb(wkport + 0x5f); j = atp_readb_io(dev, 0, 0x1f);
if ((j & 0x01) != 0x00) { if ((j & 0x01) != 0x00) {
mbuf[k++] = inb(wkport + 0x59); mbuf[k++] = atp_readb_io(dev, 0, 0x19);
goto phase_ins1; goto phase_ins1;
} }
if ((j & 0x80) == 0x00) { if ((j & 0x80) == 0x00) {
goto phase_ins1; goto phase_ins1;
} }
while ((inb(wkport + 0x57) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x17) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x57); j = atp_readb_io(dev, 0, 0x17);
if (j == 0x85) { if (j == 0x85) {
goto tar_dcons; goto tar_dcons;
} }
...@@ -2110,15 +2110,15 @@ static void is880(struct atp_unit *dev, unsigned int wkport) ...@@ -2110,15 +2110,15 @@ static void is880(struct atp_unit *dev, unsigned int wkport)
} }
continue; continue;
phase_cmds: phase_cmds:
outb(0x30, wkport + 0x50); atp_writeb_io(dev, 0, 0x10, 0x30);
tar_dcons: tar_dcons:
outb(0x00, wkport + 0x54); atp_writeb_io(dev, 0, 0x14, 0x00);
outb(0x08, wkport + 0x58); atp_writeb_io(dev, 0, 0x18, 0x08);
while ((inb(wkport + 0x5f) & 0x80) == 0x00) while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x57); j = atp_readb_io(dev, 0, 0x17);
if (j != 0x16) { if (j != 0x16) {
continue; continue;
} }
...@@ -2375,7 +2375,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2375,7 +2375,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
outb(0x20, base_io + 0x51); outb(0x20, base_io + 0x51);
tscam(shpnt); tscam(shpnt);
is880(p, base_io); is880(p);
outb(0xb0, base_io + 0x38); outb(0xb0, base_io + 0x38);
shpnt->max_id = 16; shpnt->max_id = 16;
shpnt->this_id = host_id; shpnt->this_id = host_id;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7