From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 11 Feb 2014 15:04:31 +0000 (+0000)
Subject: Add missing IPP definitions.
X-Git-Tag: v2.2b1~766
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f787fcac9785f1d3e55440f9a99211d7bf76fad;p=thirdparty%2Fcups.git

Add missing IPP definitions.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11575 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index a6d72987b1..29ea8b14cc 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -559,7 +559,8 @@ static const char * const ipp_document_states[] =
 		  "portrait",
 		  "landscape",
 		  "reverse-landscape",
-		  "reverse-portrait"
+		  "reverse-portrait",
+		  "none"
 		},
 		* const ipp_print_qualities[] =
 		{			/* print-quality enums */
@@ -1536,11 +1537,16 @@ ippCreateRequestedArray(ipp_t *request)	/* I - IPP request */
     "printer-fax-modem-info",		/* IPP FaxOut */
     "printer-fax-modem-name",		/* IPP FaxOut */
     "printer-fax-modem-number",		/* IPP FaxOut */
+    "printer-firmware-name",		/* PWG 5110.1 */
+    "printer-firmware-patches",		/* PWG 5110.1 */
+    "printer-firmware-string-version",	/* PWG 5110.1 */
+    "printer-firmware-version",		/* PWG 5110.1 */
     "printer-geo-location",
     "printer-get-attributes-supported",
     "printer-icc-profiles",
     "printer-icons",
     "printer-info",
+    "printer-input-tray",		/* IPP JPS3 */
     "printer-is-accepting-jobs",
     "printer-is-shared",		/* CUPS extension */
     "printer-kind",			/* IPP Paid Printing */
@@ -1556,6 +1562,7 @@ ippCreateRequestedArray(ipp_t *request)	/* I - IPP request */
     "printer-native-formats",
     "printer-organization",
     "printer-organizational-unit",
+    "printer-output-tray",		/* IPP JPS3 */
     "printer-settable-attributes-supported",
     "printer-state",
     "printer-state-change-date-time",
diff --git a/cups/ipp.h b/cups/ipp.h
index b9268816a4..d5dc936934 100644
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -411,7 +411,8 @@ typedef enum ipp_orient_e		/**** Orientation values ****/
   IPP_ORIENT_PORTRAIT = 3,		/* No rotation */
   IPP_ORIENT_LANDSCAPE,			/* 90 degrees counter-clockwise */
   IPP_ORIENT_REVERSE_LANDSCAPE,		/* 90 degrees clockwise */
-  IPP_ORIENT_REVERSE_PORTRAIT		/* 180 degrees */
+  IPP_ORIENT_REVERSE_PORTRAIT,		/* 180 degrees */
+  IPP_ORIENT_NONE			/* No rotation */
 
 #  ifndef _CUPS_NO_DEPRECATED
 #    define IPP_PORTRAIT		IPP_ORIENT_PORTRAIT