Add new Audio Class Driver Host demos.

[pub/USBasp.git] / Demos / Host / LowLevel / GenericHIDHost / GenericHIDHost.c

diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
index ba18260..671fa48 100644 (file)
--- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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
@@ -66,9 +66,12 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */
-       SerialStream_Init(9600, false);
+       Serial_Init(9600, false);
        LEDs_Init();
        USB_Init();
+
+       /* Create a stdio stream for the serial port for stdin and stdout */
+       Serial_CreateStream(NULL);
 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@@ -100,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
-       USB_ShutDown();
+       USB_Disable();
 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
@@ -147,7 +150,7 @@ void ReadNextReport(void)
                uint8_t ReportINData[Pipe_BytesInPipe()];
 
                /* Read in HID report data */
-               Pipe_Read_Stream_LE(&ReportINData, sizeof(ReportINData));
+               Pipe_Read_Stream_LE(&ReportINData, sizeof(ReportINData), NULL);
 
                /* Print report data through the serial port */
                for (uint16_t CurrByte = 0; CurrByte < sizeof(ReportINData); CurrByte++)
@@ -195,10 +198,10 @@ void WriteNextReport(uint8_t* ReportOUTData,
 
                /* If the report index is used, send it before the report data */
                if (ReportIndex)
-                 Pipe_Write_Byte(ReportIndex);
+                 Pipe_Write_8(ReportIndex);
 
                /* Write out HID report data */
-               Pipe_Write_Stream_LE(ReportOUTData, ReportLength);
+               Pipe_Write_Stream_LE(ReportOUTData, ReportLength, NULL);
 
                /* Clear the OUT endpoint, send last data packet */
                Pipe_ClearOUT();
@@ -212,7 +215,7 @@ void WriteNextReport(uint8_t* ReportOUTData,
                USB_ControlRequest = (USB_Request_Header_t)
                        {
                                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-                               .bRequest      = REQ_SetReport,
+                               .bRequest      = HID_REQ_SetReport,
                                .wValue        = ((ReportType << 8) | ReportIndex),
                                .wIndex        = 0,
                                .wLength       = ReportLength,