korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 04:31:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

ata: pata_parport-bpck6: merge ppc6_select into bpck6_open

Browse Source 
ppc6_select is only called by bpck6_open. Merge ppc6_select into
bpck6_open.

Signed-off-by: Ondrej Zary <linux@zary.sk>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
This commit is contained in:
Ondrej Zary 2023-03-07 23:46:20 +01:00 committed by Damien Le Moal
parent 7c97e4680a
commit cad40b2a00
2 changed files with 52 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/ata/pata_parport/bpck6.c
View File

@ -176,21 +176,63 @@ static void bpck6_read_block(struct pi_adapter *pi, char *buf, int len)
static int bpck6_open(struct pi_adapter *pi) static int bpck6_open(struct pi_adapter *pi)
{ {
int ret = ppc6_select(pi); u8 i, j, k;
if (ret == 0) pi->saved_r0 = parport_read_data(pi->pardev->port);
return ret; pi->saved_r2 = parport_read_control(pi->pardev->port) & 0x5F;
pi->private = 0; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT,
PARPORT_CONTROL_SELECT);
if (pi->saved_r0 == 'b')
parport_write_data(pi->pardev->port, 'x');
parport_write_data(pi->pardev->port, 'b');
parport_write_data(pi->pardev->port, 'p');
parport_write_data(pi->pardev->port, pi->unit);
parport_write_data(pi->pardev->port, ~pi->unit);
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE); parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, 0);
ppc6_wr_data_byte(pi, RAMSIZE_128K); parport_write_control(pi->pardev->port, PARPORT_CONTROL_INIT);
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION); i = mode_map[pi->mode] & 0x0C;
if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C) if (i == 0)
pi->private |= fifo_wait; i = (mode_map[pi->mode] & 2) | 1;
parport_write_data(pi->pardev->port, i);
return ret; parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT,
PARPORT_CONTROL_SELECT);
parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD,
PARPORT_CONTROL_AUTOFD);
j = ((i & 0x08) << 4) | ((i & 0x07) << 3);
k = parport_read_status(pi->pardev->port) & 0xB8;
if (j == k) {
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
parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_SELECT | PARPORT_CONTROL_INIT, 0);
else // PPC/ECP
parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_SELECT, 0);
pi->private = 0;
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
ppc6_wr_data_byte(pi, RAMSIZE_128K);
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C)
pi->private |= fifo_wait;
return 1;
}
}
parport_write_control(pi->pardev->port, pi->saved_r2);
parport_write_data(pi->pardev->port, pi->saved_r0);
return 0; // FAIL
} }
static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata) static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)

66
drivers/ata/pata_parport/ppc6lnx.c
View File

@ -67,7 +67,6 @@
//*************************************************************************** //***************************************************************************
static int ppc6_select(struct pi_adapter *pi);
static void ppc6_deselect(struct pi_adapter *pi); static void ppc6_deselect(struct pi_adapter *pi);
static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd); static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd);
static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data); static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data);
@ -78,71 +77,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi);
int mode_map[] = { PPCMODE_UNI_FW, PPCMODE_BI_FW, PPCMODE_EPP_BYTE, int mode_map[] = { PPCMODE_UNI_FW, PPCMODE_BI_FW, PPCMODE_EPP_BYTE,
PPCMODE_EPP_WORD, PPCMODE_EPP_DWORD }; PPCMODE_EPP_WORD, PPCMODE_EPP_DWORD };
static int ppc6_select(struct pi_adapter *pi)
{
u8 i, j, k;
pi->saved_r0 = parport_read_data(pi->pardev->port);
pi->saved_r2 = parport_read_control(pi->pardev->port) & 0x5F; // readback 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');
parport_write_data(pi->pardev->port, 'b');
parport_write_data(pi->pardev->port, 'p');
parport_write_data(pi->pardev->port, pi->unit);
parport_write_data(pi->pardev->port, ~pi->unit);
parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, 0);
parport_write_control(pi->pardev->port, PARPORT_CONTROL_INIT);
i = mode_map[pi->mode] & 0x0C;
if (i == 0)
i = (mode_map[pi->mode] & 2) | 1;
parport_write_data(pi->pardev->port, i);
parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
// DELAY
parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, PARPORT_CONTROL_AUTOFD);
j = ((i & 0x08) << 4) | ((i & 0x07) << 3);
k = parport_read_status(pi->pardev->port) & 0xB8;
if (j == k)
{
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
parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_SELECT | PARPORT_CONTROL_INIT, 0);
else // PPC/ECP
parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_SELECT, 0);
return(1);
}
}
parport_write_control(pi->pardev->port, pi->saved_r2);
parport_write_data(pi->pardev->port, pi->saved_r0);
return(0); // FAIL
}
//*************************************************************************** //***************************************************************************
static void ppc6_deselect(struct pi_adapter *pi) static void ppc6_deselect(struct pi_adapter *pi)