From patchwork Tue Oct 16 19:20:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 191859 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 3F6C62C00A6 for ; Wed, 17 Oct 2012 06:20:55 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TOChC-0002XU-1Q; Tue, 16 Oct 2012 19:20:54 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TOCh9-0002WP-VI for fwts-devel@lists.ubuntu.com; Tue, 16 Oct 2012 19:20:52 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TOCh9-0005lM-QG for fwts-devel@lists.ubuntu.com; Tue, 16 Oct 2012 19:20:51 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 05/11] lib: fwts_battery: constify func arguments where appropriate Date: Tue, 16 Oct 2012 20:20:42 +0100 Message-Id: <1350415248-16965-6-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350415248-16965-1-git-send-email-colin.king@canonical.com> References: <1350415248-16965-1-git-send-email-colin.king@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu --- src/lib/include/fwts_battery.h | 12 +++--- src/lib/src/fwts_battery.c | 81 ++++++++++++++++++++++++++++++---------- 2 files changed, 68 insertions(+), 25 deletions(-) diff --git a/src/lib/include/fwts_battery.h b/src/lib/include/fwts_battery.h index 8fbd838..1cdfdc1 100644 --- a/src/lib/include/fwts_battery.h +++ b/src/lib/include/fwts_battery.h @@ -26,11 +26,11 @@ #define FWTS_BATTERY_ALL (-1) int fwts_battery_get_count(fwts_framework *fw, int *count); -int fwts_battery_get_cycle_count(fwts_framework *fw, int index, int *cycle_count); -bool fwts_battery_check_trip_point_support(fwts_framework *fw, int index); -int fwts_battery_set_trip_point(fwts_framework *fw, int index, int trip_point); -int fwts_battery_get_trip_point(fwts_framework *fw, int index, int *trip_point); -int fwts_battery_get_capacity(fwts_framework *fw, int type, int index, uint32_t *capacity_mAh, uint32_t *capacity_mWh); -int fwts_battery_get_name(fwts_framework *fw, int index, char *name); +int fwts_battery_get_cycle_count(fwts_framework *fw, const int index, int *cycle_count); +bool fwts_battery_check_trip_point_support(fwts_framework *fw, const int index); +int fwts_battery_set_trip_point(fwts_framework *fw, const int index, const int trip_point); +int fwts_battery_get_trip_point(fwts_framework *fw, const int index, int *trip_point); +int fwts_battery_get_capacity(fwts_framework *fw, const int type, const int index, uint32_t *capacity_mAh, uint32_t *capacity_mWh); +int fwts_battery_get_name(fwts_framework *fw, const int index, char *name); #endif diff --git a/src/lib/src/fwts_battery.c b/src/lib/src/fwts_battery.c index b792d0b..1383de1 100644 --- a/src/lib/src/fwts_battery.c +++ b/src/lib/src/fwts_battery.c @@ -29,8 +29,8 @@ static int fwts_battery_get_capacity_sys_fs(fwts_framework *fw, DIR *dir, - int type, - int index, + const int type, + const int index, uint32_t *capacity_mAh, /* charge */ uint32_t *capacity_mWh, /* energy */ int *count) @@ -111,8 +111,8 @@ static int fwts_battery_get_capacity_sys_fs(fwts_framework *fw, static int fwts_battery_get_capacity_proc_fs(fwts_framework *fw, DIR *dir, - int type, - int index, + const int type, + const int index, uint32_t *capacity_mAh, uint32_t *capacity_mWh, int *count) @@ -208,7 +208,10 @@ static int fwts_battery_get_count_proc_fs(DIR *dir, int *count) return FWTS_OK; } -static int fwts_battery_get_name_sys_fs(DIR *dir, int index, char *name) +static int fwts_battery_get_name_sys_fs( + DIR *dir, + const int index, + char *name) { struct dirent *entry; char path[PATH_MAX]; @@ -242,7 +245,10 @@ static int fwts_battery_get_name_sys_fs(DIR *dir, int index, char *name) return FWTS_ERROR; } -static int fwts_battery_get_name_proc_fs(DIR *dir, int index, char *name) +static int fwts_battery_get_name_proc_fs( + DIR *dir, + const int index, + char *name) { struct dirent *entry; int i = 0; @@ -263,7 +269,11 @@ static int fwts_battery_get_name_proc_fs(DIR *dir, int index, char *name) return FWTS_ERROR; } -static int fwts_battery_get_cycle_count_sys_fs(fwts_framework *fw, DIR *dir, int index, int *cycle_count) +static int fwts_battery_get_cycle_count_sys_fs( + fwts_framework *fw, + DIR *dir, + const int index, + int *cycle_count) { struct dirent *entry; char *field_cycle_count; @@ -317,7 +327,11 @@ static int fwts_battery_get_cycle_count_sys_fs(fwts_framework *fw, DIR *dir, int return FWTS_OK; } -static int fwts_battery_get_cycle_count_proc_fs(fwts_framework *fw, DIR *dir, int index, int *cycle_count) +static int fwts_battery_get_cycle_count_proc_fs( + fwts_framework *fw, + DIR *dir, + const int index, + int *cycle_count) { struct dirent *entry; char *file; @@ -360,7 +374,11 @@ static int fwts_battery_get_cycle_count_proc_fs(fwts_framework *fw, DIR *dir, in return FWTS_OK; } -static int fwts_battery_set_trip_point_sys_fs(fwts_framework *fw, DIR *dir, int index, int trip_point) +static int fwts_battery_set_trip_point_sys_fs( + fwts_framework *fw, + DIR *dir, + const int index, + const int trip_point) { struct dirent *entry; int i = 0; @@ -402,7 +420,11 @@ static int fwts_battery_set_trip_point_sys_fs(fwts_framework *fw, DIR *dir, int return FWTS_OK; } -static int fwts_battery_get_trip_point_sys_fs(fwts_framework *fw, DIR *dir, int index, int *trip_point) +static int fwts_battery_get_trip_point_sys_fs( + fwts_framework *fw, + DIR *dir, + const int index, + int *trip_point) { struct dirent *entry; int i = 0; @@ -448,7 +470,11 @@ static int fwts_battery_get_trip_point_sys_fs(fwts_framework *fw, DIR *dir, int return FWTS_OK; } -static int fwts_battery_set_trip_point_proc_fs(fwts_framework *fw, DIR *dir, int index, int trip_point) +static int fwts_battery_set_trip_point_proc_fs( + fwts_framework *fw, + DIR *dir, + const int index, + const int trip_point) { struct dirent *entry; int i = 0; @@ -479,7 +505,11 @@ static int fwts_battery_set_trip_point_proc_fs(fwts_framework *fw, DIR *dir, int return FWTS_OK; } -static int fwts_battery_get_trip_point_proc_fs(fwts_framework *fw, DIR *dir, int index, int *trip_point) +static int fwts_battery_get_trip_point_proc_fs( + fwts_framework *fw, + DIR *dir, + const int index, + int *trip_point) { struct dirent *entry; int i = 0; @@ -518,7 +548,10 @@ static int fwts_battery_get_trip_point_proc_fs(fwts_framework *fw, DIR *dir, int return FWTS_OK; } -int fwts_battery_set_trip_point(fwts_framework *fw, int index, int trip_point) +int fwts_battery_set_trip_point( + fwts_framework *fw, + const int index, + const int trip_point) { int ret; DIR *dir; @@ -536,7 +569,9 @@ int fwts_battery_set_trip_point(fwts_framework *fw, int index, int trip_point) return ret; } -int fwts_battery_get_trip_point(fwts_framework *fw, int index, int *trip_point) +int fwts_battery_get_trip_point( + fwts_framework *fw, + const int index, int *trip_point) { int ret; DIR *dir; @@ -554,7 +589,9 @@ int fwts_battery_get_trip_point(fwts_framework *fw, int index, int *trip_point) return ret; } -bool fwts_battery_check_trip_point_support(fwts_framework *fw, int index) +bool fwts_battery_check_trip_point_support( + fwts_framework *fw, + const int index) { int trip_point; @@ -567,7 +604,10 @@ bool fwts_battery_check_trip_point_support(fwts_framework *fw, int index) return true; } -int fwts_battery_get_cycle_count(fwts_framework *fw, int index, int *cycle_count) +int fwts_battery_get_cycle_count( + fwts_framework *fw, + const int index, + int *cycle_count) { int ret; DIR *dir; @@ -585,7 +625,10 @@ int fwts_battery_get_cycle_count(fwts_framework *fw, int index, int *cycle_count return ret; } -int fwts_battery_get_name(fwts_framework *fw, int index, char *name) +int fwts_battery_get_name( + fwts_framework *fw, + const int index, + char *name) { int ret; DIR *dir; @@ -621,8 +664,8 @@ int fwts_battery_get_count(fwts_framework *fw, int *count) } int fwts_battery_get_capacity(fwts_framework *fw, - int type, - int index, + const int type, + const int index, uint32_t *capacity_mAh, uint32_t *capacity_mWh) {