Merge pull request #798 from uyjulian/acata_fix_mmio

fjtrujy · web-flow · commit 37099fcc6239 · 2026-01-04T13:41:42.000+01:00
Handle volatile MMIO correctly in acata
diff --git a/iop/arcade/acata/src/ata.c b/iop/arcade/acata/src/ata.c
@@ -190,7 +190,13 @@ int ata_probe(acAtaReg atareg)
 	while ( (*((volatile acUint16 *)0xB6070000) & 0x80) != 0 )
 		;
 	*((volatile acUint16 *)0xB6020000) = 4660;
+	// cppcheck-suppress knownConditionTrueFalse
+	if ( *((volatile acUint16 *)0xB6020000) != 52 )
+		return 0;
 	*((volatile acUint16 *)0xB6030000) = 18;
+	// cppcheck-suppress knownConditionTrueFalse
+	if ( *((volatile acUint16 *)0xB6030000) != 18 )
+		return 0;
 	active = 0;
 	unit = 0;
 	*((volatile acUint16 *)0xB6160000) = 2;
@@ -200,6 +206,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
diff --git a/iop/arcade/acata/src/atacmd.c b/iop/arcade/acata/src/atacmd.c
@@ -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 )
@@ -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;
@@ -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() )
@@ -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;
diff --git a/iop/arcade/acata/src/atapicmd.c b/iop/arcade/acata/src/atapicmd.c
@@ -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 )
 	{
@@ -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;
@@ -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 )
@@ -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 )
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)`
`215`	`215`	`{`
`216`	`216`	`sr = ((volatile acUint16 )0xB6160000);`
`217`	`217`	`ret_v20 = sr & 0xFF;`
`218`		`- while ( (((volatile acUint16 )0xB6160000) & 0x80) != 0 )`
	`218`	`+ while ( (ret_v20 & 0x80) != 0 )`
`219`	`219`	`{`
`220`	`220`	`ret_v20 = -116;`
`221`	`221`	`if ( SleepThread() != 0 )`
`@@ -226,7 +226,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)`
`226`	`226`	`else`
`227`	`227`	`{`
`228`	`228`	`ret_v20 = ((volatile acUint16 )0xB6070000);`
`229`		`- while ( (((volatile acUint16 )0xB6070000) & 0x80) != 0 )`
	`229`	`+ while ( (ret_v20 & 0x80) != 0 )`
`230`	`230`	`{`
`231`	`231`	`sr = ((volatile acUint16 )0xB6070000);`
`232`	`232`	`ret_v20 = sr & 0xFF;`
`@@ -257,7 +257,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)`
`257`	`257`	`{`
`258`	`258`	`sr_v25 = ((volatile acUint16 )0xB6160000);`
`259`	`259`	`sr_v25 = sr_v25 & 0xFF;`
`260`		`- while ( (((volatile acUint16 )0xB6160000) & 0x80) != 0 )`
	`260`	`+ while ( (sr_v25 & 0x80) != 0 )`
`261`	`261`	`{`
`262`	`262`	`sr_v25 = -116;`
`263`	`263`	`if ( SleepThread() )`
`@@ -268,7 +268,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)`
`268`	`268`	`else`
`269`	`269`	`{`
`270`	`270`	`sr_v25 = ((volatile acUint16 )0xB6070000);`
`271`		`- while ( (((volatile acUint16 )0xB6070000) & 0x80) != 0 )`
	`271`	`+ while ( (sr_v25 & 0x80) != 0 )`
`272`	`272`	`{`
`273`	`273`	`sr_v25 = ((volatile acUint16 )0xB6070000);`
`274`	`274`	`sr_v25 = sr_v25 & 0xFF;`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ static int atapi_packet_send(acAtaReg atareg, acAtapiPacketData *pkt, int flag)`
`86`	`86`	`((volatile acUint16 )0xB6010000) = flag & 1;`
`87`	`87`	`((volatile acUint16 )0xB6070000) = 160;`
`88`	`88`	`tmout = 999;`
	`89`	`+ v6 = 1000;`
`89`	`90`	`// cppcheck-suppress knownConditionTrueFalse`
`90`	`91`	`while ( (((volatile acUint16 )0xB6070000) & 0x80) != 0 )`
`91`	`92`	`{`
`@@ -138,7 +139,7 @@ static int atapi_pio_read(acAtaReg atareg, acUint16 *buf, int count, int flag)`
`138`	`139`	`if ( !sr )`
`139`	`140`	`{`
`140`	`141`	`sr_v5 = ((volatile acUint16 )0xB6070000);`
`141`		`- while ( (((volatile acUint16 )0xB6070000) & 0x80) != 0 )`
	`142`	`+ while ( (sr_v5 & 0x80) != 0 )`
`142`	`143`	`{`
`143`	`144`	`xlen = ((volatile acUint16 )0xB6070000);`
`144`	`145`	`sr_v5 = xlen & 0xFF;`
`@@ -148,7 +149,7 @@ static int atapi_pio_read(acAtaReg atareg, acUint16 *buf, int count, int flag)`
`148`	`149`	`{`
`149`	`150`	`xlen = ((volatile acUint16 )0xB6160000);`
`150`	`151`	`sr_v5 = xlen & 0xFF;`
`151`		`- while ( (((volatile acUint16 )0xB6160000) & 0x80) != 0 )`
	`152`	`+ while ( (sr_v5 & 0x80) != 0 )`
`152`	`153`	`{`
`153`	`154`	`sr_v5 = -116;`
`154`	`155`	`if ( SleepThread() != 0 )`
`@@ -314,7 +315,7 @@ static int atapi_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)`
`314`	`315`	`{`
`315`	`316`	`xlen = ((volatile acUint16 )0xB6160000);`
`316`	`317`	`sr_v14 = xlen & 0xFF;`
`317`		`- while ( (((volatile acUint16 )0xB6160000) & 0x80) != 0 )`
	`318`	`+ while ( (sr_v14 & 0x80) != 0 )`
`318`	`319`	`{`
`319`	`320`	`sr_v14 = -116;`
`320`	`321`	`if ( SleepThread() != 0 )`
`@@ -325,7 +326,7 @@ static int atapi_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)`
`325`	`326`	`else`
`326`	`327`	`{`
`327`	`328`	`sr_v14 = ((volatile acUint16 )0xB6070000);`
`328`		`- while ( (((volatile acUint16 )0xB6070000) & 0x80) != 0 )`
	`329`	`+ while ( (sr_v14 & 0x80) != 0 )`
`329`	`330`	`{`
`330`	`331`	`xlen = ((volatile acUint16 )0xB6070000);`
`331`	`332`	`sr_v14 = xlen & 0xFF;`