Mark build test makefiles as being incompatible with parallel make builds, as they...

[pub/USBasp.git] / Demos / Host / ClassDriver / KeyboardHost / KeyboardHost.c

diff --git a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
index abc038e..6949908 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.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


@@ -44,12 +44,16 @@ USB_ClassInfo_HID_Host_t Keyboard_HID_Interface =
        {
                .Config =
                        {
        {
                .Config =
                        {

-                               .DataINPipeNumber       = 1,
-                               .DataINPipeDoubleBank   = false,
-
-                               .DataOUTPipeNumber      = 2,
-                               .DataOUTPipeDoubleBank  = false,
-
+                               .DataINPipe             =
+                                       {
+                                               .Address        = (PIPE_DIR_IN  | 1),
+                                               .Banks          = 1,
+                                       },
+                               .DataOUTPipe            =
+                                       {
+                                               .Address        = (PIPE_DIR_OUT | 2),
+                                               .Banks          = 1,
+                                       },

                                .HIDInterfaceProtocol   = HID_CSCP_KeyboardBootProtocol,
                        },
        };
                                .HIDInterfaceProtocol   = HID_CSCP_KeyboardBootProtocol,
                        },
        };


@@ -140,7 +144,7 @@ void KeyboardHost_Task(void)
                        {
                                PressedKey = '\n';
                        }
                        {
                                PressedKey = '\n';
                        }

-                       
+

                        if (PressedKey)
                          putchar(PressedKey);
                }
                        if (PressedKey)
                          putchar(PressedKey);
                }


@@ -202,6 +206,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
        {
                puts_P(PSTR("Could not Set Boot Protocol Mode.\r\n"));
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
        {
                puts_P(PSTR("Could not Set Boot Protocol Mode.\r\n"));
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+               USB_Host_SetDeviceConfiguration(0);

                return;
        }
 
                return;
        }