Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[pub/USBasp.git] / 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 f55d03b..c451ef8 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
 \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -44,13 +44,13 @@
 \r
        /* Macros: */\r
                /** Printer class-specific request to retrieve the printer's ID string */\r
 \r
        /* Macros: */\r
                /** Printer class-specific request to retrieve the printer's ID string */\r

-               #define GET_DEVICE_ID                0\r
+               #define REQ_GetDeviceID              0\r

 \r
                /** Printer class-specific request to retrieve the printer's virtual port status flags */\r
 \r
                /** Printer class-specific request to retrieve the printer's virtual port status flags */\r

-               #define GET_PORT_STATUS              1\r
+               #define REQ_GetPortStatus            1\r

 \r
                /** Printer class-specific request to soft-reset the device */\r
 \r
                /** Printer class-specific request to soft-reset the device */\r

-               #define SOFT_RESET                   2\r
+               #define REQ_SoftReset                2\r

 \r
                /** Pipe number of the Printer data IN pipe */\r
                #define PRINTER_DATA_IN_PIPE         1\r
 \r
                /** Pipe number of the Printer data IN pipe */\r
                #define PRINTER_DATA_IN_PIPE         1\r


@@ -58,18 +58,8 @@
                /** Pipe number of the Printer data OUT pipe */\r
                #define PRINTER_DATA_OUT_PIPE        2\r
                \r
                /** Pipe number of the Printer data OUT pipe */\r
                #define PRINTER_DATA_OUT_PIPE        2\r
                \r

-       /* Type Defines: */\r
-               /** Type define for a Printer Command Data structure, for the encapsulation of raw printer commands to\r
-                *  send to an attached printer device.\r
-                */\r
-               typedef struct\r
-               {\r
-                       char*    Data; /**< Printer commands to send to the attached printer */\r
-                       uint16_t Length; /**< Length in bytes of the commands to send to the attached printer */\r
-               } Printer_Data_t;\r
-               \r

        /* Function Prototypes: */\r
        /* Function Prototypes: */\r

-               uint8_t Printer_SendData(Printer_Data_t* PrinterCommands);\r
+               uint8_t Printer_SendData(void* PrinterCommands, uint16_t CommandSize);\r

                uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize);\r
                uint8_t Printer_GetPortStatus(uint8_t* PortStatus);\r
                uint8_t Printer_SoftReset(void);\r
                uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize);\r
                uint8_t Printer_GetPortStatus(uint8_t* PortStatus);\r
                uint8_t Printer_SoftReset(void);\r