projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tagging 1.4 release
[fw/altos]
/
src
/
cc1111
/
ao_usb.c
diff --git
a/src/cc1111/ao_usb.c
b/src/cc1111/ao_usb.c
index b0ab409d7e72d96bbce7c3aba51231d13771ae89..d9d255f8334838cc9c5c7eb6632624536a77fb34 100644
(file)
--- a/
src/cc1111/ao_usb.c
+++ b/
src/cc1111/ao_usb.c
@@
-24,7
+24,7
@@
static __xdata uint16_t ao_usb_in_bytes;
static __pdata uint16_t ao_usb_in_bytes_last;
static __xdata uint16_t ao_usb_out_bytes;
static __pdata uint8_t ao_usb_iif;
static __pdata uint16_t ao_usb_in_bytes_last;
static __xdata uint16_t ao_usb_out_bytes;
static __pdata uint8_t ao_usb_iif;
-
static __pdata uint8_t
ao_usb_running;
+
__pdata uint8_t
ao_usb_running;
static void
ao_usb_set_interrupts(void)
static void
ao_usb_set_interrupts(void)
@@
-274,7
+274,7
@@
ao_usb_ep0_setup(void)
ao_usb_ep0_in_len = ao_usb_setup.length;
ao_usb_ep0_flush();
} else if (ao_usb_ep0_out_len) {
ao_usb_ep0_in_len = ao_usb_setup.length;
ao_usb_ep0_flush();
} else if (ao_usb_ep0_out_len) {
-
+
/* Receiving data from the host
*/
ao_usb_ep0_state = AO_USB_EP0_DATA_OUT;
/* Receiving data from the host
*/
ao_usb_ep0_state = AO_USB_EP0_DATA_OUT;
@@
-448,6
+448,9
@@
ao_usb_enable(void)
USBCIF = 0;
USBOIF = 0;
USBIIF = 0;
USBCIF = 0;
USBOIF = 0;
USBIIF = 0;
+#if HAS_USB_PULLUP
+ ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+#endif
}
void
}
void
@@
-459,6
+462,10
@@
ao_usb_disable(void)
USBCIE = 0;
IEN2 &= ~IEN2_USBIE;
USBCIE = 0;
IEN2 &= ~IEN2_USBIE;
+#if HAS_USB_PULLUP
+ ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+#endif
+
/* Clear any pending interrupts */
USBCIF = 0;
USBOIF = 0;
/* Clear any pending interrupts */
USBCIF = 0;
USBOIF = 0;
@@
-471,6
+478,9
@@
ao_usb_disable(void)
void
ao_usb_init(void)
{
void
ao_usb_init(void)
{
+#if HAS_USB_PULLUP
+ ao_enable_output(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+#endif
ao_usb_enable();
ao_add_task(&ao_usb_task, ao_usb_ep0, "usb");
ao_usb_enable();
ao_add_task(&ao_usb_task, ao_usb_ep0, "usb");