projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mjb/altosdroid'
[fw/altos]
/
src
/
cc1111
/
ao_usb.c
diff --git
a/src/cc1111/ao_usb.c
b/src/cc1111/ao_usb.c
index 08cb73900c6462fe52d7d8bfafe1b6a28ff47d90..ce26e8088a4cfee539b78bb82ea54538dab1af9d 100644
(file)
--- a/
src/cc1111/ao_usb.c
+++ b/
src/cc1111/ao_usb.c
@@
-62,6
+62,9
@@
ao_usb_isr(void) __interrupt 6
ao_btm_isr();
#endif
#endif
ao_btm_isr();
#endif
#endif
+#if HAS_P2_ISR
+ ao_p2_isr();
+#endif
}
struct ao_usb_setup {
}
struct ao_usb_setup {
@@
-258,15
+261,15
@@
ao_usb_ep0_setup(void)
break;
case AO_USB_TYPE_CLASS:
switch (ao_usb_setup.request) {
break;
case AO_USB_TYPE_CLASS:
switch (ao_usb_setup.request) {
- case SET_LINE_CODING:
+ case
AO_USB_
SET_LINE_CODING:
ao_usb_ep0_out_len = 7;
ao_usb_ep0_out_data = (__xdata uint8_t *) &ao_usb_line_coding;
break;
ao_usb_ep0_out_len = 7;
ao_usb_ep0_out_data = (__xdata uint8_t *) &ao_usb_line_coding;
break;
- case GET_LINE_CODING:
+ case
AO_USB_
GET_LINE_CODING:
ao_usb_ep0_in_len = 7;
ao_usb_ep0_in_data = (uint8_t *) &ao_usb_line_coding;
break;
ao_usb_ep0_in_len = 7;
ao_usb_ep0_in_data = (uint8_t *) &ao_usb_line_coding;
break;
- case SET_CONTROL_LINE_STATE:
+ case
AO_USB_
SET_CONTROL_LINE_STATE:
break;
}
break;
break;
}
break;