Minor changes to the AVRISP project for code clarity.

[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..c8c1b13 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
@@ -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