aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2016-09-07 02:14:30 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-09-09 20:37:59 -0400
commit5ebd2eaaefc0d4fe37ab72e716e1b8065ed4206c (patch)
tree36563f7c5e47e58b2d0fe5624f135a19dfbd3c33 /tools
parent60361b75848c8614233e3374ef5a0056527f0385 (diff)
ACPICA: Cleanup for all string-to-integer conversions
ACPICA commit e2e72a351201fd58e4694418859ae2c247dafca0 Consolidate multiple versions of strtoul64 to one common version. limit possible bases to either 10 or 16. Handles both implicit and explicit conversions. Added a 2-character ascii-to-hex function for GPEs and buffers. Adds a new file, utstrtoul64.c Link: https://github.com/acpica/acpica/commit/e2e72a35 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/power/acpi/tools/acpidump/Makefile2
-rw-r--r--tools/power/acpi/tools/acpidump/apdump.c4
-rw-r--r--tools/power/acpi/tools/acpidump/apmain.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/tools/power/acpi/tools/acpidump/Makefile b/tools/power/acpi/tools/acpidump/Makefile
index a710f60290ee..04b5db7c7c0b 100644
--- a/tools/power/acpi/tools/acpidump/Makefile
+++ b/tools/power/acpi/tools/acpidump/Makefile
@@ -36,10 +36,12 @@ TOOL_OBJS = \
36 utdebug.o\ 36 utdebug.o\
37 utexcep.o\ 37 utexcep.o\
38 utglobal.o\ 38 utglobal.o\
39 uthex.o\
39 utmath.o\ 40 utmath.o\
40 utnonansi.o\ 41 utnonansi.o\
41 utprint.o\ 42 utprint.o\
42 utstring.o\ 43 utstring.o\
44 utstrtoul64.o\
43 utxferror.o\ 45 utxferror.o\
44 oslinuxtbl.o\ 46 oslinuxtbl.o\
45 cmfsize.o\ 47 cmfsize.o\
diff --git a/tools/power/acpi/tools/acpidump/apdump.c b/tools/power/acpi/tools/acpidump/apdump.c
index 1c4e00bd8acb..9031be1afe63 100644
--- a/tools/power/acpi/tools/acpidump/apdump.c
+++ b/tools/power/acpi/tools/acpidump/apdump.c
@@ -287,8 +287,8 @@ int ap_dump_table_by_address(char *ascii_address)
287 287
288 /* Convert argument to an integer physical address */ 288 /* Convert argument to an integer physical address */
289 289
290 status = acpi_ut_strtoul64(ascii_address, ACPI_ANY_BASE, 290 status = acpi_ut_strtoul64(ascii_address, ACPI_STRTOUL_64BIT,
291 ACPI_MAX64_BYTE_WIDTH, &long_address); 291 &long_address);
292 if (ACPI_FAILURE(status)) { 292 if (ACPI_FAILURE(status)) {
293 fprintf(stderr, "%s: Could not convert to a physical address\n", 293 fprintf(stderr, "%s: Could not convert to a physical address\n",
294 ascii_address); 294 ascii_address);
diff --git a/tools/power/acpi/tools/acpidump/apmain.c b/tools/power/acpi/tools/acpidump/apmain.c
index f32968e22af5..7ff46be908f0 100644
--- a/tools/power/acpi/tools/acpidump/apmain.c
+++ b/tools/power/acpi/tools/acpidump/apmain.c
@@ -208,8 +208,8 @@ static int ap_do_options(int argc, char **argv)
208 case 'r': /* Dump tables from specified RSDP */ 208 case 'r': /* Dump tables from specified RSDP */
209 209
210 status = 210 status =
211 acpi_ut_strtoul64(acpi_gbl_optarg, ACPI_ANY_BASE, 211 acpi_ut_strtoul64(acpi_gbl_optarg,
212 ACPI_MAX64_BYTE_WIDTH, 212 ACPI_STRTOUL_64BIT,
213 &gbl_rsdp_base); 213 &gbl_rsdp_base);
214 if (ACPI_FAILURE(status)) { 214 if (ACPI_FAILURE(status)) {
215 fprintf(stderr, 215 fprintf(stderr,