Reduced guard bit time in the AVRISP project PDI/TPI protocols to reduce the time...

[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 34f8e4e..0de94e6 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Printer.h
+++ b/LUFA/Drivers/USB/Class/Host/Printer.h
@@ -9,13 +9,13 @@
 /*\r
   Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
 /*\r
   Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\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


@@ -122,7 +122,7 @@
                         *  \return A value from the \ref PRNTHost_EnumerationFailure_ErrorCodes_t enum\r
                         */\r
                        uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, uint16_t ConfigDescriptorSize,\r
                         *  \return A value from the \ref PRNTHost_EnumerationFailure_ErrorCodes_t enum\r
                         */\r
                        uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, uint16_t ConfigDescriptorSize,\r

-                                                        void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1, 3);\r
+                                                        void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);\r

                        \r
                        /** Configures the printer to enable Bidirectional mode, if it is not already in this mode. This should be called\r
                         *  once the connected device's configuration has been set, to ensure the printer is ready to accept commands.\r
                        \r
                        /** Configures the printer to enable Bidirectional mode, if it is not already in this mode. This should be called\r
                         *  once the connected device's configuration has been set, to ensure the printer is ready to accept commands.\r


@@ -142,7 +142,7 @@
                         *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum\r
                         */\r
                        uint8_t PRNT_Host_GetPortStatus(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, uint8_t* const PortStatus)\r
                         *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum\r
                         */\r
                        uint8_t PRNT_Host_GetPortStatus(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, uint8_t* const PortStatus)\r

-                                                       ATTR_NON_NULL_PTR_ARG(1, 2);\r
+                                                       ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r

 \r
                        /** Soft-resets the attached printer, readying it for new commands.\r
                         *\r
 \r
                        /** Soft-resets the attached printer, readying it for new commands.\r
                         *\r


@@ -163,11 +163,11 @@
                         *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum\r
                         */\r
                        uint8_t PRNT_Host_SendData(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, void* PrinterCommands, \r
                         *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum\r
                         */\r
                        uint8_t PRNT_Host_SendData(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, void* PrinterCommands, \r

-                                                  uint16_t CommandSize) ATTR_NON_NULL_PTR_ARG(1, 2);\r
+                                                  uint16_t CommandSize) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r

 \r
                        /** Retrieves the attached printer device's ID string, formatted according to IEEE 1284. This string is sent as a\r
                         *  Unicode string from the device and is automatically converted to an ASCII encoded C string by this function, thus\r
 \r
                        /** Retrieves the attached printer device's ID string, formatted according to IEEE 1284. This string is sent as a\r
                         *  Unicode string from the device and is automatically converted to an ASCII encoded C string by this function, thus\r

-                        *  the maximum reportable string length is two less than the size given (to accomodate the Unicode string length\r
+                        *  the maximum reportable string length is two less than the size given (to accommodate the Unicode string length\r

                         *  bytes which are removed).\r
                         *\r
                         *  This string, when supported, contains the model, manufacturer and acceptable printer languages for the attached device.\r
                         *  bytes which are removed).\r
                         *\r
                         *  This string, when supported, contains the model, manufacturer and acceptable printer languages for the attached device.\r