From fd48c95debdd2cb46c745ded2b63e4897a08d441 Mon Sep 17 00:00:00 2001
From: Balint Kovacs <dratini0@gmail.com>
Date: Wed, 10 Jul 2019 01:49:56 +0200
Subject: [PATCH] Add a timeout to SPIWaitWriteEnd

Solves the WarioWare issue
---
 arm9/source/gamecart/spi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arm9/source/gamecart/spi.c b/arm9/source/gamecart/spi.c
index 6c3fdff..301a8ba 100644
--- a/arm9/source/gamecart/spi.c
+++ b/arm9/source/gamecart/spi.c
@@ -18,6 +18,7 @@
 
 #include "spi.h"
 #include "spicard.h"
+#include "timer.h"
 #include "ui.h"
 
 // Deliberately written in C! (except for a few lines)
@@ -44,10 +45,12 @@ int SPIWriteRead(CardType type, void* cmd, u32 cmdSize, void* answer, u32 answer
 int SPIWaitWriteEnd(CardType type) {
 	u8 cmd = SPI_CMD_RDSR, statusReg = 0;
 	int res = 0;
+	u64 time_start = timer_start();
 
 	do{
 		res = SPIWriteRead(type, &cmd, 1, &statusReg, 1, 0, 0);
 		if(res) return res;
+		if(timer_msec(time_start) > 1000) return 1;
 	} while(statusReg & SPI_FLG_WIP);
 
 	return 0;