From: Ondrej Zary <linux@zary.sk>
To: Damien Le Moal <damien.lemoal@opensource.wdc.com>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Christoph Hellwig <hch@lst.de>,
Sergey Shtylyov <s.shtylyov@omp.ru>, Jens Axboe <axboe@kernel.dk>,
Tim Waugh <tim@cyberelk.net>,
linux-block@vger.kernel.org, linux-parport@lists.infradead.org,
linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 13/32] pata_parport-bpck6: use parport_frob_control and remove CUR_CTRL
Date: Tue, 7 Mar 2023 23:46:08 +0100 [thread overview]
Message-ID: <20230307224627.28011-14-linux@zary.sk> (raw)
In-Reply-To: <20230307224627.28011-1-linux@zary.sk>
Use parport_frob_control instead of manually maintaining control
register state.
Signed-off-by: Ondrej Zary <linux@zary.sk>
---
drivers/ata/pata_parport/ppc6lnx.c | 120 +++++++++--------------------
1 file changed, 36 insertions(+), 84 deletions(-)
diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c
index 89c40d6ab036..fdc11875bf1b 100644
--- a/drivers/ata/pata_parport/ppc6lnx.c
+++ b/drivers/ata/pata_parport/ppc6lnx.c
@@ -15,14 +15,6 @@
//***************************************************************************
-
-#define port_int 16
-
-#define ECR_EPP 0x80
-#define ECR_BI 0x20
-
-//***************************************************************************
-
// 60772 Commands
#define ACCESS_REG 0x00
@@ -57,7 +49,6 @@
//***************************************************************************
-#define CUR_CTRL (((u8 *)&pi->private)[0])
#define PPC_FLAGS (((u8 *)&pi->private)[1])
//***************************************************************************
@@ -109,11 +100,7 @@ static int ppc6_select(struct pi_adapter *pi)
pi->saved_r2 = parport_read_control(pi->pardev->port) & 0x5F; // readback ctrl
- CUR_CTRL = pi->saved_r2;
-
- CUR_CTRL |= PARPORT_CONTROL_SELECT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
if (pi->saved_r0 == 'b')
parport_write_data(pi->pardev->port, 'x');
@@ -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);
- CUR_CTRL &= ~PARPORT_CONTROL_SELECT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, 0);
- CUR_CTRL = (CUR_CTRL & port_int) | PARPORT_CONTROL_INIT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_write_control(pi->pardev->port, PARPORT_CONTROL_INIT);
i = mode_map[pi->mode] & 0x0C;
@@ -138,15 +121,11 @@ static int ppc6_select(struct pi_adapter *pi)
parport_write_data(pi->pardev->port, i);
- CUR_CTRL |= PARPORT_CONTROL_SELECT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
// DELAY
- CUR_CTRL |= PARPORT_CONTROL_AUTOFD;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, PARPORT_CONTROL_AUTOFD);
j = ((i & 0x08) << 4) | ((i & 0x07) << 3);
@@ -154,20 +133,18 @@ static int ppc6_select(struct pi_adapter *pi)
if (j == k)
{
- CUR_CTRL &= ~PARPORT_CONTROL_AUTOFD;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, 0);
k = (parport_read_status(pi->pardev->port) & 0xB8) ^ 0xB8;
if (j == k)
{
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
- CUR_CTRL &= ~PARPORT_CONTROL_SELECT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port,
+ PARPORT_CONTROL_SELECT, 0);
return(1);
}
@@ -185,11 +162,11 @@ static int ppc6_select(struct pi_adapter *pi)
static void ppc6_deselect(struct pi_adapter *pi)
{
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
- CUR_CTRL |= PARPORT_CONTROL_SELECT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port,
+ PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
parport_write_data(pi->pardev->port, pi->saved_r0);
@@ -210,10 +187,7 @@ static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd)
case PPCMODE_BI_FW :
{
parport_write_data(pi->pardev->port, cmd);
-
- CUR_CTRL ^= PARPORT_CONTROL_AUTOFD;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_AUTOFD);
break;
}
@@ -241,10 +215,7 @@ static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data)
case PPCMODE_BI_FW :
{
parport_write_data(pi->pardev->port, data);
-
- CUR_CTRL ^= PARPORT_CONTROL_INIT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_INIT);
break;
}
@@ -271,9 +242,8 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
case PPCMODE_UNI_SW :
case PPCMODE_UNI_FW :
{
- CUR_CTRL = (CUR_CTRL & ~PARPORT_CONTROL_STROBE) ^ PARPORT_CONTROL_INIT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port,
+ PARPORT_CONTROL_STROBE, PARPORT_CONTROL_INIT);
// DELAY
@@ -281,9 +251,8 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
data = ((data & 0x80) >> 1) | ((data & 0x38) >> 3);
- CUR_CTRL |= PARPORT_CONTROL_STROBE;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port,
+ PARPORT_CONTROL_STROBE, PARPORT_CONTROL_STROBE);
// DELAY
@@ -297,15 +266,12 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
{
parport_data_reverse(pi->pardev->port);
- CUR_CTRL = (CUR_CTRL | PARPORT_CONTROL_STROBE) ^ PARPORT_CONTROL_INIT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE,
+ PARPORT_CONTROL_STROBE | PARPORT_CONTROL_INIT);
data = parport_read_data(pi->pardev->port);
- CUR_CTRL &= ~PARPORT_CONTROL_STROBE;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, 0);
parport_data_forward(pi->pardev->port);
@@ -356,10 +322,8 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count)
{
u8 d;
- CUR_CTRL = (CUR_CTRL & ~PARPORT_CONTROL_STROBE)
- ^ PARPORT_CONTROL_INIT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port,
+ PARPORT_CONTROL_STROBE, PARPORT_CONTROL_INIT);
// DELAY
@@ -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);
- CUR_CTRL |= PARPORT_CONTROL_STROBE;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port,
+ PARPORT_CONTROL_STROBE, PARPORT_CONTROL_STROBE);
// DELAY
@@ -387,21 +350,16 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count)
{
parport_data_reverse(pi->pardev->port);
- CUR_CTRL |= PARPORT_CONTROL_STROBE;
-
while(count)
{
- CUR_CTRL ^= PARPORT_CONTROL_INIT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE,
+ PARPORT_CONTROL_STROBE | PARPORT_CONTROL_INIT);
*data++ = parport_read_data(pi->pardev->port);
count--;
}
- CUR_CTRL &= ~PARPORT_CONTROL_STROBE;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, 0);
parport_data_forward(pi->pardev->port);
@@ -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++);
- CUR_CTRL ^= PARPORT_CONTROL_INIT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_INIT);
}
break;
@@ -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);
- CUR_CTRL |= PARPORT_CONTROL_STROBE;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port,
+ PARPORT_CONTROL_STROBE, PARPORT_CONTROL_STROBE);
last = *data;
@@ -497,9 +452,8 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count)
if (this == last)
{
- CUR_CTRL ^= PARPORT_CONTROL_INIT;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port,
+ 0, PARPORT_CONTROL_INIT);
}
else
{
@@ -509,9 +463,7 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count)
}
}
- CUR_CTRL &= ~PARPORT_CONTROL_STROBE;
-
- parport_write_control(pi->pardev->port, CUR_CTRL);
+ parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, 0);
ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_FASTWR);
--
Ondrej Zary
next prev parent reply other threads:[~2023-03-07 22:47 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 22:45 [PATCH 00/32] pata_parport-bpck6: rework bpck6 protocol driver Ondrej Zary
2023-03-07 22:45 ` [PATCH 01/32] pata_parport-bpck6: remove useless defines Ondrej Zary
2023-03-08 10:28 ` Sergei Shtylyov
2023-03-07 22:45 ` [PATCH 02/32] pata_parport-bpck6: remove useless range check from read/write_regr Ondrej Zary
2023-03-08 18:03 ` Sergey Shtylyov
2023-03-07 22:45 ` [PATCH 03/32] pata_parport-bpck6: don't cast pi->pardev to struct pardevice * Ondrej Zary
2023-03-08 18:15 ` Sergey Shtylyov
2023-03-07 22:45 ` [PATCH 04/32] pata_parport-bpck6: pass around struct pi_adapter * Ondrej Zary
2023-03-08 20:33 ` Sergey Shtylyov
2023-03-09 20:58 ` Ondrej Zary
2023-03-10 10:19 ` Sergey Shtylyov
2023-03-08 20:34 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 05/32] pata_parport-bpck6: remove lpt_addr from struct ppc_storage Ondrej Zary
2023-03-11 15:43 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 06/32] pata_parport-bpck6: remove ppc_id " Ondrej Zary
2023-03-08 20:41 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 07/32] pata_parport-bpck6: remove org_* " Ondrej Zary
2023-03-08 20:43 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 08/32] pata_parport-bpck6: remove mode " Ondrej Zary
2023-03-11 17:07 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 09/32] pata_parport-bpck6: remove " Ondrej Zary
2023-03-11 19:30 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 10/32] pata_parport-bpck6: remove parallel port bit defines Ondrej Zary
2023-03-07 22:46 ` [PATCH 11/32] parport_pc: add 16-bit and 8-bit fast EPP transfer flags Ondrej Zary
2023-03-11 20:09 ` Sergey Shtylyov
2023-03-11 20:31 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 12/32] pata_parport-bpck6: use parport access functions instead of port I/O Ondrej Zary
2023-03-07 22:46 ` Ondrej Zary [this message]
2023-03-07 22:46 ` [PATCH 14/32] pata_parport-bpck6: remove PPC_FLAGS Ondrej Zary
2023-03-11 20:12 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 15/32] pata_parport-bpck6: remove ppc6_close Ondrej Zary
2023-03-07 22:46 ` [PATCH 16/32] pata_parport-bpck6: merge ppc6_rd_port into bpck6_read_regr Ondrej Zary
2023-03-07 22:46 ` [PATCH 17/32] pata_parport-bpck6: merge ppc6_wr_port into bpck6_write_regr Ondrej Zary
2023-03-07 22:46 ` [PATCH 18/32] pata_parport-bpck6: merge ppc6_rd_port16_blk into bpck6_read_block Ondrej Zary
2023-03-07 22:46 ` [PATCH 19/32] pata_parport-bpck6: merge ppc6_wr_port16_blk into bpck6_write_block Ondrej Zary
2023-03-07 22:46 ` [PATCH 20/32] pata_parport-bpck6: merge ppc6_rd_data_blk into bpck6_read_block Ondrej Zary
2023-03-07 22:46 ` [PATCH 21/32] pata_parport-bpck6: merge ppc6_wr_data_blk into bpck6_write_block Ondrej Zary
2023-03-07 22:46 ` [PATCH 22/32] pata_parport-bpck6: move ppc6_wait_for_fifo to bpck6.c and rename Ondrej Zary
2023-03-07 22:46 ` [PATCH 23/32] pata_parport-bpck6: move ppc6_wr_extout " Ondrej Zary
2023-03-07 22:46 ` [PATCH 24/32] pata_parport-bpck6: move ppc6_open " Ondrej Zary
2023-03-07 22:46 ` [PATCH 25/32] pata_parport-bpck6: merge ppc6_select into bpck6_open Ondrej Zary
2023-03-07 22:46 ` [PATCH 26/32] pata_parport-bpck6: move ppc6_deselect to bpck6.c and rename Ondrej Zary
2023-03-07 22:46 ` [PATCH 27/32] pata_parport-bpck6: move ppc6_send_cmd " Ondrej Zary
2023-03-07 22:46 ` [PATCH 28/32] pata_parport-bpck6: move ppc6_rd_data_byte " Ondrej Zary
2023-03-07 22:46 ` [PATCH 29/32] pata_parport-bpck6: move ppc6_wr_data_byte " Ondrej Zary
2023-03-07 22:46 ` [PATCH 30/32] pata_parport-bpck6: move defines and mode_map to bpck6.c Ondrej Zary
2023-03-07 22:46 ` [PATCH 31/32] pata_parport-bpck6: delete ppc6lnx.c Ondrej Zary
2023-03-11 20:15 ` Sergey Shtylyov
2023-03-07 22:46 ` [PATCH 32/32] pata_parport-bpck6: reduce indents in bpck6_open Ondrej Zary
2023-03-11 20:00 ` [PATCH 00/32] pata_parport-bpck6: rework bpck6 protocol driver Sergey Shtylyov
2023-03-18 18:55 ` Ondrej Zary
2023-03-19 20:02 ` Sergey Shtylyov
2023-03-22 12:10 ` Ondrej Zary
2023-03-22 22:34 ` Damien Le Moal
2023-03-26 9:08 ` Sudip Mukherjee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230307224627.28011-14-linux@zary.sk \
--to=linux@zary.sk \
--cc=axboe@kernel.dk \
--cc=damien.lemoal@opensource.wdc.com \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parport@lists.infradead.org \
--cc=s.shtylyov@omp.ru \
--cc=sudipm.mukherjee@gmail.com \
--cc=tim@cyberelk.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).