Skip to content

Commit b040627

Browse files
Ondrej ZaryDamien Le Moal
Ondrej Zary
authored and
Damien Le Moal
committed
ata: pata_parport-bpck6: move ppc6_send_cmd to bpck6.c and rename
Move ppc6_send_cmd to bpck6.c and rename it to bpck6_send_cmd Signed-off-by: Ondrej Zary <[email protected]> Signed-off-by: Damien Le Moal <[email protected]>
1 parent 82e16f8 commit b040627

File tree

2 files changed

+33
-44
lines changed

2 files changed

+33
-44
lines changed

‎drivers/ata/pata_parport/bpck6.c

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,37 @@
1919
#include "pata_parport.h"
2020
#include "ppc6lnx.c"
2121

22+
static void bpck6_send_cmd(struct pi_adapter *pi, u8 cmd)
23+
{
24+
switch (mode_map[pi->mode]) {
25+
case PPCMODE_UNI_SW:
26+
case PPCMODE_UNI_FW:
27+
case PPCMODE_BI_SW:
28+
case PPCMODE_BI_FW:
29+
parport_write_data(pi->pardev->port, cmd);
30+
parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_AUTOFD);
31+
break;
32+
case PPCMODE_EPP_BYTE:
33+
case PPCMODE_EPP_WORD:
34+
case PPCMODE_EPP_DWORD:
35+
pi->pardev->port->ops->epp_write_addr(pi->pardev->port, &cmd, 1, 0);
36+
break;
37+
}
38+
}
39+
2240
static int bpck6_read_regr(struct pi_adapter *pi, int cont, int reg)
2341
{
2442
u8 port = cont ? reg | 8 : reg;
2543

26-
ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_READ);
44+
bpck6_send_cmd(pi, port | ACCESS_PORT | ACCESS_READ);
2745
return ppc6_rd_data_byte(pi);
2846
}
2947

3048
static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val)
3149
{
3250
u8 port = cont ? reg | 8 : reg;
3351

34-
ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE);
52+
bpck6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE);
3553
ppc6_wr_data_byte(pi, val);
3654
}
3755

@@ -49,13 +67,13 @@ static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len)
4967
{
5068
u8 this, last;
5169

52-
ppc6_send_cmd(pi, REG_BLKSIZE | ACCESS_REG | ACCESS_WRITE);
70+
bpck6_send_cmd(pi, REG_BLKSIZE | ACCESS_REG | ACCESS_WRITE);
5371
ppc6_wr_data_byte(pi, (u8)len);
5472
ppc6_wr_data_byte(pi, (u8)(len >> 8));
5573
ppc6_wr_data_byte(pi, 0);
5674

57-
ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_IO16 | PREFIX_BLK);
58-
ppc6_send_cmd(pi, ATA_REG_DATA | ACCESS_PORT | ACCESS_WRITE);
75+
bpck6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_IO16 | PREFIX_BLK);
76+
bpck6_send_cmd(pi, ATA_REG_DATA | ACCESS_PORT | ACCESS_WRITE);
5977

6078
switch (mode_map[pi->mode]) {
6179
case PPCMODE_UNI_SW:
@@ -68,7 +86,7 @@ static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len)
6886
break;
6987
case PPCMODE_UNI_FW:
7088
case PPCMODE_BI_FW:
71-
ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_FASTWR);
89+
bpck6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_FASTWR);
7290

7391
parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE,
7492
PARPORT_CONTROL_STROBE);
@@ -92,7 +110,7 @@ static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len)
92110

93111
parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE,
94112
0);
95-
ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_FASTWR);
113+
bpck6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_FASTWR);
96114
break;
97115
case PPCMODE_EPP_BYTE:
98116
pi->pardev->port->ops->epp_write_data(pi->pardev->port, buf,
@@ -111,18 +129,18 @@ static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len)
111129
break;
112130
}
113131

114-
ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_IO16 | PREFIX_BLK);
132+
bpck6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_IO16 | PREFIX_BLK);
115133
}
116134

117135
static void bpck6_read_block(struct pi_adapter *pi, char *buf, int len)
118136
{
119-
ppc6_send_cmd(pi, REG_BLKSIZE | ACCESS_REG | ACCESS_WRITE);
137+
bpck6_send_cmd(pi, REG_BLKSIZE | ACCESS_REG | ACCESS_WRITE);
120138
ppc6_wr_data_byte(pi, (u8)len);
121139
ppc6_wr_data_byte(pi, (u8)(len >> 8));
122140
ppc6_wr_data_byte(pi, 0);
123141

124-
ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_IO16 | PREFIX_BLK);
125-
ppc6_send_cmd(pi, ATA_REG_DATA | ACCESS_PORT | ACCESS_READ);
142+
bpck6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_IO16 | PREFIX_BLK);
143+
bpck6_send_cmd(pi, ATA_REG_DATA | ACCESS_PORT | ACCESS_READ);
126144

127145
switch (mode_map[pi->mode]) {
128146
case PPCMODE_UNI_SW:
@@ -171,7 +189,7 @@ static void bpck6_read_block(struct pi_adapter *pi, char *buf, int len)
171189
break;
172190
}
173191

174-
ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_IO16 | PREFIX_BLK);
192+
bpck6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_IO16 | PREFIX_BLK);
175193
}
176194

177195
static int bpck6_open(struct pi_adapter *pi)
@@ -218,10 +236,10 @@ static int bpck6_open(struct pi_adapter *pi)
218236

219237
pi->private = 0;
220238

221-
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
239+
bpck6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
222240
ppc6_wr_data_byte(pi, RAMSIZE_128K);
223241

224-
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
242+
bpck6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
225243
if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C)
226244
pi->private |= fifo_wait;
227245

@@ -252,7 +270,7 @@ static void bpck6_deselect(struct pi_adapter *pi)
252270

253271
static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)
254272
{
255-
ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
273+
bpck6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
256274
ppc6_wr_data_byte(pi, (u8)((regdata & 0x03) << 6));
257275
}
258276

‎drivers/ata/pata_parport/ppc6lnx.c

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767

6868
//***************************************************************************
6969

70-
static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd);
7170
static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data);
7271
static u8 ppc6_rd_data_byte(struct pi_adapter *pi);
7372

@@ -78,34 +77,6 @@ int mode_map[] = { PPCMODE_UNI_FW, PPCMODE_BI_FW, PPCMODE_EPP_BYTE,
7877

7978
//***************************************************************************
8079

81-
static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd)
82-
{
83-
switch (mode_map[pi->mode])
84-
{
85-
case PPCMODE_UNI_SW :
86-
case PPCMODE_UNI_FW :
87-
case PPCMODE_BI_SW :
88-
case PPCMODE_BI_FW :
89-
{
90-
parport_write_data(pi->pardev->port, cmd);
91-
parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_AUTOFD);
92-
93-
break;
94-
}
95-
96-
case PPCMODE_EPP_BYTE :
97-
case PPCMODE_EPP_WORD :
98-
case PPCMODE_EPP_DWORD :
99-
{
100-
pi->pardev->port->ops->epp_write_addr(pi->pardev->port, &cmd, 1, 0);
101-
102-
break;
103-
}
104-
}
105-
}
106-
107-
//***************************************************************************
108-
10980
static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data)
11081
{
11182
switch (mode_map[pi->mode])

0 commit comments

Comments
 (0)