atp870u: Convert is885() to use wrappers

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Reviewed-by: Hannes Reinicke <hare@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Ondrej Zary 2015-11-17 19:23:57 +01:00 committed by Martin K. Petersen
parent 485025606b
commit 5d2a5a4f86

View File

@ -41,7 +41,7 @@
static struct scsi_host_template atp870u_template; static struct scsi_host_template atp870u_template;
static void send_s870(struct atp_unit *dev,unsigned char c); static void send_s870(struct atp_unit *dev,unsigned char c);
static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c); static void is885(struct atp_unit *dev, unsigned char c);
static void tscam_885(void); static void tscam_885(void);
static inline void atp_writeb_base(struct atp_unit *atp, u8 reg, u8 val) static inline void atp_writeb_base(struct atp_unit *atp, u8 reg, u8 val)
@ -2521,9 +2521,9 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
tscam_885(); tscam_885();
printk(KERN_INFO " Scanning Channel A SCSI Device ...\n"); printk(KERN_INFO " Scanning Channel A SCSI Device ...\n");
is885(p, base_io + 0x80, 0); is885(p, 0);
printk(KERN_INFO " Scanning Channel B SCSI Device ...\n"); printk(KERN_INFO " Scanning Channel B SCSI Device ...\n");
is885(p, base_io + 0xc0, 1); is885(p, 1);
k = inb(base_io + 0x28) & 0xcf; k = inb(base_io + 0x28) & 0xcf;
k |= 0xc0; k |= 0xc0;
@ -2825,7 +2825,7 @@ static void tscam_885(void)
static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c) static void is885(struct atp_unit *dev, unsigned char c)
{ {
unsigned char i, j, k, rmb, n, lvdmode; unsigned char i, j, k, rmb, n, lvdmode;
unsigned short int m; unsigned short int m;
@ -2839,7 +2839,7 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
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 + 0x1b) >> 7; lvdmode=atp_readb_io(dev, c, 0x1b) >> 7;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
m = 1; m = 1;
@ -2851,93 +2851,93 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
printk(KERN_INFO " ID: %2d Host Adapter\n", dev->host_id[c]); printk(KERN_INFO " ID: %2d Host Adapter\n", dev->host_id[c]);
continue; continue;
} }
outb(0x01, wkport + 0x1b); atp_writeb_io(dev, c, 0x1b, 0x01);
outb(0x08, wkport + 0x01); atp_writeb_io(dev, c, 1, 0x08);
outb(0x7f, wkport + 0x02); atp_writeb_io(dev, c, 2, 0x7f);
outb(satn[0], wkport + 0x03); atp_writeb_io(dev, c, 3, satn[0]);
outb(satn[1], wkport + 0x04); atp_writeb_io(dev, c, 4, satn[1]);
outb(satn[2], wkport + 0x05); atp_writeb_io(dev, c, 5, satn[2]);
outb(satn[3], wkport + 0x06); atp_writeb_io(dev, c, 6, satn[3]);
outb(satn[4], wkport + 0x07); atp_writeb_io(dev, c, 7, satn[4]);
outb(satn[5], wkport + 0x08); atp_writeb_io(dev, c, 8, satn[5]);
outb(0, wkport + 0x0f); atp_writeb_io(dev, c, 0x0f, 0);
outb(dev->id[c][i].devsp, wkport + 0x11); atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp);
outb(0, wkport + 0x12); atp_writeb_io(dev, c, 0x12, 0);
outb(satn[6], wkport + 0x13); atp_writeb_io(dev, c, 0x13, satn[6]);
outb(satn[7], wkport + 0x14); atp_writeb_io(dev, c, 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 + 0x15); atp_writeb_io(dev, c, 0x15, j);
outb(satn[8], wkport + 0x18); atp_writeb_io(dev, c, 0x18, satn[8]);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if ((inb(wkport + 0x17) != 0x11) && (inb(wkport + 0x17) != 0x8e)) { if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
continue; continue;
} }
while (inb(wkport + 0x17) != 0x8e) while (atp_readb_io(dev, c, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
dev->active_id[c] |= m; dev->active_id[c] |= m;
outb(0x30, wkport + 0x10); atp_writeb_io(dev, c, 0x10, 0x30);
outb(0x00, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x00);
phase_cmd: phase_cmd:
outb(0x08, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x08);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x17); j = atp_readb_io(dev, c, 0x17);
if (j != 0x16) { if (j != 0x16) {
outb(0x41, wkport + 0x10); atp_writeb_io(dev, c, 0x10, 0x41);
goto phase_cmd; goto phase_cmd;
} }
sel_ok: sel_ok:
outb(inqd[0], wkport + 0x03); atp_writeb_io(dev, c, 3, inqd[0]);
outb(inqd[1], wkport + 0x04); atp_writeb_io(dev, c, 4, inqd[1]);
outb(inqd[2], wkport + 0x05); atp_writeb_io(dev, c, 5, inqd[2]);
outb(inqd[3], wkport + 0x06); atp_writeb_io(dev, c, 6, inqd[3]);
outb(inqd[4], wkport + 0x07); atp_writeb_io(dev, c, 7, inqd[4]);
outb(inqd[5], wkport + 0x08); atp_writeb_io(dev, c, 8, inqd[5]);
outb(0, wkport + 0x0f); atp_writeb_io(dev, c, 0x0f, 0);
outb(dev->id[c][i].devsp, wkport + 0x11); atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp);
outb(0, wkport + 0x12); atp_writeb_io(dev, c, 0x12, 0);
outb(inqd[6], wkport + 0x13); atp_writeb_io(dev, c, 0x13, inqd[6]);
outb(inqd[7], wkport + 0x14); atp_writeb_io(dev, c, 0x14, inqd[7]);
outb(inqd[8], wkport + 0x18); atp_writeb_io(dev, c, 0x18, inqd[8]);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if ((inb(wkport + 0x17) != 0x11) && (inb(wkport + 0x17) != 0x8e)) { if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
continue; continue;
} }
while (inb(wkport + 0x17) != 0x8e) while (atp_readb_io(dev, c, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
outb(0x00, wkport + 0x1b); atp_writeb_io(dev, c, 0x1b, 0x00);
outb(0x08, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x08);
j = 0; j = 0;
rd_inq_data: rd_inq_data:
k = inb(wkport + 0x1f); k = atp_readb_io(dev, c, 0x1f);
if ((k & 0x01) != 0) { if ((k & 0x01) != 0) {
mbuf[j++] = inb(wkport + 0x19); mbuf[j++] = atp_readb_io(dev, c, 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 + 0x17); j = atp_readb_io(dev, c, 0x17);
if (j == 0x16) { if (j == 0x16) {
goto inq_ok; goto inq_ok;
} }
outb(0x46, wkport + 0x10); atp_writeb_io(dev, c, 0x10, 0x46);
outb(0, wkport + 0x12); atp_writeb_io(dev, c, 0x12, 0);
outb(0, wkport + 0x13); atp_writeb_io(dev, c, 0x13, 0);
outb(0, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0);
outb(0x08, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x08);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if (inb(wkport + 0x17) != 0x16) { if (atp_readb_io(dev, c, 0x17) != 0x16) {
goto sel_ok; goto sel_ok;
} }
inq_ok: inq_ok:
@ -2959,40 +2959,40 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
goto chg_wide; goto chg_wide;
} }
outb(0x01, wkport + 0x1b); atp_writeb_io(dev, c, 0x1b, 0x01);
outb(satn[0], wkport + 0x03); atp_writeb_io(dev, c, 3, satn[0]);
outb(satn[1], wkport + 0x04); atp_writeb_io(dev, c, 4, satn[1]);
outb(satn[2], wkport + 0x05); atp_writeb_io(dev, c, 5, satn[2]);
outb(satn[3], wkport + 0x06); atp_writeb_io(dev, c, 6, satn[3]);
outb(satn[4], wkport + 0x07); atp_writeb_io(dev, c, 7, satn[4]);
outb(satn[5], wkport + 0x08); atp_writeb_io(dev, c, 8, satn[5]);
outb(0, wkport + 0x0f); atp_writeb_io(dev, c, 0x0f, 0);
outb(dev->id[c][i].devsp, wkport + 0x11); atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp);
outb(0, wkport + 0x12); atp_writeb_io(dev, c, 0x12, 0);
outb(satn[6], wkport + 0x13); atp_writeb_io(dev, c, 0x13, satn[6]);
outb(satn[7], wkport + 0x14); atp_writeb_io(dev, c, 0x14, satn[7]);
outb(satn[8], wkport + 0x18); atp_writeb_io(dev, c, 0x18, satn[8]);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if ((inb(wkport + 0x17) != 0x11) && (inb(wkport + 0x17) != 0x8e)) { if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
continue; continue;
} }
while (inb(wkport + 0x17) != 0x8e) while (atp_readb_io(dev, c, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
try_u3: try_u3:
j = 0; j = 0;
outb(0x09, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x09);
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
while ((inb(wkport + 0x1f) & 0x80) == 0) { while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x1f) & 0x01) != 0) if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0)
outb(u3[j++], wkport + 0x19); atp_writeb_io(dev, c, 0x19, u3[j++]);
cpu_relax(); cpu_relax();
} }
while ((inb(wkport + 0x17) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x17) & 0x0f; j = atp_readb_io(dev, c, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto u3p_in; goto u3p_in;
} }
@ -3004,13 +3004,13 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
u3p_out: u3p_out:
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
while ((inb(wkport + 0x1f) & 0x80) == 0) { while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x1f) & 0x01) != 0) if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0)
outb(0, wkport + 0x19); atp_writeb_io(dev, c, 0x19, 0);
cpu_relax(); cpu_relax();
} }
j = inb(wkport + 0x17) & 0x0f; j = atp_readb_io(dev, c, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto u3p_in; goto u3p_in;
} }
@ -3022,19 +3022,19 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
u3p_in: u3p_in:
outb(0x09, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x09);
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
k = 0; k = 0;
u3p_in1: u3p_in1:
j = inb(wkport + 0x1f); j = atp_readb_io(dev, c, 0x1f);
if ((j & 0x01) != 0) { if ((j & 0x01) != 0) {
mbuf[k++] = inb(wkport + 0x19); mbuf[k++] = atp_readb_io(dev, c, 0x19);
goto u3p_in1; goto u3p_in1;
} }
if ((j & 0x80) == 0x00) { if ((j & 0x80) == 0x00) {
goto u3p_in1; goto u3p_in1;
} }
j = inb(wkport + 0x17) & 0x0f; j = atp_readb_io(dev, c, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto u3p_in; goto u3p_in;
} }
@ -3046,11 +3046,11 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
u3p_cmd: u3p_cmd:
outb(0x30, wkport + 0x10); atp_writeb_io(dev, c, 0x10, 0x30);
outb(0x00, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x00);
outb(0x08, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x08);
while ((inb(wkport + 0x1f) & 0x80) == 0x00); while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00);
j = inb(wkport + 0x17); j = atp_readb_io(dev, c, 0x17);
if (j != 0x16) { if (j != 0x16) {
if (j == 0x4e) { if (j == 0x4e) {
goto u3p_out; goto u3p_out;
@ -3077,40 +3077,40 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
continue; continue;
} }
chg_wide: chg_wide:
outb(0x01, wkport + 0x1b); atp_writeb_io(dev, c, 0x1b, 0x01);
outb(satn[0], wkport + 0x03); atp_writeb_io(dev, c, 3, satn[0]);
outb(satn[1], wkport + 0x04); atp_writeb_io(dev, c, 4, satn[1]);
outb(satn[2], wkport + 0x05); atp_writeb_io(dev, c, 5, satn[2]);
outb(satn[3], wkport + 0x06); atp_writeb_io(dev, c, 6, satn[3]);
outb(satn[4], wkport + 0x07); atp_writeb_io(dev, c, 7, satn[4]);
outb(satn[5], wkport + 0x08); atp_writeb_io(dev, c, 8, satn[5]);
outb(0, wkport + 0x0f); atp_writeb_io(dev, c, 0x0f, 0);
outb(dev->id[c][i].devsp, wkport + 0x11); atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp);
outb(0, wkport + 0x12); atp_writeb_io(dev, c, 0x12, 0);
outb(satn[6], wkport + 0x13); atp_writeb_io(dev, c, 0x13, satn[6]);
outb(satn[7], wkport + 0x14); atp_writeb_io(dev, c, 0x14, satn[7]);
outb(satn[8], wkport + 0x18); atp_writeb_io(dev, c, 0x18, satn[8]);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if ((inb(wkport + 0x17) != 0x11) && (inb(wkport + 0x17) != 0x8e)) { if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
continue; continue;
} }
while (inb(wkport + 0x17) != 0x8e) while (atp_readb_io(dev, c, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
try_wide: try_wide:
j = 0; j = 0;
outb(0x05, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x05);
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
while ((inb(wkport + 0x1f) & 0x80) == 0) { while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x1f) & 0x01) != 0) if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0)
outb(wide[j++], wkport + 0x19); atp_writeb_io(dev, c, 0x19, wide[j++]);
cpu_relax(); cpu_relax();
} }
while ((inb(wkport + 0x17) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x17) & 0x0f; j = atp_readb_io(dev, c, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto widep_in; goto widep_in;
} }
@ -3122,13 +3122,13 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
widep_out: widep_out:
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
while ((inb(wkport + 0x1f) & 0x80) == 0) { while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x1f) & 0x01) != 0) if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0)
outb(0, wkport + 0x19); atp_writeb_io(dev, c, 0x19, 0);
cpu_relax(); cpu_relax();
} }
j = inb(wkport + 0x17) & 0x0f; j = atp_readb_io(dev, c, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto widep_in; goto widep_in;
} }
@ -3140,19 +3140,19 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
widep_in: widep_in:
outb(0xff, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0xff);
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
k = 0; k = 0;
widep_in1: widep_in1:
j = inb(wkport + 0x1f); j = atp_readb_io(dev, c, 0x1f);
if ((j & 0x01) != 0) { if ((j & 0x01) != 0) {
mbuf[k++] = inb(wkport + 0x19); mbuf[k++] = atp_readb_io(dev, c, 0x19);
goto widep_in1; goto widep_in1;
} }
if ((j & 0x80) == 0x00) { if ((j & 0x80) == 0x00) {
goto widep_in1; goto widep_in1;
} }
j = inb(wkport + 0x17) & 0x0f; j = atp_readb_io(dev, c, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto widep_in; goto widep_in;
} }
@ -3164,12 +3164,12 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
widep_cmd: widep_cmd:
outb(0x30, wkport + 0x10); atp_writeb_io(dev, c, 0x10, 0x30);
outb(0x00, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x00);
outb(0x08, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x08);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x17); j = atp_readb_io(dev, c, 0x17);
if (j != 0x16) { if (j != 0x16) {
if (j == 0x4e) { if (j == 0x4e) {
goto widep_out; goto widep_out;
@ -3215,52 +3215,52 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
if ((m & dev->wide_id[c]) != 0) { if ((m & dev->wide_id[c]) != 0) {
j |= 0x01; j |= 0x01;
} }
outb(j, wkport + 0x1b); atp_writeb_io(dev, c, 0x1b, j);
outb(satn[0], wkport + 0x03); atp_writeb_io(dev, c, 3, satn[0]);
outb(satn[1], wkport + 0x04); atp_writeb_io(dev, c, 4, satn[1]);
outb(satn[2], wkport + 0x05); atp_writeb_io(dev, c, 5, satn[2]);
outb(satn[3], wkport + 0x06); atp_writeb_io(dev, c, 6, satn[3]);
outb(satn[4], wkport + 0x07); atp_writeb_io(dev, c, 7, satn[4]);
outb(satn[5], wkport + 0x08); atp_writeb_io(dev, c, 8, satn[5]);
outb(0, wkport + 0x0f); atp_writeb_io(dev, c, 0x0f, 0);
outb(dev->id[c][i].devsp, wkport + 0x11); atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp);
outb(0, wkport + 0x12); atp_writeb_io(dev, c, 0x12, 0);
outb(satn[6], wkport + 0x13); atp_writeb_io(dev, c, 0x13, satn[6]);
outb(satn[7], wkport + 0x14); atp_writeb_io(dev, c, 0x14, satn[7]);
outb(satn[8], wkport + 0x18); atp_writeb_io(dev, c, 0x18, satn[8]);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
if ((inb(wkport + 0x17) != 0x11) && (inb(wkport + 0x17) != 0x8e)) { if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
continue; continue;
} }
while (inb(wkport + 0x17) != 0x8e) while (atp_readb_io(dev, c, 0x17) != 0x8e)
cpu_relax(); cpu_relax();
try_sync: try_sync:
j = 0; j = 0;
outb(0x06, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x06);
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
while ((inb(wkport + 0x1f) & 0x80) == 0) { while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0) {
if ((inb(wkport + 0x1f) & 0x01) != 0) { if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0) {
if ((m & dev->wide_id[c]) != 0) { if ((m & dev->wide_id[c]) != 0) {
if ((m & dev->ultra_map[c]) != 0) { if ((m & dev->ultra_map[c]) != 0) {
outb(synuw[j++], wkport + 0x19); atp_writeb_io(dev, c, 0x19, synuw[j++]);
} else { } else {
outb(synw[j++], wkport + 0x19); atp_writeb_io(dev, c, 0x19, synw[j++]);
} }
} else { } else {
if ((m & dev->ultra_map[c]) != 0) { if ((m & dev->ultra_map[c]) != 0) {
outb(synu[j++], wkport + 0x19); atp_writeb_io(dev, c, 0x19, synu[j++]);
} else { } else {
outb(synn[j++], wkport + 0x19); atp_writeb_io(dev, c, 0x19, synn[j++]);
} }
} }
} }
} }
while ((inb(wkport + 0x17) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x17) & 0x0f; j = atp_readb_io(dev, c, 0x17) & 0x0f;
if (j == 0x0f) { if (j == 0x0f) {
goto phase_ins; goto phase_ins;
} }
@ -3272,13 +3272,13 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
phase_outs: phase_outs:
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) { while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00) {
if ((inb(wkport + 0x1f) & 0x01) != 0x00) if ((atp_readb_io(dev, c, 0x1f) & 0x01) != 0x00)
outb(0x00, wkport + 0x19); atp_writeb_io(dev, c, 0x19, 0x00);
cpu_relax(); cpu_relax();
} }
j = inb(wkport + 0x17); j = atp_readb_io(dev, c, 0x17);
if (j == 0x85) { if (j == 0x85) {
goto tar_dcons; goto tar_dcons;
} }
@ -3294,20 +3294,20 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
phase_ins: phase_ins:
outb(0x06, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x06);
outb(0x20, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x20);
k = 0; k = 0;
phase_ins1: phase_ins1:
j = inb(wkport + 0x1f); j = atp_readb_io(dev, c, 0x1f);
if ((j & 0x01) != 0x00) { if ((j & 0x01) != 0x00) {
mbuf[k++] = inb(wkport + 0x19); mbuf[k++] = atp_readb_io(dev, c, 0x19);
goto phase_ins1; goto phase_ins1;
} }
if ((j & 0x80) == 0x00) { if ((j & 0x80) == 0x00) {
goto phase_ins1; goto phase_ins1;
} }
while ((inb(wkport + 0x17) & 0x80) == 0x00); while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00);
j = inb(wkport + 0x17); j = atp_readb_io(dev, c, 0x17);
if (j == 0x85) { if (j == 0x85) {
goto tar_dcons; goto tar_dcons;
} }
@ -3323,13 +3323,13 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
} }
continue; continue;
phase_cmds: phase_cmds:
outb(0x30, wkport + 0x10); atp_writeb_io(dev, c, 0x10, 0x30);
tar_dcons: tar_dcons:
outb(0x00, wkport + 0x14); atp_writeb_io(dev, c, 0x14, 0x00);
outb(0x08, wkport + 0x18); atp_writeb_io(dev, c, 0x18, 0x08);
while ((inb(wkport + 0x1f) & 0x80) == 0x00) while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
cpu_relax(); cpu_relax();
j = inb(wkport + 0x17); j = atp_readb_io(dev, c, 0x17);
if (j != 0x16) { if (j != 0x16) {
continue; continue;
} }
@ -3376,7 +3376,7 @@ static void is885(struct atp_unit *dev, unsigned int wkport,unsigned char c)
printk("dev->id[%2d][%2d].devsp = %2x\n",c,i,dev->id[c][i].devsp); printk("dev->id[%2d][%2d].devsp = %2x\n",c,i,dev->id[c][i].devsp);
#endif #endif
} }
outb(0x80, wkport + 0x16); atp_writeb_io(dev, c, 0x16, 0x80);
} }
module_init(atp870u_init); module_init(atp870u_init);