Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90adf776 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Tools: Deploy -vd option (build date/time) across all tools 

ACPICA commit 336131640a1574b86240b32eca3150195f9270d6

Common option for all tools.

Link: https://github.com/acpica/acpica/commit/33613164


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a26f4df9

drivers/acpi/acpica/acapps.h

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ 
	prefix, ACPICA_COPYRIGHT, \

	prefix



#define ACPI_COMMON_BUILD_TIME \

	"Build date/time: %s %s\n", __DATE__, __TIME__



/* Macros for usage messages */



#define ACPI_USAGE_HEADER(usage) \

tools/power/acpi/tools/acpidump/apmain.c

+24 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct ap_dump_action action_table[AP_MAX_ACTIONS]; 
u32 current_action = 0;



#define AP_UTILITY_NAME             "ACPI Binary Table Dump Utility"

#define AP_SUPPORTED_OPTIONS        "?a:bc:f:hn:o:r:svxz"

#define AP_SUPPORTED_OPTIONS        "?a:bc:f:hn:o:r:sv^xz"



/******************************************************************************

 *
@@ -100,6 +100,7 @@ static void ap_display_usage(void) 
	ACPI_OPTION("-r <Address>", "Dump tables from specified RSDP");

	ACPI_OPTION("-s", "Print table summaries only");

	ACPI_OPTION("-v", "Display version information");

	ACPI_OPTION("-vd", "Display build date and time");

	ACPI_OPTION("-z", "Verbose mode");



	ACPI_USAGE_TEXT("\nTable Options:\n");
@@ -231,11 +232,30 @@ static int ap_do_options(int argc, char **argv) 
			}

			continue;



		case 'v':	/* Revision/version */

		case 'v':	/* -v: (Version): signon already emitted, just exit */



			acpi_os_printf(ACPI_COMMON_SIGNON(AP_UTILITY_NAME));

			switch (acpi_gbl_optarg[0]) {

			case '^':	/* -v: (Version) */



				fprintf(stderr,

					ACPI_COMMON_SIGNON(AP_UTILITY_NAME));

				return (1);



			case 'd':



				fprintf(stderr,

					ACPI_COMMON_SIGNON(AP_UTILITY_NAME));

				printf(ACPI_COMMON_BUILD_TIME);

				return (1);



			default:



				printf("Unknown option: -v%s\n",

				       acpi_gbl_optarg);

				return (-1);

			}

			break;



		case 'z':	/* Verbose mode */



			gbl_verbose_mode = TRUE;