From: Nigel Cunningham <nigel@suspend2.net>
To: linux-kernel@vger.kernel.org
Subject: [Suspend2][ 12/21] [Suspend2] Abort a cycle.
Date: Tue, 27 Jun 2006 14:41:53 +1000 [thread overview]
Message-ID: <20060627044151.14883.70806.stgit@nigel.suspend2.net> (raw)
In-Reply-To: <20060627044112.14883.55823.stgit@nigel.suspend2.net>
Let the user know that we're aborting if they don't already know, possibly
also waiting for a keypress expressing acknowledgement.
Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
kernel/power/ui.c | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/kernel/power/ui.c b/kernel/power/ui.c
index 6271a24..6542f3f 100644
--- a/kernel/power/ui.c
+++ b/kernel/power/ui.c
@@ -402,3 +402,40 @@ out:
return key;
}
+/* abort_suspend
+ *
+ * Description: Begin to abort a cycle. If this wasn't at the user's request
+ * (and we're displaying output), tell the user why and wait for
+ * them to acknowledge the message.
+ * Arguments: A parameterised string (imagine this is printk) to display,
+ * telling the user why we're aborting.
+ */
+
+void abort_suspend(const char *fmt, ...)
+{
+ va_list args;
+ int printed_len = 0;
+
+ if (!test_result_state(SUSPEND_ABORTED)) {
+ if (!test_result_state(SUSPEND_ABORT_REQUESTED)) {
+ va_start(args, fmt);
+ printed_len = vsnprintf(local_printf_buf,
+ sizeof(local_printf_buf), fmt, args);
+ va_end(args);
+ if (ui_helper_data.pid != -1)
+ printed_len = sprintf(local_printf_buf + printed_len,
+ " (Press SPACE to continue)");
+ suspend_prepare_status(CLEAR_BAR, local_printf_buf);
+
+ /*
+ * Make sure message seen - wait for shift to be
+ * released if being pressed
+ */
+ if (ui_helper_data.pid != -1)
+ suspend_wait_for_keypress(0);
+ }
+ /* Turn on aborting flag */
+ set_result_state(SUSPEND_ABORTED);
+ }
+}
+
--
Nigel Cunningham nigel at suspend2 dot net
next prev parent reply other threads:[~2006-06-27 4:51 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-27 4:41 [Suspend2][ 00/21] User interface Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 01/21] [Suspend2] User interface c header Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 02/21] [Suspend2] Modify action state Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 03/21] [Suspend2] Tell userspace to redraw the screen Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 04/21] [Suspend2] Process abort request Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 05/21] [Suspend2] Receive a message from the userui Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 06/21] [Suspend2] Get userui storage needed Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 07/21] [Suspend2] Serialise userui configuration info Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 08/21] [Suspend2] Get amount of memory needed for userui Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 09/21] [Suspend2] Update progress bar Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 10/21] [Suspend2] __suspend_message Nigel Cunningham
2006-06-27 4:41 ` [Suspend2][ 11/21] [Suspend2] Wait for keypress Nigel Cunningham
2006-06-27 4:41 ` Nigel Cunningham [this message]
2006-06-27 4:41 ` [Suspend2][ 13/21] [Suspend2] Main message output Nigel Cunningham
2006-06-27 4:42 ` [Suspend2][ 14/21] [Suspend2] Conditionally pause Nigel Cunningham
2006-06-27 4:42 ` [Suspend2][ 15/21] [Suspend2] Prepare ui for work Nigel Cunningham
2006-06-27 4:42 ` [Suspend2][ 16/21] [Suspend2] Cleanup console after suspending Nigel Cunningham
2006-06-27 4:42 ` [Suspend2][ 17/21] [Suspend2] Early boot message support Nigel Cunningham
2006-06-27 4:42 ` [Suspend2][ 18/21] [Suspend2] Userspace proc entries Nigel Cunningham
2006-06-27 4:42 ` [Suspend2][ 19/21] [Suspend2] Operations for userspace interface module Nigel Cunningham
2006-06-27 4:42 ` [Suspend2][ 20/21] [Suspend2] Load time initialisation for user interface code Nigel Cunningham
2006-06-27 4:42 ` [Suspend2][ 21/21] [Suspend2] kernel/power/ui.h Nigel Cunningham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060627044151.14883.70806.stgit@nigel.suspend2.net \
--to=nigel@suspend2.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome