diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2015-06-30 01:00:10 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2015-06-30 01:00:10 +0200 |
| commit | 1060b8548dc0b0f19de3313b7417347fd52476ad (patch) | |
| tree | 6ed2ce46ffbeb13bc938add626469cbf1664035c /usb-keyboardmouse | |
| parent | ported usb-eth to new lufa (diff) | |
ported usb-keyboardmouse to new lufa
Diffstat (limited to 'usb-keyboardmouse')
| -rw-r--r-- | usb-keyboardmouse/Makefile | 6 | ||||
| -rw-r--r-- | usb-keyboardmouse/usb-keyboardmouse.c | 56 |
2 files changed, 32 insertions, 30 deletions
diff --git a/usb-keyboardmouse/Makefile b/usb-keyboardmouse/Makefile index e69b4b0..330c41f 100644 --- a/usb-keyboardmouse/Makefile +++ b/usb-keyboardmouse/Makefile @@ -27,15 +27,15 @@ LIBS := util led lufa-descriptor-keyboardmouse serialio 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 FIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 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 USB_MANUFACTURER="L\"equinox\"" -D USB_MANUFACTURER_LEN=7 -LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-keyboardmouse example\"" -D USB_PRODUCT_LEN=37 +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-keyboardmouse example\"" LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/usb-keyboardmouse/usb-keyboardmouse.c b/usb-keyboardmouse/usb-keyboardmouse.c index f1eb0eb..ffc9398 100644 --- a/usb-keyboardmouse/usb-keyboardmouse.c +++ b/usb-keyboardmouse/usb-keyboardmouse.c @@ -33,7 +33,7 @@ /* LUFA Library - Copyright (C) Dean Camera, 2012. + Copyright (C) Dean Camera, 2014. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org @@ -46,34 +46,36 @@ static uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)]; static uint8_t PrevMouseHIDReportBuffer[sizeof(USB_MouseReport_Data_t)]; USB_ClassInfo_HID_Device_t Keyboard_HID_Interface = - { - .Config = - { - .InterfaceNumber = 0, - - .ReportINEndpointNumber = KEYBOARD_IN_EPNUM, - .ReportINEndpointSize = HID_EPSIZE, - .ReportINEndpointDoubleBank = false, - - .PrevReportINBuffer = PrevKeyboardHIDReportBuffer, - .PrevReportINBufferSize = sizeof(PrevKeyboardHIDReportBuffer), - }, - }; + { + .Config = + { + .InterfaceNumber = INTERFACE_ID_Keyboard, + .ReportINEndpoint = + { + .Address = KEYBOARD_IN_EPADDR, + .Size = HID_EPSIZE, + .Banks = 1, + }, + .PrevReportINBuffer = PrevKeyboardHIDReportBuffer, + .PrevReportINBufferSize = sizeof(PrevKeyboardHIDReportBuffer), + }, + }; USB_ClassInfo_HID_Device_t Mouse_HID_Interface = - { - .Config = - { - .InterfaceNumber = 1, - - .ReportINEndpointNumber = MOUSE_IN_EPNUM, - .ReportINEndpointSize = HID_EPSIZE, - - .PrevReportINBuffer = PrevMouseHIDReportBuffer, - .PrevReportINBufferSize = sizeof(PrevMouseHIDReportBuffer), - }, - }; - + { + .Config = + { + .InterfaceNumber = INTERFACE_ID_Mouse, + .ReportINEndpoint = + { + .Address = MOUSE_IN_EPADDR, + .Size = HID_EPSIZE, + .Banks = 1, + }, + .PrevReportINBuffer = PrevMouseHIDReportBuffer, + .PrevReportINBufferSize = sizeof(PrevMouseHIDReportBuffer), + }, + }; void EVENT_USB_Device_ConfigurationChanged(void) { |