From 1060b8548dc0b0f19de3313b7417347fd52476ad Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 30 Jun 2015 01:00:10 +0200
Subject: ported usb-keyboardmouse to new lufa

---
 usb-keyboardmouse/usb-keyboardmouse.c | 56 ++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'usb-keyboardmouse/usb-keyboardmouse.c')

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)
 {
-- 
cgit v1.2.3