From 8be559baa979c15e78f8dba7879b383dbe3936d3 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 6 May 2011 22:59:15 -0700 Subject: altos: Hook up the P1 ISR for TeleBT v0.1 bt_link line Otherwise, we're heading off into the weeds... Signed-off-by: Keith Packard --- src/ao_usb.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/ao_usb.c') diff --git a/src/ao_usb.c b/src/ao_usb.c index ece6756a..dd752152 100644 --- a/src/ao_usb.c +++ b/src/ao_usb.c @@ -59,8 +59,10 @@ ao_usb_isr(void) __interrupt 6 if (USBCIF & USBCIF_RSTIF) ao_usb_set_interrupts(); #if HAS_BTM +#if BT_LINK_ON_P2 ao_btm_isr(); #endif +#endif } struct ao_usb_setup { -- cgit v1.2.3 From 66bdf0e066bc0bb7a326a6c2a9c88b69e5c1be66 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 6 May 2011 23:12:47 -0700 Subject: altos: clear CPU port 1 interrupt flag when handled Signed-off-by: Keith Packard --- src/ao_btm.c | 3 +++ src/ao_usb.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/ao_usb.c') diff --git a/src/ao_btm.c b/src/ao_btm.c index 172004e9..a9306c10 100644 --- a/src/ao_btm.c +++ b/src/ao_btm.c @@ -257,6 +257,9 @@ ao_btm_isr(void) __interrupt 15 #endif { +#if BT_LINK_ON_P1 + P1IF = 0; +#endif if (BT_PIFG & (1 << BT_LINK_PIN_INDEX)) { ao_btm_check_link(); ao_wakeup(&ao_btm_connected); diff --git a/src/ao_usb.c b/src/ao_usb.c index dd752152..e4b7938d 100644 --- a/src/ao_usb.c +++ b/src/ao_usb.c @@ -46,7 +46,6 @@ void ao_usb_isr(void) __interrupt 6 { USBIF = 0; - IRCON2 &= ~IRCON2_USBIF; ao_usb_iif |= USBIIF; if (ao_usb_iif & 1) ao_wakeup(&ao_usb_task); -- cgit v1.2.3