ACPICA: Rename nameseg copy macro for clarity
ACPICA commit 19c18d3157945d1b8b64a826f0a8e848b7dbb127 ACPI_MOVE_NAME changed to ACPI_COPY_NAMESEG This clarifies (1) this is a copy operation, and (2) it operates on ACPI name_segs. Improves understanding of the code. Link: https://github.com/acpica/acpica/commit/19c18d31 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
15ade5d2e7
commit
a3ce7a8e0d
|
@ -108,7 +108,7 @@ acpi_ns_handle_to_name(acpi_handle target_handle, struct acpi_buffer *buffer)
|
|||
/* Just copy the ACPI name from the Node and zero terminate it */
|
||||
|
||||
node_name = acpi_ut_get_node_name(node);
|
||||
ACPI_MOVE_NAME(buffer->pointer, node_name);
|
||||
ACPI_COPY_NAMESEG(buffer->pointer, node_name);
|
||||
((char *)buffer->pointer)[ACPI_NAME_SIZE] = 0;
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%4.4s\n", (char *)buffer->pointer));
|
||||
|
|
|
@ -489,8 +489,8 @@ acpi_ns_externalize_name(u32 internal_name_length,
|
|||
|
||||
/* Copy and validate the 4-char name segment */
|
||||
|
||||
ACPI_MOVE_NAME(&(*converted_name)[j],
|
||||
&internal_name[names_index]);
|
||||
ACPI_COPY_NAMESEG(&(*converted_name)[j],
|
||||
&internal_name[names_index]);
|
||||
acpi_ut_repair_name(&(*converted_name)[j]);
|
||||
|
||||
j += ACPI_NAME_SIZE;
|
||||
|
|
|
@ -56,7 +56,7 @@ acpi_tb_find_table(char *signature,
|
|||
/* Normalize the input strings */
|
||||
|
||||
memset(&header, 0, sizeof(struct acpi_table_header));
|
||||
ACPI_MOVE_NAME(header.signature, signature);
|
||||
ACPI_COPY_NAMESEG(header.signature, signature);
|
||||
strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
|
||||
strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
|
||||
|
||||
|
|
|
@ -145,7 +145,7 @@ void acpi_ut_repair_name(char *name)
|
|||
return;
|
||||
}
|
||||
|
||||
ACPI_MOVE_NAME(&original_name, name);
|
||||
ACPI_COPY_NAMESEG(&original_name, name);
|
||||
|
||||
/* Check each character in the name */
|
||||
|
||||
|
|
|
@ -516,10 +516,10 @@ typedef u64 acpi_integer;
|
|||
|
||||
#ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
|
||||
#define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (u32, (a)) == *ACPI_CAST_PTR (u32, (b)))
|
||||
#define ACPI_MOVE_NAME(dest,src) (*ACPI_CAST_PTR (u32, (dest)) = *ACPI_CAST_PTR (u32, (src)))
|
||||
#define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (u32, (dest)) = *ACPI_CAST_PTR (u32, (src)))
|
||||
#else
|
||||
#define ACPI_COMPARE_NAME(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE))
|
||||
#define ACPI_MOVE_NAME(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))
|
||||
#define ACPI_COPY_NAMESEG(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))
|
||||
#endif
|
||||
|
||||
/* Support for the special RSDP signature (8 characters) */
|
||||
|
|
|
@ -286,7 +286,7 @@ static acpi_status osl_add_table_to_list(char *signature, u32 instance)
|
|||
return (AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
ACPI_MOVE_NAME(new_info->signature, signature);
|
||||
ACPI_COPY_NAMESEG(new_info->signature, signature);
|
||||
|
||||
if (!gbl_table_list_head) {
|
||||
gbl_table_list_head = new_info;
|
||||
|
@ -1174,7 +1174,7 @@ osl_table_name_from_file(char *filename, char *signature, u32 *instance)
|
|||
|
||||
/* Extract signature */
|
||||
|
||||
ACPI_MOVE_NAME(signature, filename);
|
||||
ACPI_COPY_NAMESEG(signature, filename);
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
|
|
|
@ -110,9 +110,9 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
|
|||
/* Construct lower-case filename from the table local signature */
|
||||
|
||||
if (ACPI_VALIDATE_RSDP_SIG(table->signature)) {
|
||||
ACPI_MOVE_NAME(filename, ACPI_RSDP_NAME);
|
||||
ACPI_COPY_NAMESEG(filename, ACPI_RSDP_NAME);
|
||||
} else {
|
||||
ACPI_MOVE_NAME(filename, table->signature);
|
||||
ACPI_COPY_NAMESEG(filename, table->signature);
|
||||
}
|
||||
|
||||
filename[0] = (char)tolower((int)filename[0]);
|
||||
|
|
Loading…
Reference in New Issue