From owner-freebsd-current Mon Jan 24 5:32: 5 2000 Delivered-To: freebsd-current@freebsd.org Received: from webweaving.org (calcaphon.demon.co.uk [193.237.19.5]) by hub.freebsd.org (Postfix) with ESMTP id DD08F14D6D for ; Mon, 24 Jan 2000 05:31:59 -0800 (PST) (envelope-from n_hibma@webweaving.org) Received: from localhost (localhost [127.0.0.1]) by webweaving.org (8.9.3/8.9.3) with ESMTP id NAA28769 for ; Mon, 24 Jan 2000 13:30:56 GMT (envelope-from n_hibma@webweaving.org) Date: Mon, 24 Jan 2000 13:30:54 +0000 (GMT) From: Nick Hibma X-Sender: n_hibma@localhost Reply-To: Nick Hibma To: FreeBSD CURRENT Mailing List Subject: APM still ignoring DEVICE_SUSPEND errors Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-591026313-948636885=:4635" Content-ID: Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --0-591026313-948636885=:4635 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII Content-ID: The following patch fixes two things: First, DEVICE_SUSPEND errors are no longer ignored. Since we have defaults for methods we should no longer ignore these errors. Also, DEVICE_RESUME wasn't done when the apm_suspend_system event failed. Second, in the ordering of DEVICE_* and apm_hook_* is not symmetric for suspend and resume. The patch reverses the resume case as well to be apm_hook_resume(...) DEVICE_RESUME(root) Send me some feedback on this. I've mailed the people mentioned in the head of the file, but so far got no response. I would like to make sure we get this right when USB devices are used. Some of them don't suspend and the suspend should be refused in that case. Nick -- n_hibma@webweaving.org n_hibma@freebsd.org USB project http://www.etla.net/~n_hibma/ --0-591026313-948636885=:4635 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII; NAME="apm.c.patch" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: ATTACHMENT; FILENAME="apm.c.patch" LS0tIC91c3Ivc3JjL3N5cy9pMzg2L2FwbS9hcG0uYwlUaHUgRGVjICAyIDAz OjEzOjAwIDE5OTkNCisrKyAvaGVpZGkvdXNyL2N1cnJlbnQvc3JjL3N5cy9p Mzg2L2FwbS9hcG0uYwlTdW4gSmFuIDIzIDE0OjA3OjQ5IDIwMDANCkBAIC00 NzMsMTkgKzQ3MywxOSBAQA0KIA0KIAlpZiAoc2MtPmluaXRpYWxpemVkKSB7 DQogCQllcnJvciA9IERFVklDRV9TVVNQRU5EKHJvb3RfYnVzKTsNCi0JCS8q DQotCQkgKiBYWFggU2hvdWxkbid0IGlnbm9yZSB0aGUgZXJyb3IgbGlrZSB0 aGlzLCBidXQgc2hvdWxkDQotCQkgKiBpbnN0ZWFkIGZpeCB0aGUgbmV3YnVz IGNvZGUuICBVbnRpbCB0aGF0IGhhcHBlbnMsDQotCQkgKiBJJ20gZG9pbmcg dGhpcyB0byBnZXQgc3VzcGVuZCB3b3JraW5nIGFnYWluLg0KLQkJICovDQot CQlpZiAoZXJyb3IpDQotCQkJcHJpbnRmKCJERVZJQ0VfU1VTUEVORCBlcnJv ciAlZCwgaWdub3JlZFxuIiwgZXJyb3IpOw0KLQkJYXBtX2V4ZWN1dGVfaG9v ayhob29rW0FQTV9IT09LX1NVU1BFTkRdKTsNCi0JCWlmIChhcG1fc3VzcGVu ZF9zeXN0ZW0oUE1TVF9TVVNQRU5EKSA9PSAwKQ0KLQkJCWFwbV9wcm9jZXNz ZXZlbnQoKTsNCi0JCWVsc2UNCi0JCQkvKiBGYWlsdXJlLCAncmVzdW1lJyB0 aGUgc3lzdGVtIGFnYWluICovDQotCQkJYXBtX2V4ZWN1dGVfaG9vayhob29r W0FQTV9IT09LX1JFU1VNRV0pOw0KKwkJaWYgKGVycm9yKSB7DQorCQkJcHJp bnRmKCJTdXNwZW5kIGZhaWxlZCwgZXJyb3IgJWRcbiIsIGVycm9yKTsNCisJ CQlERVZJQ0VfUkVTVU1FKHJvb3RfYnVzKTsNCisJCX0gZWxzZSB7DQorCQkJ YXBtX2V4ZWN1dGVfaG9vayhob29rW0FQTV9IT09LX1NVU1BFTkRdKTsNCisJ CQlpZiAoYXBtX3N1c3BlbmRfc3lzdGVtKFBNU1RfU1VTUEVORCkgPT0gMCkN CisJCQkJYXBtX3Byb2Nlc3NldmVudCgpOw0KKwkJCWVsc2Ugew0KKwkJCQkv KiBGYWlsdXJlLCAncmVzdW1lJyB0aGUgc3lzdGVtIGFnYWluICovDQorCQkJ CWFwbV9leGVjdXRlX2hvb2soaG9va1tBUE1fSE9PS19SRVNVTUVdKTsNCisJ CQkJREVWSUNFX1JFU1VNRShyb290X2J1cyk7DQorCQkJfQ0KKwkJfQ0KIAl9 DQogfQ0KIA0KQEAgLTU5Myw4ICs1OTMsOCBAQA0KIAkJcmV0dXJuOw0KIA0K IAlpZiAoc2MtPmluaXRpYWxpemVkKSB7DQotCQlERVZJQ0VfUkVTVU1FKHJv b3RfYnVzKTsNCiAJCWFwbV9leGVjdXRlX2hvb2soaG9va1tBUE1fSE9PS19S RVNVTUVdKTsNCisJCURFVklDRV9SRVNVTUUocm9vdF9idXMpOw0KIAl9DQog fQ0KIA0K --0-591026313-948636885=:4635-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message