Skip to content

Commit

Permalink
ACPICA: Debugger: Rename debugger OSL names
Browse files Browse the repository at this point in the history
ACPICA commit e76eb8b36ace880e4d475880db1128a206e57b6f

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

  Commit: f8d3148
  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: acpica/acpica@e76eb8b3
Signed-off-by: Lv Zheng <[email protected]>
Signed-off-by: Bob Moore <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
  • Loading branch information
Lv Zheng authored and rafaeljw committed Jan 2, 2017
1 parent 0c744ea commit 703ecd2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/dbxface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions include/acpi/acpiosxf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/acpi/platform/aclinux.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/acpi/platform/aclinuxex.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 703ecd2

Please sign in to comment.