Bläddra i källkod

Firmware/CIC: do more to prevent unsolicited pair mode entry

Maximilian Rehkopf 12 år sedan
förälder
incheckning
aa4b8b6ade
2 ändrade filer med 4 tillägg och 3 borttagningar
  1. 2 2
      src/bootldr/main.c
  2. 2 1
      src/main.c

+ 2 - 2
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] */

+ 2 - 1
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] */