From 770a072e16a410511e0e2fa88dbde23bb0a8ba24 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Fri, 3 Aug 2012 23:39:04 -0400 Subject: usb_cdcacm: various fixups. Mark internal state static. Properly reset the RX/TX state on USB reset. Choose better names for countTx and newBytes. Move the exposed configuration back into the .c; this information is not beneficial to hooks. Signed-off-by: Marti Bolivar --- libmaple/include/libmaple/usb_cdcacm.h | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'libmaple/include') diff --git a/libmaple/include/libmaple/usb_cdcacm.h b/libmaple/include/libmaple/usb_cdcacm.h index 2cb3ad4..5ceecc3 100644 --- a/libmaple/include/libmaple/usb_cdcacm.h +++ b/libmaple/include/libmaple/usb_cdcacm.h @@ -41,31 +41,6 @@ extern "C" { #endif -/* - * Exposed configuration - */ - -#define USB_CDCACM_CTRL_EPNUM 0x00 -#define USB_CDCACM_CTRL_RX_ADDR 0x40 -#define USB_CDCACM_CTRL_TX_ADDR 0x80 -#define USB_CDCACM_CTRL_EPSIZE 0x40 - -#define USB_CDCACM_TX_ENDP 1 -#define USB_CDCACM_TX_EPNUM 0x01 -#define USB_CDCACM_TX_ADDR 0xC0 -#define USB_CDCACM_TX_EPSIZE 0x40 - -#define USB_CDCACM_MANAGEMENT_ENDP 2 -#define USB_CDCACM_MANAGEMENT_EPNUM 0x02 -#define USB_CDCACM_MANAGEMENT_ADDR 0x100 -#define USB_CDCACM_MANAGEMENT_EPSIZE 0x40 - -#define USB_CDCACM_RX_ENDP 3 -#define USB_CDCACM_RX_EPNUM 0x03 -#define USB_CDCACM_RX_ADDR 0x110 -#define USB_CDCACM_RX_EPSIZE 0x40 -#define USB_CDCACM_RX_BUFLEN (USB_CDCACM_RX_EPSIZE*3) - /* * CDC ACM Requests */ -- cgit v1.2.3