From patchwork Fri Sep 8 11:00:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 811526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3xpZ9C3w18z9s81; Fri, 8 Sep 2017 21:00:15 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1dqH1A-00032t-2Y; Fri, 08 Sep 2017 11:00:12 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1dqH18-00032M-IR for fwts-devel@lists.ubuntu.com; Fri, 08 Sep 2017 11:00:10 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dqH18-0006Yl-3y; Fri, 08 Sep 2017 11:00:10 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: fwts_wakealarm: make wakealarm times uint32_t Date: Fri, 8 Sep 2017 12:00:09 +0100 Message-Id: <20170908110009.30488-1-colin.king@canonical.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Colin Ian King A wakealarm of negative time should not be allowed, so make the timings uint32_t rather than int. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/acpi/wakealarm/wakealarm.c | 4 ++-- src/lib/include/fwts_wakealarm.h | 4 ++-- src/lib/src/fwts_wakealarm.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/acpi/wakealarm/wakealarm.c b/src/acpi/wakealarm/wakealarm.c index 0e9551ad..fa81a642 100644 --- a/src/acpi/wakealarm/wakealarm.c +++ b/src/acpi/wakealarm/wakealarm.c @@ -92,11 +92,11 @@ static int wakealarm_test3(fwts_framework *fw) static int wakealarm_test4(fwts_framework *fw) { - int i; + uint32_t i; int failed = 0; for (i = 1; i < 5; i++) { - fwts_log_info(fw, "Trigger wakealarm for %d seconds in the future.", i); + fwts_log_info(fw, "Trigger wakealarm for %" PRIu32 " seconds in the future.", i); int ret = fwts_wakealarm_test_firing(fw, i); if (ret < 0) { fwts_failed(fw, LOG_LEVEL_MEDIUM, diff --git a/src/lib/include/fwts_wakealarm.h b/src/lib/include/fwts_wakealarm.h index ded3b935..87f70a51 100644 --- a/src/lib/include/fwts_wakealarm.h +++ b/src/lib/include/fwts_wakealarm.h @@ -25,8 +25,8 @@ #include "fwts_framework.h" int fwts_wakealarm_exits(fwts_framework *fw); -int fwts_wakealarm_test_firing(fwts_framework *fw, const int sleep); -int fwts_wakealarm_trigger(fwts_framework *fw, const int seconds); +int fwts_wakealarm_test_firing(fwts_framework *fw, const uint32_t sleep); +int fwts_wakealarm_trigger(fwts_framework *fw, const uint32_t seconds); int fwts_wakealarm_cancel(fwts_framework *fw); int fwts_wakealarm_get(fwts_framework *fw, struct rtc_time *rtc_tm); int fwts_wakealarm_set(fwts_framework *fw, struct rtc_time *rtc_tm); diff --git a/src/lib/src/fwts_wakealarm.c b/src/lib/src/fwts_wakealarm.c index 5ae902f1..c0550303 100644 --- a/src/lib/src/fwts_wakealarm.c +++ b/src/lib/src/fwts_wakealarm.c @@ -93,7 +93,7 @@ int fwts_wakealarm_exits(fwts_framework *fw) * fwts_wakealarm_trigger() * trigger the RTC wakealarm to fire in 'seconds' seconds from now. */ -int fwts_wakealarm_trigger(fwts_framework *fw, const int seconds) +int fwts_wakealarm_trigger(fwts_framework *fw, const uint32_t seconds) { int fd, ret = FWTS_OK; struct rtc_time rtc_tm; @@ -161,7 +161,7 @@ int fwts_wakealarm_cancel(fwts_framework *fw) * fwts_wakealarm_check_fired() * check if wakealarm fires */ -int fwts_wakealarm_check_fired(fwts_framework *fw, const int seconds) +int fwts_wakealarm_check_fired(fwts_framework *fw, const uint32_t seconds) { int fd, rc, ret = FWTS_OK; fd_set rfds; @@ -204,7 +204,7 @@ out: * test RTC wakealarm trigger and firing from 'seconds' seconds time * from now. returns FWTS_OK if passed, otherwise FWTS_ERROR. */ -int fwts_wakealarm_test_firing(fwts_framework *fw, const int seconds) +int fwts_wakealarm_test_firing(fwts_framework *fw, const uint32_t seconds) { int ret = FWTS_OK;