diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2015-06-30 02:06:07 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2015-06-30 02:06:07 +0200 |
| commit | 546f7e012af62c03e06c14c51ee0dba5cfeb9a77 (patch) | |
| tree | 53e71229ab7d23532eb5075be32df484acc956eb | |
| parent | ported usb-dua-serial to new lufa (diff) | |
updated dualusbio lib and usb-led2 to new lufa
| -rw-r--r-- | lib/dualusbio.c | 64 | ||||
| -rw-r--r-- | usb-led2/Makefile | 6 |
2 files changed, 41 insertions, 29 deletions
diff --git a/lib/dualusbio.c b/lib/dualusbio.c index 2a9bd3b..6bf4556 100644 --- a/lib/dualusbio.c +++ b/lib/dualusbio.c @@ -39,36 +39,48 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface[] = { .Config = { - .ControlInterfaceNumber = 0, - - .DataINEndpointNumber = CDC1_TX_EPNUM, - .DataINEndpointSize = CDC_TXRX_EPSIZE, - .DataINEndpointDoubleBank = false, - - .DataOUTEndpointNumber = CDC1_RX_EPNUM, - .DataOUTEndpointSize = CDC_TXRX_EPSIZE, - .DataOUTEndpointDoubleBank = false, - - .NotificationEndpointNumber = CDC1_NOTIFICATION_EPNUM, - .NotificationEndpointSize = CDC_NOTIFICATION_EPSIZE, - .NotificationEndpointDoubleBank = false, + .ControlInterfaceNumber = INTERFACE_ID_CDC1_CCI, + .DataINEndpoint = + { + .Address = CDC1_TX_EPADDR, + .Size = CDC_TXRX_EPSIZE, + .Banks = 1, + }, + .DataOUTEndpoint = + { + .Address = CDC1_RX_EPADDR, + .Size = CDC_TXRX_EPSIZE, + .Banks = 1, + }, + .NotificationEndpoint = + { + .Address = CDC1_NOTIFICATION_EPADDR, + .Size = CDC_NOTIFICATION_EPSIZE, + .Banks = 1, + }, }, },{ .Config = { - .ControlInterfaceNumber = 2, - - .DataINEndpointNumber = CDC2_TX_EPNUM, - .DataINEndpointSize = CDC_TXRX_EPSIZE, - .DataINEndpointDoubleBank = false, - - .DataOUTEndpointNumber = CDC2_RX_EPNUM, - .DataOUTEndpointSize = CDC_TXRX_EPSIZE, - .DataOUTEndpointDoubleBank = false, - - .NotificationEndpointNumber = CDC2_NOTIFICATION_EPNUM, - .NotificationEndpointSize = CDC_NOTIFICATION_EPSIZE, - .NotificationEndpointDoubleBank = false, + .ControlInterfaceNumber = INTERFACE_ID_CDC2_CCI, + .DataINEndpoint = + { + .Address = CDC2_TX_EPADDR, + .Size = CDC_TXRX_EPSIZE, + .Banks = 1, + }, + .DataOUTEndpoint = + { + .Address = CDC2_RX_EPADDR, + .Size = CDC_TXRX_EPSIZE, + .Banks = 1, + }, + .NotificationEndpoint = + { + .Address = CDC2_NOTIFICATION_EPADDR, + .Size = CDC_NOTIFICATION_EPSIZE, + .Banks = 1, + }, }, } }; diff --git a/usb-led2/Makefile b/usb-led2/Makefile index f8cfc68..3094a94 100644 --- a/usb-led2/Makefile +++ b/usb-led2/Makefile @@ -27,7 +27,7 @@ LIBS := util led lufa-descriptor-usbdualserial dualusbio EXTERNAL_LIBS := lufa SPREADAVR_PATH := .. -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 @@ -37,8 +37,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 usb-led2 example\"" -D USB_PRODUCT_LEN=28 +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-led2 example\"" LUFA_COMPONENTS := USB USBCLASS |