X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/8a28fd8e6ccdb6a33727f7df089802b4d34dbea7..d11ed10c5314c44dc01c06954d1d73d4894cbff8:/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h

diff --git a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
index 896a5903e..c451ef8b8 100644
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, 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 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 
+  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 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -44,13 +44,13 @@
 
 	/* Macros: */
 		/** Printer class-specific request to retrieve the printer's ID string */
-		#define GET_DEVICE_ID                0
+		#define REQ_GetDeviceID              0
 
 		/** Printer class-specific request to retrieve the printer's virtual port status flags */
-		#define GET_PORT_STATUS              1
+		#define REQ_GetPortStatus            1
 
 		/** Printer class-specific request to soft-reset the device */
-		#define SOFT_RESET                   2
+		#define REQ_SoftReset                2
 
 		/** Pipe number of the Printer data IN pipe */
 		#define PRINTER_DATA_IN_PIPE         1
@@ -58,15 +58,8 @@
 		/** Pipe number of the Printer data OUT pipe */
 		#define PRINTER_DATA_OUT_PIPE        2
 		
-	/* Type Defines: */
-		typedef struct
-		{
-			char*    Data;
-			uint16_t Length;
-		} Printer_Data_t;
-		
 	/* Function Prototypes: */
-		uint8_t Printer_SendData(Printer_Data_t* PrinterCommands);
+		uint8_t Printer_SendData(void* PrinterCommands, uint16_t CommandSize);
 		uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize);
 		uint8_t Printer_GetPortStatus(uint8_t* PortStatus);
 		uint8_t Printer_SoftReset(void);