Don't report waste supply full/almost full reasons since vendors do not agree on

the definition of a supply that is filled (e.g. amount full vs amount empty?)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9730 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index 86854b120a1f8af0536e081264c049b31012dc36..1d550e6e66afa489f967e76b8724f8549131b9bd 100644 (file)
--- a/backend/snmp-supplies.c
+++ b/backend/snmp-supplies.c
@@ -40,12 +40,10 @@
 #define CUPS_DEVELOPER_EMPTY           2
 #define CUPS_MARKER_SUPPLY_LOW         4
 #define CUPS_MARKER_SUPPLY_EMPTY       8
-#define CUPS_MARKER_WASTE_ALMOST_FULL  16
-#define CUPS_MARKER_WASTE_FULL         32
-#define CUPS_OPC_NEAR_EOL              64
-#define CUPS_OPC_LIFE_OVER             128
-#define CUPS_TONER_LOW                 256
-#define CUPS_TONER_EMPTY               512
+#define CUPS_OPC_NEAR_EOL              16
+#define CUPS_OPC_LIFE_OVER             32
+#define CUPS_TONER_LOW                 64
+#define CUPS_TONER_EMPTY               128
 
 
 /*
@@ -172,8 +170,6 @@ static const backend_state_t const supply_states[] =
                          { CUPS_DEVELOPER_EMPTY, "developer-empty-warning" },
                          { CUPS_MARKER_SUPPLY_LOW, "marker-supply-low-report" },
                          { CUPS_MARKER_SUPPLY_EMPTY, "marker-supply-empty-warning" },
-                         { CUPS_MARKER_WASTE_ALMOST_FULL, "marker-waste-almost-full-report" },
-                         { CUPS_MARKER_WASTE_FULL, "marker-waste-full-warning" },
                          { CUPS_OPC_NEAR_EOL, "opc-near-eol-report" },
                          { CUPS_OPC_LIFE_OVER, "opc-life-over-warning" },
                          { CUPS_TONER_LOW, "toner-low-report" },
@@ -251,10 +247,6 @@ backendSNMPSupplies(
               break;
           case CUPS_TC_wasteToner :
           case CUPS_TC_wasteInk :
-              if (percent <= 1)
-                new_supply_state |= CUPS_MARKER_WASTE_FULL;
-              else
-                new_supply_state |= CUPS_MARKER_WASTE_ALMOST_FULL;
               break;
           case CUPS_TC_ink :
           case CUPS_TC_inkCartridge :