X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7aaf9b2036784fadff048172029d0a2029da0ec9..c31fdbd03eee95660d65adb0f1bf7c0c397fd435:/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c

diff --git a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
index 0b75d7507..7f1824fd2 100644
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  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 
+  Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in
   all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -51,14 +51,14 @@ uint8_t Printer_SendData(const void* const PrinterCommands,
 
 	Pipe_SelectPipe(PRINTER_DATA_OUT_PIPE);
 	Pipe_Unfreeze();
-	
-	if ((ErrorCode = Pipe_Write_Stream_LE(PrinterCommands, CommandSize)) != PIPE_RWSTREAM_NoError)
+
+	if ((ErrorCode = Pipe_Write_Stream_LE(PrinterCommands, CommandSize, NULL)) != PIPE_RWSTREAM_NoError)
 	  return ErrorCode;
 
 	Pipe_ClearOUT();
-	
+
 	Pipe_WaitUntilReady();
-	
+
 	Pipe_Freeze();
 
 	return PIPE_RWSTREAM_NoError;
@@ -75,44 +75,44 @@ uint8_t Printer_SendData(const void* const PrinterCommands,
 uint8_t Printer_GetDeviceID(char* DeviceIDString,
                             const uint16_t BufferSize)
 {
-	uint8_t  ErrorCode = HOST_SENDCONTROL_Successful;
+	uint8_t  ErrorCode;
 	uint16_t DeviceIDStringLength = 0;
 
 	USB_ControlRequest = (USB_Request_Header_t)
 		{
 			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = REQ_GetDeviceID,
+			.bRequest      = PRNT_REQ_GetDeviceID,
 			.wValue        = 0,
 			.wIndex        = PrinterInterfaceNumber,
 			.wLength       = sizeof(DeviceIDStringLength),
 		};
-		
+
 	Pipe_SelectPipe(PIPE_CONTROLPIPE);
 
 	if ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful)
 	  return ErrorCode;
-	  
+
 	if (!(DeviceIDStringLength))
 	{
 		DeviceIDString[0] = 0x00;
 		return HOST_SENDCONTROL_Successful;
 	}
-	
+
 	DeviceIDStringLength = SwapEndian_16(DeviceIDStringLength);
 
 	if (DeviceIDStringLength > BufferSize)
 	  DeviceIDStringLength = BufferSize;
 
 	USB_ControlRequest.wLength = DeviceIDStringLength;
-	
+
 	if ((ErrorCode = USB_Host_SendControlRequest(DeviceIDString)) != HOST_SENDCONTROL_Successful)
 	  return ErrorCode;
-	  
+
 	/* Move string back two characters to remove the string length value from the start of the array */
 	memmove(&DeviceIDString[0], &DeviceIDString[2], DeviceIDStringLength - 2);
 
 	DeviceIDString[DeviceIDStringLength - 2] = 0x00;
-	
+
 	return HOST_SENDCONTROL_Successful;
 }
 
@@ -128,7 +128,7 @@ uint8_t Printer_GetPortStatus(uint8_t* const PortStatus)
 	USB_ControlRequest = (USB_Request_Header_t)
 		{
 			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = REQ_GetPortStatus,
+			.bRequest      = PRNT_REQ_GetPortStatus,
 			.wValue        = 0,
 			.wIndex        = PrinterInterfaceNumber,
 			.wLength       = sizeof(uint8_t),
@@ -149,7 +149,7 @@ uint8_t Printer_SoftReset(void)
 	USB_ControlRequest = (USB_Request_Header_t)
 		{
 			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = REQ_SoftReset,
+			.bRequest      = PRNT_REQ_SoftReset,
 			.wValue        = 0,
 			.wIndex        = PrinterInterfaceNumber,
 			.wLength       = 0,