Fixed ISR definition conflict in the XPLAIN bridge between the software UART and...

[pub/lufa.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 d908aae..9cd768e 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
@@ -41,27 +41,25 @@
                #include <string.h>
 
                #include <LUFA/Drivers/USB/USB.h>
                #include <string.h>
 
                #include <LUFA/Drivers/USB/USB.h>

+               
+               #include "../PrinterHost.h"

 
        /* Macros: */
 
        /* Macros: */

-               /** Printer class-specific request to retrieve the printer's ID string */
+               /** Printer class-specific request to retrieve the printer's ID string. */

                #define REQ_GetDeviceID              0
 
                #define REQ_GetDeviceID              0
 

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

                #define REQ_GetPortStatus            1
 
                #define REQ_GetPortStatus            1
 

-               /** Printer class-specific request to soft-reset the device */
+               /** Printer class-specific request to soft-reset the device. */

                #define REQ_SoftReset                2
                #define REQ_SoftReset                2

-
-               /** Pipe number of the Printer data IN pipe */
-               #define PRINTER_DATA_IN_PIPE         1
-
-               /** Pipe number of the Printer data OUT pipe */
-               #define PRINTER_DATA_OUT_PIPE        2

                
        /* Function Prototypes: */
                
        /* Function Prototypes: */

-               uint8_t Printer_SendData(const void* const PrinterCommands, const uint16_t CommandSize);
-               uint8_t Printer_GetDeviceID(char* DeviceIDString, const uint16_t BufferSize);
-               uint8_t Printer_GetPortStatus(uint8_t* PortStatus);
+               uint8_t Printer_SendData(const void* const PrinterCommands,
+                                        const uint16_t CommandSize);
+               uint8_t Printer_GetDeviceID(char* DeviceIDString,
+                                           const uint16_t BufferSize);
+               uint8_t Printer_GetPortStatus(uint8_t* const PortStatus);

                uint8_t Printer_SoftReset(void);
        
 #endif
                uint8_t Printer_SoftReset(void);
        
 #endif