From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 23 Sep 2013 12:00:42 +0000 (+0000)
Subject: <rdar://problem/14323704> J90 PreEVT/Schooner: HP Photosmart Prem C310 prevents syste... 
X-Git-Tag: v2.2b1~855
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61893d0b8e8aee3446af2bf677b91ffe94d65119;p=thirdparty%2Fcups.git

<rdar://problem/14323704> J90 PreEVT/Schooner: HP Photosmart Prem C310 prevents system from going to sleep.

Log when we wake.



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

diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index ead4801d75..3f3de62dd6 100644
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -349,6 +349,7 @@ cupsdAllowSleep(void)
 {
   cupsdCleanDirty();
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG, "Allowing system sleep.");
   IOAllowPowerChange(LastSysEvent.powerKernelPort,
 		     LastSysEvent.powerNotificationID);
 }
@@ -671,18 +672,18 @@ sysEventPowerNotifier(
 
   switch (messageType)
   {
-    case kIOMessageCanSystemPowerOff:
-    case kIOMessageCanSystemSleep:
+    case kIOMessageCanSystemPowerOff :
+    case kIOMessageCanSystemSleep :
 	threadData->sysevent.event |= SYSEVENT_CANSLEEP;
 	break;
 
-    case kIOMessageSystemWillRestart:
-    case kIOMessageSystemWillPowerOff:
-    case kIOMessageSystemWillSleep:
+    case kIOMessageSystemWillRestart :
+    case kIOMessageSystemWillPowerOff :
+    case kIOMessageSystemWillSleep :
 	threadData->sysevent.event |= SYSEVENT_WILLSLEEP;
 	break;
 
-    case kIOMessageSystemHasPoweredOn:
+    case kIOMessageSystemHasPoweredOn :
        /*
 	* Because powered on is followed by a net-changed event, delay
 	* before sending it.
@@ -692,10 +693,10 @@ sysEventPowerNotifier(
 	threadData->sysevent.event |= SYSEVENT_WOKE;
 	break;
 
-    case kIOMessageSystemWillNotPowerOff:
-    case kIOMessageSystemWillNotSleep:
+    case kIOMessageSystemWillNotPowerOff :
+    case kIOMessageSystemWillNotSleep :
 #  ifdef kIOMessageSystemWillPowerOn
-    case kIOMessageSystemWillPowerOn:
+    case kIOMessageSystemWillPowerOn :
 #  endif /* kIOMessageSystemWillPowerOn */
     default:
 	sendit = 0;
@@ -902,8 +903,11 @@ sysUpdate(void)
       */
 
       if (cupsArrayCount(PrintingJobs) == 0)
+      {
+	cupsdLogMessage(CUPSD_LOG_DEBUG, "Allowing system sleep.");
 	IOAllowPowerChange(sysevent.powerKernelPort,
 			   sysevent.powerNotificationID);
+      }
       else
       {
        /*
@@ -934,6 +938,7 @@ sysUpdate(void)
 	}
 	else
 	{
+	  cupsdLogMessage(CUPSD_LOG_DEBUG, "Allowing system sleep.");
 	  IOAllowPowerChange(sysevent.powerKernelPort,
 			     sysevent.powerNotificationID);
 	}