Skip to content

Handle volatile MMIO correctly in acata #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uyjulian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle volatile MMIO correctly in acata #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions iop/arcade/acata/src/ata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ int ata_probe(acAtaReg atareg)
while ( (*((volatile acUint16 *)0xB6070000) & 0x80) != 0 )
;
*((volatile acUint16 *)0xB6020000) = 4660;
if ( *((volatile acUint16 *)0xB6020000) != 52 )
return 0;
*((volatile acUint16 *)0xB6030000) = 18;
if ( *((volatile acUint16 *)0xB6030000) != 18 )
return 0;
active = 0;
unit = 0;
*((volatile acUint16 *)0xB6160000) = 2;
Expand All @@ -200,6 +204,7 @@ int ata_probe(acAtaReg atareg)
{
*((volatile acUint16 *)0xB6060000) = 16 * (unit != 0);
*((volatile acUint16 *)0xB6070000) = 0;
*((volatile acUint16 *)0xB6070000) = 0;
while ( count <= 1999999 )
{
// cppcheck-suppress knownConditionTrueFalse
Expand Down
8 changes: 4 additions & 4 deletions iop/arcade/acata/src/atacmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
{
sr = *((volatile acUint16 *)0xB6160000);
ret_v20 = sr & 0xFF;
while ( (*((volatile acUint16 *)0xB6160000) & 0x80) != 0 )
while ( (ret_v20 & 0x80) != 0 )
{
ret_v20 = -116;
if ( SleepThread() != 0 )
Expand All @@ -226,7 +226,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
else
{
ret_v20 = *((volatile acUint16 *)0xB6070000);
while ( (*((volatile acUint16 *)0xB6070000) & 0x80) != 0 )
while ( (ret_v20 & 0x80) != 0 )
{
sr = *((volatile acUint16 *)0xB6070000);
ret_v20 = sr & 0xFF;
Expand Down Expand Up @@ -257,7 +257,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
{
sr_v25 = *((volatile acUint16 *)0xB6160000);
sr_v25 = sr_v25 & 0xFF;
while ( (*((volatile acUint16 *)0xB6160000) & 0x80) != 0 )
while ( (sr_v25 & 0x80) != 0 )
{
sr_v25 = -116;
if ( SleepThread() )
Expand All @@ -268,7 +268,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
else
{
sr_v25 = *((volatile acUint16 *)0xB6070000);
while ( (*((volatile acUint16 *)0xB6070000) & 0x80) != 0 )
while ( (sr_v25 & 0x80) != 0 )
{
sr_v25 = *((volatile acUint16 *)0xB6070000);
sr_v25 = sr_v25 & 0xFF;
Expand Down
9 changes: 5 additions & 4 deletions iop/arcade/acata/src/atapicmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ static int atapi_packet_send(acAtaReg atareg, acAtapiPacketData *pkt, int flag)
*((volatile acUint16 *)0xB6010000) = flag & 1;
*((volatile acUint16 *)0xB6070000) = 160;
tmout = 999;
v6 = 1000;
// cppcheck-suppress knownConditionTrueFalse
while ( (*((volatile acUint16 *)0xB6070000) & 0x80) != 0 )
{
Expand Down Expand Up @@ -138,7 +139,7 @@ static int atapi_pio_read(acAtaReg atareg, acUint16 *buf, int count, int flag)
if ( !sr )
{
sr_v5 = *((volatile acUint16 *)0xB6070000);
while ( (*((volatile acUint16 *)0xB6070000) & 0x80) != 0 )
while ( (sr_v5 & 0x80) != 0 )
{
xlen = *((volatile acUint16 *)0xB6070000);
sr_v5 = xlen & 0xFF;
Expand All @@ -148,7 +149,7 @@ static int atapi_pio_read(acAtaReg atareg, acUint16 *buf, int count, int flag)
{
xlen = *((volatile acUint16 *)0xB6160000);
sr_v5 = xlen & 0xFF;
while ( (*((volatile acUint16 *)0xB6160000) & 0x80) != 0 )
while ( (sr_v5 & 0x80) != 0 )
{
sr_v5 = -116;
if ( SleepThread() != 0 )
Expand Down Expand Up @@ -314,7 +315,7 @@ static int atapi_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
{
xlen = *((volatile acUint16 *)0xB6160000);
sr_v14 = xlen & 0xFF;
while ( (*((volatile acUint16 *)0xB6160000) & 0x80) != 0 )
while ( (sr_v14 & 0x80) != 0 )
{
sr_v14 = -116;
if ( SleepThread() != 0 )
Expand All @@ -325,7 +326,7 @@ static int atapi_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
else
{
sr_v14 = *((volatile acUint16 *)0xB6070000);
while ( (*((volatile acUint16 *)0xB6070000) & 0x80) != 0 )
while ( (sr_v14 & 0x80) != 0 )
{
xlen = *((volatile acUint16 *)0xB6070000);
sr_v14 = xlen & 0xFF;
Expand Down