From aa4b8b6ade4d89b38cf5979bbe98b3f946f8cc23 Mon Sep 17 00:00:00 2001 From: Maximilian Rehkopf Date: Sat, 8 Oct 2011 17:27:02 +0200 Subject: [PATCH] Firmware/CIC: do more to prevent unsolicited pair mode entry --- src/bootldr/main.c | 4 ++-- src/main.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bootldr/main.c b/src/bootldr/main.c index 8ada71d..6235cde 100644 --- a/src/bootldr/main.c +++ b/src/bootldr/main.c @@ -26,9 +26,9 @@ extern volatile tick_t ticks; int (*chain)(void) = (void*)(FW_START+0x000001c5); int main(void) { - LPC_GPIO2->FIODIR = BV(0) | BV(1) | BV(2); + SNES_CIC_PAIR_REG->FIODIR = BV(SNES_CIC_PAIR_BIT); BITBAND(SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT) = 1; - LPC_GPIO1->FIODIR = BV(25); +/* LPC_GPIO2->FIODIR = BV(0) | BV(1) | BV(2); */ LPC_GPIO0->FIODIR = BV(16); /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */ diff --git a/src/main.c b/src/main.c index fd3e5d4..90f0332 100644 --- a/src/main.c +++ b/src/main.c @@ -48,7 +48,8 @@ enum system_states { int main(void) { LPC_GPIO2->FIODIR = BV(4) | BV(5); - LPC_GPIO1->FIODIR = BV(23); + LPC_GPIO1->FIODIR = BV(23) | BV(SNES_CIC_PAIR_BIT); + BITBAND(SNES_CIC_PAIR_REG->FIOSET, SNES_CIC_PAIR_BIT) = 1; LPC_GPIO0->FIODIR = BV(16); /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */