Better algorithm to extract and convert the internal device serial number into a...

[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 cbc5456..812ff7e 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
-              
+
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
@@ -9,13 +9,13 @@
 /*
   Copyright 2010  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
@@ -32,7 +32,7 @@
  *
  *  Header file for PrinterCommands.c.
  */
- 
+
 #ifndef _PRINTER_COMMANDS_H_
 #define _PRINTER_COMMANDS_H_
 
@@ -42,6 +42,8 @@
 
                #include <LUFA/Drivers/USB/USB.h>
 
+               #include "../PrinterHost.h"
+
        /* Macros: */
                /** Printer class-specific request to retrieve the printer's ID string. */
                #define REQ_GetDeviceID              0
@@ -52,16 +54,13 @@
                /** Printer class-specific request to soft-reset the device. */
                #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: */
-               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
+