Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IR card support

Browse Source 
This is based on the latest update of GBATEK.
This commit is contained in:
Balint Kovacs 2021-03-30 00:31:44 +01:00 committed by d0k3
parent 6799b24730
commit cc99734fac
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arm9/source/gamecart/card_spi.c
View File

@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include <arm.h>
#include "card_spi.h"
#include <spi.h>
#include "timer.h"
@ -102,6 +103,8 @@ int CardSPIWriteRead(bool infrared, const void* cmd, u32 cmdSize, void* answer,
if (infrared) {
SPI_XferInfo irXfer = { &headerFooterVal, 1, false };
SPI_DoXfer(SPI_DEV_CART_IR, &irXfer, 1, false);
// Wait as specified by GBATEK (0x800 cycles at 33 MHz)
ARM_WaitCycles(0x800 * 4);
}
SPI_XferInfo transfers[3] = {
@ -113,6 +116,11 @@ int CardSPIWriteRead(bool infrared, const void* cmd, u32 cmdSize, void* answer,
REG_CFG9_CARDCTL &= ~CARDCTL_SPICARD;
if (infrared) {
// Wait as specified by GBATEK (0x800 cycles at 33 MHz)
ARM_WaitCycles(0x800 * 4);
}
return 0;
}
@ -167,7 +175,7 @@ int CardSPIReadJEDECIDAndStatusReg(bool infrared, u32* id, u8* statusReg) {
u8 reg = 0;
u8 idbuf[3] = { 0 };
u32 id_ = 0;
int res = CardSPIWaitWriteEnd(infrared, 0);
int res = CardSPIWaitWriteEnd(infrared, 10);
if (res) return res;
if ((res = CardSPIWriteRead(infrared, &cmd, 1, idbuf, 3, 0, 0))) return res;
@ -446,11 +454,6 @@ CardSPIType CardSPIGetCardSPIType(bool infrared) {
CardSPIType t = {NO_CHIP, infrared};
int res;
if(infrared) {
// Infrared carts currently not supported, need additional handling!
return (CardSPIType) {NO_CHIP, true};
}
res = CardSPIReadJEDECIDAndStatusReg(infrared, &jedec, &sr);
if (res) return (CardSPIType) {NO_CHIP, false};