diff options
| author | Keith Packard <keithp@keithp.com> | 2011-05-11 08:16:29 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-11 08:16:29 -0700 |
| commit | fef945e36c2397dd39b68995ed8d2ab81a4d24cd (patch) | |
| tree | 32260e89ee5bb0f77d56acb5c6b558b55154636f /src/ao_usb.c | |
| parent | 4c6fddf6f6ea7247291272af39966ab94260fb01 (diff) | |
| parent | 479bdffa35d0b8d4e48868c8d20f3cb1549521ab (diff) | |
Merge branch 'telebt' into telescience
Diffstat (limited to 'src/ao_usb.c')
| -rw-r--r-- | src/ao_usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ao_usb.c b/src/ao_usb.c index ece6756a..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); @@ -59,8 +58,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 { |