Commit 703ecd22 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Debugger: Rename debugger OSL names 

ACPICA commit e76eb8b36ace880e4d475880db1128a206e57b6f

This linuxized ACPICA commit is a back port result of the following
linux commit:

  Commit: f8d31489
  Subject: ACPICA: Debugger: Convert some mechanisms to OSPM specific

During the back porting, it is requested by ACPICA to use expected OSL
names. Suggested by Bob Moore, Fixed by Lv Zheng.

Linux is not affected by this patch.

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


Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0c744ea4

drivers/acpi/acpica/dbxface.c

+2 −2
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ acpi_status acpi_initialize_debugger(void) 


		/* These were created with one unit, grab it */



		status = acpi_os_initialize_command_signals();

		status = acpi_os_initialize_debugger();

		if (ACPI_FAILURE(status)) {

			acpi_os_printf("Could not get debugger mutex\n");

			return_ACPI_STATUS(status);
@@ -482,7 +482,7 @@ void acpi_terminate_debugger(void) 
			acpi_os_sleep(100);

		}



		acpi_os_terminate_command_signals();

		acpi_os_terminate_debugger();

	}



	if (acpi_gbl_db_buffer) {

include/acpi/acpiosxf.h

+4 −4
Original line number Diff line number Diff line
@@ -355,12 +355,12 @@ void acpi_os_redirect_output(void *destination); 
acpi_status acpi_os_get_line(char *buffer, u32 buffer_length, u32 *bytes_read);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_command_signals

acpi_status acpi_os_initialize_command_signals(void);

#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_debugger

acpi_status acpi_os_initialize_debugger(void);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_command_signals

void acpi_os_terminate_command_signals(void);

#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_debugger

void acpi_os_terminate_debugger(void);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_wait_command_ready

include/acpi/platform/aclinux.h

+2 −2
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ 
 */

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_readable

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_writable

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_command_signals

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_command_signals

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_debugger

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_debugger



/*

 * OSL interfaces used by utilities

include/acpi/platform/aclinuxex.h

+2 −2
Original line number Diff line number Diff line
@@ -129,12 +129,12 @@ static inline u8 acpi_os_readable(void *pointer, acpi_size length) 
	return TRUE;

}



static inline acpi_status acpi_os_initialize_command_signals(void)

static inline acpi_status acpi_os_initialize_debugger(void)

{

	return AE_OK;

}



static inline void acpi_os_terminate_command_signals(void)

static inline void acpi_os_terminate_debugger(void)

{

	return;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE