Skip to content

L
linux
Commit f34536f5 authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal
Browse files
Options

ata: pata_parport-bpck6: use parport_frob_control and remove CUR_CTRL 

Use parport_frob_control instead of manually maintaining control
register state.
Signed-off-by: default avatarOndrej Zary <linux@zary.sk>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent e9090fd6
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 84 deletions
drivers/ata/pata_parport/ppc6lnx.c
View file @ f34536f5
...@@ -15,14 +15,6 @@ ...@@ -15,14 +15,6 @@
//*************************************************************************** //***************************************************************************
#define port_int 16
#define ECR_EPP 0x80
#define ECR_BI 0x20
//***************************************************************************
// 60772 Commands // 60772 Commands
#define ACCESS_REG 0x00 #define ACCESS_REG 0x00
...@@ -57,7 +49,6 @@ ...@@ -57,7 +49,6 @@
//*************************************************************************** //***************************************************************************
#define CUR_CTRL (((u8 *)&pi->private)[0])
#define PPC_FLAGS (((u8 *)&pi->private)[1]) #define PPC_FLAGS (((u8 *)&pi->private)[1])
//*************************************************************************** //***************************************************************************
...@@ -109,11 +100,7 @@ static int ppc6_select(struct pi_adapter *pi) ...@@ -109,11 +100,7 @@ static int ppc6_select(struct pi_adapter *pi)
pi->saved_r2 = parport_read_control(pi->pardev->port) & 0x5F; // readback ctrl pi->saved_r2 = parport_read_control(pi->pardev->port) & 0x5F; // readback ctrl
CUR_CTRL = pi->saved_r2; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
CUR_CTRL |= PARPORT_CONTROL_SELECT;
parport_write_control(pi->pardev->port, CUR_CTRL);
if (pi->saved_r0 == 'b') if (pi->saved_r0 == 'b')
parport_write_data(pi->pardev->port, 'x'); parport_write_data(pi->pardev->port, 'x');
...@@ -123,13 +110,9 @@ static int ppc6_select(struct pi_adapter *pi) ...@@ -123,13 +110,9 @@ static int ppc6_select(struct pi_adapter *pi)
parport_write_data(pi->pardev->port, pi->unit); parport_write_data(pi->pardev->port, pi->unit);
parport_write_data(pi->pardev->port, ~pi->unit); parport_write_data(pi->pardev->port, ~pi->unit);
CUR_CTRL &= ~PARPORT_CONTROL_SELECT; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, 0);
parport_write_control(pi->pardev->port, CUR_CTRL);
CUR_CTRL = (CUR_CTRL & port_int) | PARPORT_CONTROL_INIT; parport_write_control(pi->pardev->port, PARPORT_CONTROL_INIT);
parport_write_control(pi->pardev->port, CUR_CTRL);
i = mode_map[pi->mode] & 0x0C; i = mode_map[pi->mode] & 0x0C;
...@@ -138,15 +121,11 @@ static int ppc6_select(struct pi_adapter *pi) ...@@ -138,15 +121,11 @@ static int ppc6_select(struct pi_adapter *pi)
parport_write_data(pi->pardev->port, i); parport_write_data(pi->pardev->port, i);
CUR_CTRL |= PARPORT_CONTROL_SELECT; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
parport_write_control(pi->pardev->port, CUR_CTRL);
// DELAY // DELAY
CUR_CTRL |= PARPORT_CONTROL_AUTOFD; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, PARPORT_CONTROL_AUTOFD);
parport_write_control(pi->pardev->port, CUR_CTRL);
j = ((i & 0x08) << 4) | ((i & 0x07) << 3); j = ((i & 0x08) << 4) | ((i & 0x07) << 3);
...@@ -154,20 +133,18 @@ static int ppc6_select(struct pi_adapter *pi) ...@@ -154,20 +133,18 @@ static int ppc6_select(struct pi_adapter *pi)
if (j == k) if (j == k)
{ {
CUR_CTRL &= ~PARPORT_CONTROL_AUTOFD; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, 0);
parport_write_control(pi->pardev->port, CUR_CTRL);
k = (parport_read_status(pi->pardev->port) & 0xB8) ^ 0xB8; k = (parport_read_status(pi->pardev->port) & 0xB8) ^ 0xB8;
if (j == k) if (j == k)
{ {
if (i & 4) // EPP if (i & 4) // EPP
CUR_CTRL &= ~(PARPORT_CONTROL_SELECT | PARPORT_CONTROL_INIT); parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_SELECT | PARPORT_CONTROL_INIT, 0);
else // PPC/ECP else // PPC/ECP
CUR_CTRL &= ~PARPORT_CONTROL_SELECT; parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_SELECT, 0);
parport_write_control(pi->pardev->port, CUR_CTRL);
return(1); return(1);
} }
...@@ -185,11 +162,11 @@ static int ppc6_select(struct pi_adapter *pi) ...@@ -185,11 +162,11 @@ static int ppc6_select(struct pi_adapter *pi)
static void ppc6_deselect(struct pi_adapter *pi) static void ppc6_deselect(struct pi_adapter *pi)
{ {
if (mode_map[pi->mode] & 4) // EPP if (mode_map[pi->mode] & 4) // EPP
CUR_CTRL |= PARPORT_CONTROL_INIT; parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_INIT, PARPORT_CONTROL_INIT);
else // PPC/ECP else // PPC/ECP
CUR_CTRL |= PARPORT_CONTROL_SELECT; parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
parport_write_control(pi->pardev->port, CUR_CTRL);
parport_write_data(pi->pardev->port, pi->saved_r0); parport_write_data(pi->pardev->port, pi->saved_r0);
...@@ -210,10 +187,7 @@ static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd) ...@@ -210,10 +187,7 @@ static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd)
case PPCMODE_BI_FW : case PPCMODE_BI_FW :
{ {
parport_write_data(pi->pardev->port, cmd); parport_write_data(pi->pardev->port, cmd);
parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_AUTOFD);
CUR_CTRL ^= PARPORT_CONTROL_AUTOFD;
parport_write_control(pi->pardev->port, CUR_CTRL);
break; break;
} }
...@@ -241,10 +215,7 @@ static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data) ...@@ -241,10 +215,7 @@ static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data)
case PPCMODE_BI_FW : case PPCMODE_BI_FW :
{ {
parport_write_data(pi->pardev->port, data); parport_write_data(pi->pardev->port, data);
parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_INIT);
CUR_CTRL ^= PARPORT_CONTROL_INIT;
parport_write_control(pi->pardev->port, CUR_CTRL);
break; break;
} }
...@@ -271,9 +242,8 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) ...@@ -271,9 +242,8 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
case PPCMODE_UNI_SW : case PPCMODE_UNI_SW :
case PPCMODE_UNI_FW : case PPCMODE_UNI_FW :
{ {
CUR_CTRL = (CUR_CTRL & ~PARPORT_CONTROL_STROBE) ^ PARPORT_CONTROL_INIT; parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_STROBE, PARPORT_CONTROL_INIT);
parport_write_control(pi->pardev->port, CUR_CTRL);
// DELAY // DELAY
...@@ -281,9 +251,8 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) ...@@ -281,9 +251,8 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
data = ((data & 0x80) >> 1) | ((data & 0x38) >> 3); data = ((data & 0x80) >> 1) | ((data & 0x38) >> 3);
CUR_CTRL |= PARPORT_CONTROL_STROBE; parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_STROBE, PARPORT_CONTROL_STROBE);
parport_write_control(pi->pardev->port, CUR_CTRL);
// DELAY // DELAY
...@@ -297,15 +266,12 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) ...@@ -297,15 +266,12 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
{ {
parport_data_reverse(pi->pardev->port); parport_data_reverse(pi->pardev->port);
CUR_CTRL = (CUR_CTRL | PARPORT_CONTROL_STROBE) ^ PARPORT_CONTROL_INIT; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE,
PARPORT_CONTROL_STROBE | PARPORT_CONTROL_INIT);
parport_write_control(pi->pardev->port, CUR_CTRL);
data = parport_read_data(pi->pardev->port); data = parport_read_data(pi->pardev->port);
CUR_CTRL &= ~PARPORT_CONTROL_STROBE; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, 0);
parport_write_control(pi->pardev->port, CUR_CTRL);
parport_data_forward(pi->pardev->port); parport_data_forward(pi->pardev->port);
...@@ -356,10 +322,8 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count) ...@@ -356,10 +322,8 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count)
{ {
u8 d; u8 d;
CUR_CTRL = (CUR_CTRL & ~PARPORT_CONTROL_STROBE) parport_frob_control(pi->pardev->port,
^ PARPORT_CONTROL_INIT; PARPORT_CONTROL_STROBE, PARPORT_CONTROL_INIT);
parport_write_control(pi->pardev->port, CUR_CTRL);
// DELAY // DELAY
...@@ -367,9 +331,8 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count) ...@@ -367,9 +331,8 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count)
d = ((d & 0x80) >> 1) | ((d & 0x38) >> 3); d = ((d & 0x80) >> 1) | ((d & 0x38) >> 3);
CUR_CTRL |= PARPORT_CONTROL_STROBE; parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_STROBE, PARPORT_CONTROL_STROBE);
parport_write_control(pi->pardev->port, CUR_CTRL);
// DELAY // DELAY
...@@ -387,21 +350,16 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count) ...@@ -387,21 +350,16 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count)
{ {
parport_data_reverse(pi->pardev->port); parport_data_reverse(pi->pardev->port);
CUR_CTRL |= PARPORT_CONTROL_STROBE;
while(count) while(count)
{ {
CUR_CTRL ^= PARPORT_CONTROL_INIT; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE,
PARPORT_CONTROL_STROBE | PARPORT_CONTROL_INIT);
parport_write_control(pi->pardev->port, CUR_CTRL);
*data++ = parport_read_data(pi->pardev->port); *data++ = parport_read_data(pi->pardev->port);
count--; count--;
} }
CUR_CTRL &= ~PARPORT_CONTROL_STROBE; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, 0);
parport_write_control(pi->pardev->port, CUR_CTRL);
parport_data_forward(pi->pardev->port); parport_data_forward(pi->pardev->port);
...@@ -467,9 +425,7 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count) ...@@ -467,9 +425,7 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count)
{ {
parport_write_data(pi->pardev->port, *data++); parport_write_data(pi->pardev->port, *data++);
CUR_CTRL ^= PARPORT_CONTROL_INIT; parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_INIT);
parport_write_control(pi->pardev->port, CUR_CTRL);
} }
break; break;
...@@ -482,9 +438,8 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count) ...@@ -482,9 +438,8 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count)
ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_FASTWR); ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_FASTWR);
CUR_CTRL |= PARPORT_CONTROL_STROBE; parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_STROBE, PARPORT_CONTROL_STROBE);
parport_write_control(pi->pardev->port, CUR_CTRL);
last = *data; last = *data;
...@@ -497,9 +452,8 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count) ...@@ -497,9 +452,8 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count)
if (this == last) if (this == last)
{ {
CUR_CTRL ^= PARPORT_CONTROL_INIT; parport_frob_control(pi->pardev->port,
0, PARPORT_CONTROL_INIT);
parport_write_control(pi->pardev->port, CUR_CTRL);
} }
else else
{ {
...@@ -509,9 +463,7 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count) ...@@ -509,9 +463,7 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count)
} }
} }
CUR_CTRL &= ~PARPORT_CONTROL_STROBE; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, 0);
parport_write_control(pi->pardev->port, CUR_CTRL);
ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_FASTWR); ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_FASTWR);
......
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