From patchwork Wed Jul 8 00:11:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 29554 Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 96676B708E for ; Wed, 8 Jul 2009 10:20:43 +1000 (EST) Received: by ozlabs.org (Postfix) id C75F8DE311; Wed, 8 Jul 2009 10:19:38 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id BF810DDF9E for ; Wed, 8 Jul 2009 10:19:38 +1000 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 84FFADDF54; Wed, 8 Jul 2009 10:18:14 +1000 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX1+21aH5v00TBdjjc02qj2cP4b0aGhmDFVE@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n680I7ZZ026537 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 8 Jul 2009 00:18:07 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n680I713026535; Wed, 8 Jul 2009 00:18:07 GMT Message-Id: <20090708001135.684341753@am.sony.com> User-Agent: quilt/0.47-1 Date: Tue, 07 Jul 2009 17:11:45 -0700 From: Geoff Levand To: Jeremy Kerr In-Reply-To: <20090708001134.934244536@am.sony.com> References: <20090708001134.934244536@am.sony.com> Content-Disposition: inline; filename=ui-timer.diff X-Virus-Scanned: ClamAV 0.93.3/9541/Tue Jul 7 17:31:53 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Wed, 08 Jul 2009 00:18:07 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 11/31] petitboot: Add generic UI countdown timer X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Add support for a generic petitboot UI countdown timer. Signed-off-by: Geoff Levand --- rules.mk | 2 ui/common/timer.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ ui/common/timer.h | 42 ++++++++++++++++ 3 files changed, 182 insertions(+), 1 deletion(-) --- a/rules.mk +++ b/rules.mk @@ -49,7 +49,7 @@ discover_objs = discover/event.o discove # client objs ui_common_objs = ui/common/discover-client.o ui/common/loader.o \ - ui/common/ui-system.o ui/common/url.o + ui/common/ui-system.o ui/common/timer.o ui/common/url.o ncurses_objs = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o \ ui/ncurses/nc-ked.o ui/ncurses/nc-cui.o twin_objs = ui/twin/pb-twin.o --- /dev/null +++ b/ui/common/timer.c @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2009 Sony Computer Entertainment Inc. + * Copyright 2009 Sony Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif + +#define _GNU_SOURCE +#include +#include +#include + +#include "log/log.h" +#include "timer.h" + +/** + * ui_timer_init - Initialize the timer for use. + * @seconds: The final timeout value in seconds. + */ + +void ui_timer_init(struct ui_timer *timer, unsigned int seconds) +{ + pb_log("%s: %u\n", __func__, seconds); + assert(!timer->disabled); + timer->timeout = seconds; +} + +/** + * ui_timer_next - Calculate the next timer interval. + */ + +static unsigned int ui_timer_next(unsigned int seconds) +{ + unsigned int next; + + if (seconds == 0) { + next = 0; + goto done; + } + + if (seconds <= 10) { + next = 1; + goto done; + } + + if (seconds <= 60) { + next = seconds % 5; + next = next ? next : 5; + goto done; + } + + next = seconds % 10; + next = next ? next : 10; + +done: + pb_log("%s: %u = %u\n", __func__, seconds, next); + return next; +} + +/** + * ui_timer_kick - Kickstart the next timer interval. + */ + +void ui_timer_kick(struct ui_timer *timer) +{ + unsigned int next; + + if(timer->disabled) + return; + + if (timer->update_display) + timer->update_display(timer, timer->timeout); + + next = ui_timer_next(timer->timeout); + timer->timeout -= next; + + if (next) { + alarm(next); + return; + } + + pb_log("%s: timed out\n", __func__); + + ui_timer_disable(timer); + timer->handle_timeout(timer); +} + +/** + * ui_timer_disable - Stop and disable the timer. + */ + +void ui_timer_disable(struct ui_timer *timer) +{ + if (timer->disabled) + return; + + pb_log("%s\n", __func__); + timer->disabled = 1; + timer->timeout = UINT_MAX; + alarm(0); +} + +/** + * ui_timer_sigalrm + * + * Called at SIGALRM. + */ + +void ui_timer_sigalrm(struct ui_timer *timer) +{ + timer->signaled = 1; +} + +/** + * ui_timer_process_sig - Process a timer signal + */ + +void ui_timer_process_sig(struct ui_timer *timer) +{ + while (timer->signaled) { + timer->signaled = 0; + ui_timer_kick(timer); + } +} --- /dev/null +++ b/ui/common/timer.h @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2009 Sony Computer Entertainment Inc. + * Copyright 2009 Sony Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#if !defined(_PB_UI_TIMER_H) +#define _PB_UI_TIMER_H + +#include + +/** + * struct ui_timer - UI timeout. + */ + +struct ui_timer { + unsigned int timeout; + unsigned int disabled; + sig_atomic_t signaled; + void (*update_display)(struct ui_timer *timer, unsigned int timeout); + void (*handle_timeout)(struct ui_timer *timer); +}; + +void ui_timer_init(struct ui_timer *timer, unsigned int seconds); +void ui_timer_kick(struct ui_timer *timer); +void ui_timer_disable(struct ui_timer *timer); +void ui_timer_sigalrm(struct ui_timer *timer); +void ui_timer_process_sig(struct ui_timer *timer); + +#endif