diff options
| -rw-r--r-- | any-led/Makefile | 6 | ||||
| -rw-r--r-- | lib/anyio.c | 38 |
2 files changed, 25 insertions, 19 deletions
diff --git a/any-led/Makefile b/any-led/Makefile index 0f15984..0ddabfb 100644 --- a/any-led/Makefile +++ b/any-led/Makefile @@ -29,7 +29,7 @@ SPREADAVR_PATH := .. RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/lufa-LUFA-140928 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -39,8 +39,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 -LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace any-led example\"" -D USB_PRODUCT_LEN=27 +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace any-led example\"" LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/lib/anyio.c b/lib/anyio.c index 2aae54e..1ccaf3a 100644 --- a/lib/anyio.c +++ b/lib/anyio.c @@ -2,8 +2,8 @@ * spreadspace avr utils * * - * Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org> - * Othmar Gsenger <otti@wirdorange.org> + * Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org> + * 2013-2014 Othmar Gsenger <otti@wirdorange.org> * * This file is part of spreadspace avr utils. * @@ -31,7 +31,7 @@ /* LUFA Library - Copyright (C) Dean Camera, 2012. + Copyright (C) Dean Camera, 2014. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org @@ -41,19 +41,25 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface = { .Config = { - .ControlInterfaceNumber = 0, - - .DataINEndpointNumber = CDC_TX_EPNUM, - .DataINEndpointSize = CDC_TXRX_EPSIZE, - .DataINEndpointDoubleBank = false, - - .DataOUTEndpointNumber = CDC_RX_EPNUM, - .DataOUTEndpointSize = CDC_TXRX_EPSIZE, - .DataOUTEndpointDoubleBank = false, - - .NotificationEndpointNumber = CDC_NOTIFICATION_EPNUM, - .NotificationEndpointSize = CDC_NOTIFICATION_EPSIZE, - .NotificationEndpointDoubleBank = false, + .ControlInterfaceNumber = INTERFACE_ID_CDC_CCI, + .DataINEndpoint = + { + .Address = CDC_TX_EPADDR, + .Size = CDC_TXRX_EPSIZE, + .Banks = 1, + }, + .DataOUTEndpoint = + { + .Address = CDC_RX_EPADDR, + .Size = CDC_TXRX_EPSIZE, + .Banks = 1, + }, + .NotificationEndpoint = + { + .Address = CDC_NOTIFICATION_EPADDR, + .Size = CDC_NOTIFICATION_EPSIZE, + .Banks = 1, + }, }, }; |