Rename AVR32CLK_*() clock management functions to UC3CLK_*() to be in line with the...

[pub/USBasp.git] / Projects / MediaController / MediaController.c

diff --git a/Projects/MediaController/MediaController.c b/Projects/MediaController/MediaController.c
index e0614d0..51502c7 100644 (file)
--- a/Projects/MediaController/MediaController.c
+++ b/Projects/MediaController/MediaController.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -48,11 +48,12 @@ USB_ClassInfo_HID_Device_t MediaControl_HID_Interface =
                .Config =
                        {
                                .InterfaceNumber              = 0,
                .Config =
                        {
                                .InterfaceNumber              = 0,

-
-                               .ReportINEndpointNumber       = MEDIACONTROL_HID_EPNUM,
-                               .ReportINEndpointSize         = MEDIACONTROL_HID_EPSIZE,
-                               .ReportINEndpointDoubleBank   = false,
-
+                               .ReportINEndpoint             =
+                                       {
+                                               .Address              = MEDIACONTROL_HID_EPADDR,
+                                               .Size                 = MEDIACONTROL_HID_EPSIZE,
+                                               .Banks                = 1,
+                                       },

                                .PrevReportINBuffer           = PrevMediaControlHIDReportBuffer,
                                .PrevReportINBufferSize       = sizeof(PrevMediaControlHIDReportBuffer),
                        },
                                .PrevReportINBuffer           = PrevMediaControlHIDReportBuffer,
                                .PrevReportINBufferSize       = sizeof(PrevMediaControlHIDReportBuffer),
                        },


@@ -67,7 +68,7 @@ int main(void)
        SetupHardware();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        SetupHardware();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

-       sei();
+       GlobalInterruptEnable();

 
        for (;;)
        {
 
        for (;;)
        {