From d1cf776ebcf15891376347165cb3adbccea93982 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Sat, 18 Jan 2014 20:48:52 +0000 Subject: [PATCH] [lm4f] Remove usb cdc definitions moved to library Requires a library bump to match --- .../usb_to_serial_cdcacm.h | 21 ------------------- libopencm3 | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/examples/lm4f/stellaris-ek-lm4f120xl/usb_to_serial_cdcacm/usb_to_serial_cdcacm.h b/examples/lm4f/stellaris-ek-lm4f120xl/usb_to_serial_cdcacm/usb_to_serial_cdcacm.h index d8cf869..933e97a 100644 --- a/examples/lm4f/stellaris-ek-lm4f120xl/usb_to_serial_cdcacm/usb_to_serial_cdcacm.h +++ b/examples/lm4f/stellaris-ek-lm4f120xl/usb_to_serial_cdcacm/usb_to_serial_cdcacm.h @@ -26,27 +26,6 @@ #include #include -/* ============================================================================= - * Definitions missing from cdc.h - * - * TODO: Integrate those definitions into cdc.h - * ---------------------------------------------------------------------------*/ - -/* Table 17: Line Coding Structure */ -enum usb_cdc_line_coding_bCharFormat { - USB_CDC_1_STOP_BITS = 0, - USB_CDC_1_5_STOP_BITS = 1, - USB_CDC_2_STOP_BITS = 2, -}; - -enum usb_cdc_line_coding_bParityType { - USB_CDC_NO_PARITY = 0, - USB_CDC_ODD_PARITY = 1, - USB_CDC_EVEN_PARITY = 2, - USB_CDC_MARK_PARITY = 3, - USB_CDC_SPACE_PARITY = 4, -}; - /* ============================================================================= * UART control * ---------------------------------------------------------------------------*/ diff --git a/libopencm3 b/libopencm3 index a909b5c..5830a1e 160000 --- a/libopencm3 +++ b/libopencm3 @@ -1 +1 @@ -Subproject commit a909b5ca9e18f802e3caef19e63d38861662c128 +Subproject commit 5830a1ee8a4c2e3b3a2a8fd2c56ad6d368e42eb0