Move DHCP negotiation timer into the DHCP connection application state structure...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / Printer.h

diff --git a/LUFA/Drivers/USB/Class/Host/Printer.h b/LUFA/Drivers/USB/Class/Host/Printer.h
index 06a1f84..25b0beb 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Printer.h
+++ b/LUFA/Drivers/USB/Class/Host/Printer.h
@@ -53,9 +53,12 @@
                        extern "C" {\r
                #endif\r
 \r
                        extern "C" {\r
                #endif\r
 \r

+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_PRINTER_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/Printer.h instead.\r
+               #endif\r
+\r

        /* Public Interface - May be used in end-application: */\r
        /* Public Interface - May be used in end-application: */\r

-               /* Macros: */\r
-       \r

                /* Type Defines: */\r
                        /** Class state structure. An instance of this structure should be made within the user application,\r
                         *  and passed to each of the Printer class driver functions as the PRNTInterfaceInfo parameter. This\r
                /* Type Defines: */\r
                        /** Class state structure. An instance of this structure should be made within the user application,\r
                         *  and passed to each of the Printer class driver functions as the PRNTInterfaceInfo parameter. This\r


@@ -203,7 +206,7 @@
                        #define PRNT_FOUND_DATAPIPE_OUT        (1 << 1)\r
                        \r
                /* Function Prototypes: */\r
                        #define PRNT_FOUND_DATAPIPE_OUT        (1 << 1)\r
                        \r
                /* Function Prototypes: */\r

-                       #if defined(INCLUDE_FROM_PRINTER_CLASS_HOST_C)          \r
+                       #if defined(__INCLUDE_FROM_PRINTER_CLASS_HOST_C)                \r

                                static uint8_t DComp_NextPRNTInterface(void* const CurrentDescriptor);\r
                                static uint8_t DComp_NextPRNTInterfaceEndpoint(void* const CurrentDescriptor);\r
                        #endif\r
                                static uint8_t DComp_NextPRNTInterface(void* const CurrentDescriptor);\r
                                static uint8_t DComp_NextPRNTInterfaceEndpoint(void* const CurrentDescriptor);\r
                        #endif\r