aboutsummaryrefslogtreecommitdiff
path: root/src/stm32/cdcacm.c
diff options
context:
space:
mode:
authorGareth McMullin2012-05-26 20:57:47 +1200
committerGareth McMullin2012-05-26 20:57:47 +1200
commit3dcdc5b26f769ce9131b8a476d8dbe8992f1284e (patch)
tree367e23f7d301fd9e4eec9ae93a41c1546a63489f /src/stm32/cdcacm.c
parentb98d01dff89918a6fbab06127b30f47ee7827780 (diff)
Improve USB UART handling. Fix interrupt priorities.
Diffstat (limited to 'src/stm32/cdcacm.c')
-rw-r--r--src/stm32/cdcacm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/stm32/cdcacm.c b/src/stm32/cdcacm.c
index 6a70acc..99efaf8 100644
--- a/src/stm32/cdcacm.c
+++ b/src/stm32/cdcacm.c
@@ -521,7 +521,7 @@ static void cdcacm_set_config(u16 wValue)
/* Serial interface */
usbd_ep_setup(0x03, USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE, cdcacm_data_rx_cb);
- usbd_ep_setup(0x83, USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE, NULL);
+ usbd_ep_setup(0x83, USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE, uart_usb_buf_drain);
usbd_ep_setup(0x84, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL);
/* Trace interface */
@@ -563,9 +563,9 @@ void cdcacm_init(void)
usbd_set_control_buffer_size(sizeof(usbd_control_buffer));
usbd_register_set_config_callback(cdcacm_set_config);
- nvic_set_priority(NVIC_USB_LP_CAN_RX0_IRQ, 1);
+ nvic_set_priority(NVIC_USB_LP_CAN_RX0_IRQ, IRQ_PRI_USB);
nvic_enable_irq(NVIC_USB_LP_CAN_RX0_IRQ);
- nvic_set_priority(USB_VBUS_IRQ, 14);
+ nvic_set_priority(USB_VBUS_IRQ, IRQ_PRI_USB_VBUS);
nvic_enable_irq(USB_VBUS_IRQ);
gpio_set(USB_VBUS_PORT, USB_VBUS_PIN);