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 a6d72987b1bf612d015c0899c93dce66d2ed6e96..29ea8b14ccdb2ab8c3f7e242c08c7ac003ca97ea 100644 (file)
--- 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 b9268816a422e87acab7faaef98c8565e8a8f958..d5dc936934c960a1e1b5663843e7673cdab91e4f 100644 (file)
--- 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