From: Keith Packard Date: Sat, 7 May 2011 06:55:23 +0000 (-0700) Subject: Revert "altos: Debugging TBT issues -- check pin configuration after boot" X-Git-Tag: 0.9.3~40^2 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=479bdffa35d0b8d4e48868c8d20f3cb1549521ab Revert "altos: Debugging TBT issues -- check pin configuration after boot" This reverts commit 514348055630edec12224c4b0964240b929759a3. Looks like this was never a problem. --- diff --git a/src/ao_btm.c b/src/ao_btm.c index a9306c10..44155ec1 100644 --- a/src/ao_btm.c +++ b/src/ao_btm.c @@ -17,21 +17,6 @@ #include "ao.h" -#if BT_LINK_ON_P2 -#define BT_PICTL_ICON PICTL_P2ICON -#define BT_PIFG P2IFG -#define BT_PDIR P2DIR -#define BT_PINP P2INP -#define BT_IEN2_PIE IEN2_P2IE -#endif -#if BT_LINK_ON_P1 -#define BT_PICTL_ICON PICTL_P1ICON -#define BT_PIFG P1IFG -#define BT_PDIR P1DIR -#define BT_PINP P1INP -#define BT_IEN2_PIE IEN2_P1IE -#endif - int8_t ao_btm_stdio; __xdata uint8_t ao_btm_connected; @@ -181,15 +166,6 @@ ao_btm(void) */ ao_delay(AO_SEC_TO_TICKS(3)); -#if BT_LINK_ON_P1 - if ((P1DIR & (1 << 6)) == 0) - ao_panic(AO_PANIC_BT); - if ((P1DIR & (1 << 7)) != 0) - ao_panic(AO_PANIC_BT); - if ((P0SEL & ((1 << 5) | (1 << 4) | (1 << 3) | (1 << 2))) != - ((1 << 5) | (1 << 4) | (1 << 3) | (1 << 2))) - ao_panic(AO_PANIC_BT); -#endif #if HAS_BEEP ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(200)); #endif @@ -236,6 +212,21 @@ ao_btm(void) __xdata struct ao_task ao_btm_task; +#if BT_LINK_ON_P2 +#define BT_PICTL_ICON PICTL_P2ICON +#define BT_PIFG P2IFG +#define BT_PDIR P2DIR +#define BT_PINP P2INP +#define BT_IEN2_PIE IEN2_P2IE +#endif +#if BT_LINK_ON_P1 +#define BT_PICTL_ICON PICTL_P1ICON +#define BT_PIFG P1IFG +#define BT_PDIR P1DIR +#define BT_PINP P1INP +#define BT_IEN2_PIE IEN2_P1IE +#endif + void ao_btm_check_link() __critical {