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 backwards compatibility with software that exclusively uses the old SPI interface

Browse Source 
fix PXI acknowledgement bug that prevented older GM9 from booting
This commit is contained in:
Wolfvak 2019-07-19 15:35:20 -03:00 committed by d0k3
parent 3061da4dcc
commit 07b2a2beb6
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arm11/source/hw/mcu.c
View File

@ -172,14 +172,14 @@ void MCU_HandleInterrupts(u32 __attribute__((unused)) irqn)
case MCU_SHELL_OPEN: case MCU_SHELL_OPEN:
MCU_PushToLCD(true); MCU_PushToLCD(true);
MCU_UpdateShellState(true); MCU_UpdateShellState(true);
TIMER_WaitTicks(CLK_MS_TO_TICKS(10)); TIMER_WaitTicks(CLK_MS_TO_TICKS(5));
MCU_ResetLED(); MCU_ResetLED();
break; break;
case MCU_SHELL_CLOSE: case MCU_SHELL_CLOSE:
MCU_PushToLCD(false); MCU_PushToLCD(false);
MCU_UpdateShellState(false); MCU_UpdateShellState(false);
TIMER_WaitTicks(CLK_MS_TO_TICKS(10)); TIMER_WaitTicks(CLK_MS_TO_TICKS(5));
break; break;
case MCU_VOL_SLIDER: case MCU_VOL_SLIDER:
@ -196,7 +196,7 @@ void MCU_HandleInterrupts(u32 __attribute__((unused)) irqn)
void MCU_Init(void) void MCU_Init(void)
{ {
u32 mask = 0xFFBF0800; const u32 mask = 0xFFBF0800;
MCU_WriteRegBuf(REG_INT_EN, (const u8*)&mask, sizeof(mask)); MCU_WriteRegBuf(REG_INT_EN, (const u8*)&mask, sizeof(mask));
MCU_ResetLED(); MCU_ResetLED();

7
arm11/source/hw/spi.c
View File

@ -126,3 +126,10 @@ void SPI_Init(void)
// interface used during the NDS days // interface used during the NDS days
*REG_CFG_SPI_CNT = 7; *REG_CFG_SPI_CNT = 7;
} }
void SPI_Deinit(void)
{
// Keep backwards compatibility with software that
// assumes all bus interfaces will be set to old
*REG_CFG_SPI_CNT = 0;
}

1
arm11/source/hw/spi.h
View File

@ -29,3 +29,4 @@ typedef struct {
int SPI_DoXfer(u32 dev, const SPI_XferInfo *xfer, u32 xfer_cnt); int SPI_DoXfer(u32 dev, const SPI_XferInfo *xfer, u32 xfer_cnt);
void SPI_Init(void); void SPI_Init(void);
void SPI_Deinit(void);

4
arm11/source/system/sys.c
View File

@ -118,7 +118,7 @@ void SYS_CoreZeroInit(void)
GPU_SetFramebufferMode(1, PDC_RGB24); GPU_SetFramebufferMode(1, PDC_RGB24);
MCU_PushToLCD(true); MCU_PushToLCD(true);
TIMER_WaitTicks(CLK_MS_TO_TICKS(10)); TIMER_WaitTicks(CLK_MS_TO_TICKS(5));
} }
void SYS_CoreInit(void) void SYS_CoreInit(void)
@ -163,6 +163,8 @@ void __attribute__((noreturn)) SYS_CoreShutdown(void)
ARM_SetACR(ARM_GetACR() & ARM_SetACR(ARM_GetACR() &
~(ACR_RETSTK | ACR_DBPRED | ACR_SBPRED | ACR_FOLDING | ACR_SMP)); ~(ACR_RETSTK | ACR_DBPRED | ACR_SBPRED | ACR_FOLDING | ACR_SMP));
SPI_Deinit();
if (!core) { if (!core) {
while(*LEGACY_BOOT_ENTRYPOINT == 0); while(*LEGACY_BOOT_ENTRYPOINT == 0);
((void (*)(void))(*LEGACY_BOOT_ENTRYPOINT))(); ((void (*)(void))(*LEGACY_BOOT_ENTRYPOINT))();

4
common/pxi.h
View File

@ -68,6 +68,7 @@ enum {
#define PXI_CNT_RECV_FIFO_EMPTY (BIT(8)) #define PXI_CNT_RECV_FIFO_EMPTY (BIT(8))
#define PXI_CNT_RECV_FIFO_FULL (BIT(9)) #define PXI_CNT_RECV_FIFO_FULL (BIT(9))
#define PXI_CNT_RECV_FIFO_AVAIL_IRQ (BIT(10)) #define PXI_CNT_RECV_FIFO_AVAIL_IRQ (BIT(10))
#define PXI_CNT_ACKNOWLEDGE_ERROR (BIT(14))
#define PXI_CNT_ENABLE_FIFO (BIT(15)) #define PXI_CNT_ENABLE_FIFO (BIT(15))
static inline void PXI_SetRemote(u8 msg) static inline void PXI_SetRemote(u8 msg)
@ -93,7 +94,8 @@ static inline void PXI_Reset(void)
*PXI_RECV; *PXI_RECV;
*PXI_CNT = 0; *PXI_CNT = 0;
*PXI_CNT = PXI_CNT_RECV_FIFO_AVAIL_IRQ | PXI_CNT_ENABLE_FIFO; *PXI_CNT = PXI_CNT_RECV_FIFO_AVAIL_IRQ | PXI_CNT_ENABLE_FIFO |
PXI_CNT_ACKNOWLEDGE_ERROR;
PXI_SetRemote(0xFF); PXI_SetRemote(0xFF);
} }