{"id":811419,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811419/?format=json","web_url":"http://patchwork.ozlabs.org/project/fwts/patch/20170908092930.20559-1-colin.king@canonical.com/","project":{"id":24,"url":"http://patchwork.ozlabs.org/api/1.2/projects/24/?format=json","name":"Firmware Test Suite development","link_name":"fwts","list_id":"fwts-devel.lists.ubuntu.com","list_email":"fwts-devel@lists.ubuntu.com","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170908092930.20559-1-colin.king@canonical.com>","list_archive_url":null,"date":"2017-09-08T09:29:30","name":"lib: fwts_button: make button counts and button number uint32_t","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"15c20ca6c42f64caad2b88cbc5cd7c46e80fb27a","submitter":{"id":2900,"url":"http://patchwork.ozlabs.org/api/1.2/people/2900/?format=json","name":"Colin Ian King","email":"colin.king@canonical.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/fwts/patch/20170908092930.20559-1-colin.king@canonical.com/mbox/","series":[{"id":2153,"url":"http://patchwork.ozlabs.org/api/1.2/series/2153/?format=json","web_url":"http://patchwork.ozlabs.org/project/fwts/list/?series=2153","date":"2017-09-08T09:29:30","name":"lib: fwts_button: make button counts and button number uint32_t","version":1,"mbox":"http://patchwork.ozlabs.org/series/2153/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811419/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811419/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com\n\t(client-ip=91.189.94.19; helo=huckleberry.canonical.com;\n\tenvelope-from=fwts-devel-bounces@lists.ubuntu.com;\n\treceiver=)","Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3xpX8Z4T1yz9rxm;\n\tFri, 8 Sep 2017 19:29:34 +1000 (AEST)","from localhost ([127.0.0.1] helo=huckleberry.canonical.com)\n\tby huckleberry.canonical.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1dqFbQ-0003NV-EB; Fri, 08 Sep 2017 09:29:32 +0000","from youngberry.canonical.com ([91.189.89.112])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128)\n\t(Exim 4.86_2) (envelope-from )\n\tid 1dqFbP-0003NH-6g\n\tfor fwts-devel@lists.ubuntu.com; Fri, 08 Sep 2017 09:29:31 +0000","from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost)\n\tby youngberry.canonical.com with esmtpsa\n\t(TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.76) (envelope-from )\n\tid 1dqFbO-00029G-Nf; Fri, 08 Sep 2017 09:29:30 +0000"],"From":"Colin King ","To":"fwts-devel@lists.ubuntu.com","Subject":"[PATCH] lib: fwts_button: make button counts and button number\n\tuint32_t","Date":"Fri, 8 Sep 2017 10:29:30 +0100","Message-Id":"<20170908092930.20559-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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"fwts-devel-bounces@lists.ubuntu.com","Sender":"\"fwts-devel\" "},"content":"From: Colin Ian King \n\nThere is no practical need for -ve button counts and button numbers\nso make these uint32_t types.\n\nSigned-off-by: Colin Ian King \n---\n src/acpi/lid/lid.c | 21 ++++++++++++---------\n src/lib/include/fwts_button.h | 2 +-\n src/lib/src/fwts_button.c | 12 ++++++------\n 3 files changed, 19 insertions(+), 16 deletions(-)","diff":"diff --git a/src/acpi/lid/lid.c b/src/acpi/lid/lid.c\nindex 93e031c0..2542051e 100644\n--- a/src/acpi/lid/lid.c\n+++ b/src/acpi/lid/lid.c\n@@ -31,7 +31,7 @@\n \n static int lid_init(fwts_framework *fw)\n {\n-\tint matched, not_matched;\n+\tuint32_t matched, not_matched;\n \n \tif (fwts_button_match_state(fw, FWTS_BUTTON_LID_ANY, &matched, ¬_matched) != FWTS_OK) {\n \t\tfwts_failed(fw, LOG_LEVEL_LOW, \"NoLIDPath\",\n@@ -41,13 +41,16 @@ static int lid_init(fwts_framework *fw)\n \treturn FWTS_OK;\n }\n \n-static void lid_check_field_poll(fwts_framework *fw,\n-\tint button, int *matching, int *not_matching)\n+static void lid_check_field_poll(\n+\tfwts_framework *fw,\n+\tconst uint32_t button,\n+\tuint32_t *matching,\n+\tuint32_t *not_matching)\n {\n \tint i;\n \n-\tint tmp_matching = 0;\n-\tint tmp_not_matching = 0;\n+\tuint32_t tmp_matching = 0;\n+\tuint32_t tmp_not_matching = 0;\n \n \tfor (i = 0; i < 100; i++) {\n \t\tfwts_button_match_state(fw, button,\n@@ -63,8 +66,8 @@ static void lid_check_field_poll(fwts_framework *fw,\n \n static int lid_test1(fwts_framework *fw)\n {\n-\tint matching = 0;\n-\tint not_matching = 0;\n+\tuint32_t matching = 0;\n+\tuint32_t not_matching = 0;\n \n \tfwts_printf(fw, \"==== Make sure laptop lid is open. ====\\n\");\n \tfwts_press_enter(fw);\n@@ -84,8 +87,8 @@ static int lid_test_state(fwts_framework *fw, int button)\n {\n \tint gpe_count = 0;\n \tint fd;\n-\tint matching = 0;\n-\tint not_matching = 0;\n+\tuint32_t matching = 0;\n+\tuint32_t not_matching = 0;\n \tint events = 0;\n \tsize_t len;\n \tchar *state;\ndiff --git a/src/lib/include/fwts_button.h b/src/lib/include/fwts_button.h\nindex 5130c0c8..bc475e91 100644\n--- a/src/lib/include/fwts_button.h\n+++ b/src/lib/include/fwts_button.h\n@@ -26,6 +26,6 @@\n \n #define FWTS_BUTTON_POWER_EXISTS\t(0x00010)\n \n-int fwts_button_match_state(fwts_framework *fw, const int button, int *matched, int *not_matched);\n+int fwts_button_match_state(fwts_framework *fw, const uint32_t button, uint32_t *matched, uint32_t *not_matched);\n \n #endif\ndiff --git a/src/lib/src/fwts_button.c b/src/lib/src/fwts_button.c\nindex 6e9a0101..c9fa8ee2 100644\n--- a/src/lib/src/fwts_button.c\n+++ b/src/lib/src/fwts_button.c\n@@ -35,9 +35,9 @@\n *\tany non-matching states found, via proc iterface\n */\n static int fwts_button_match_state_proc(\n-\tconst int button,\n-\tint *matched,\n-\tint *not_matched)\n+\tconst uint32_t button,\n+\tuint32_t *matched,\n+\tuint32_t *not_matched)\n {\n \tDIR *dir;\n \tstruct dirent *entry;\n@@ -112,9 +112,9 @@ static int fwts_button_match_state_proc(\n */\n int fwts_button_match_state(\n \tfwts_framework *fw,\n-\tconst int button,\n-\tint *matched,\n-\tint *not_matched)\n+\tconst uint32_t button,\n+\tuint32_t *matched,\n+\tuint32_t *not_matched)\n {\n \t*matched = 0;\n \t*not_matched = 0;\n","prefixes":[]}