Commit 4fa4616e authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki

ACPICA: De-macroize calls to standard C library functions

ACPICA commit 3b1026e0bdd3c32eb6d5d313f3ba0b1fee7597b4
ACPICA commit 00f0dc83f5cfca53b27a3213ae0d7719b88c2d6b
ACPICA commit 47d22a738d0e19fd241ffe4e3e9d4e198e4afc69

Across all of ACPICA. Replace C library macros such as ACPI_STRLEN with the
standard names such as strlen. The original purpose for these macros is
long since obsolete.
Also cast various invocations as necessary. Bob Moore, Jung-uk Kim, Lv Zheng.

Link: https://github.com/acpica/acpica/commit/3b1026e0
Link: https://github.com/acpica/acpica/commit/00f0dc83
Link: https://github.com/acpica/acpica/commit/47d22a73Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarJung-uk Kim <jkim@FreeBSD.org>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 63c43812
...@@ -210,37 +210,35 @@ void acpi_ut_subsystem_shutdown(void); ...@@ -210,37 +210,35 @@ void acpi_ut_subsystem_shutdown(void);
*/ */
#ifndef ACPI_USE_SYSTEM_CLIBRARY #ifndef ACPI_USE_SYSTEM_CLIBRARY
acpi_size acpi_ut_strlen(const char *string); acpi_size strlen(const char *string);
char *acpi_ut_strchr(const char *string, int ch); char *strchr(const char *string, int ch);
char *acpi_ut_strcpy(char *dst_string, const char *src_string); char *strcpy(char *dst_string, const char *src_string);
char *acpi_ut_strncpy(char *dst_string, char *strncpy(char *dst_string, const char *src_string, acpi_size count);
const char *src_string, acpi_size count);
int acpi_ut_memcmp(const char *buffer1, const char *buffer2, acpi_size count); int strncmp(const char *string1, const char *string2, acpi_size count);
int acpi_ut_strncmp(const char *string1, const char *string2, acpi_size count); int strcmp(const char *string1, const char *string2);
int acpi_ut_strcmp(const char *string1, const char *string2); char *strcat(char *dst_string, const char *src_string);
char *acpi_ut_strcat(char *dst_string, const char *src_string); char *strncat(char *dst_string, const char *src_string, acpi_size count);
char *acpi_ut_strncat(char *dst_string, u32 strtoul(const char *string, char **terminator, u32 base);
const char *src_string, acpi_size count);
u32 acpi_ut_strtoul(const char *string, char **terminator, u32 base); char *strstr(char *string1, char *string2);
char *acpi_ut_strstr(char *string1, char *string2); int memcmp(void *buffer1, void *buffer2, acpi_size count);
void *acpi_ut_memcpy(void *dest, const void *src, acpi_size count); void *memcpy(void *dest, const void *src, acpi_size count);
void *acpi_ut_memset(void *dest, u8 value, acpi_size count); void *memset(void *dest, int value, acpi_size count);
int acpi_ut_to_upper(int c); int toupper(int c);
int acpi_ut_to_lower(int c); int tolower(int c);
extern const u8 _acpi_ctype[]; extern const u8 _acpi_ctype[];
...@@ -255,13 +253,13 @@ extern const u8 _acpi_ctype[]; ...@@ -255,13 +253,13 @@ extern const u8 _acpi_ctype[];
#define _ACPI_UP 0x01 /* 'A'-'Z' */ #define _ACPI_UP 0x01 /* 'A'-'Z' */
#define _ACPI_XD 0x80 /* '0'-'9', 'A'-'F', 'a'-'f' */ #define _ACPI_XD 0x80 /* '0'-'9', 'A'-'F', 'a'-'f' */
#define ACPI_IS_DIGIT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_DI)) #define isdigit(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_DI))
#define ACPI_IS_SPACE(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_SP)) #define isspace(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_SP))
#define ACPI_IS_XDIGIT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_XD)) #define isxdigit(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_XD))
#define ACPI_IS_UPPER(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP)) #define isupper(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP))
#define ACPI_IS_LOWER(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO)) #define islower(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO))
#define ACPI_IS_PRINT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_XS | _ACPI_PU)) #define isprint(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_XS | _ACPI_PU))
#define ACPI_IS_ALPHA(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP)) #define isalpha(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP))
#endif /* !ACPI_USE_SYSTEM_CLIBRARY */ #endif /* !ACPI_USE_SYSTEM_CLIBRARY */
......
...@@ -502,7 +502,7 @@ acpi_ds_create_field(union acpi_parse_object *op, ...@@ -502,7 +502,7 @@ acpi_ds_create_field(union acpi_parse_object *op,
} }
} }
ACPI_MEMSET(&info, 0, sizeof(struct acpi_create_field_info)); memset(&info, 0, sizeof(struct acpi_create_field_info));
/* Second arg is the field flags */ /* Second arg is the field flags */
......
...@@ -207,7 +207,7 @@ acpi_ds_initialize_objects(u32 table_index, ...@@ -207,7 +207,7 @@ acpi_ds_initialize_objects(u32 table_index,
/* Set all init info to zero */ /* Set all init info to zero */
ACPI_MEMSET(&info, 0, sizeof(struct acpi_init_walk_info)); memset(&info, 0, sizeof(struct acpi_init_walk_info));
info.owner_id = owner_id; info.owner_id = owner_id;
info.table_index = table_index; info.table_index = table_index;
......
...@@ -339,8 +339,8 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state, ...@@ -339,8 +339,8 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
/* Initialize buffer from the byte_list (if present) */ /* Initialize buffer from the byte_list (if present) */
if (byte_list) { if (byte_list) {
ACPI_MEMCPY(obj_desc->buffer.pointer, memcpy(obj_desc->buffer.pointer, byte_list->named.data,
byte_list->named.data, byte_list_length); byte_list_length);
} }
} }
...@@ -750,8 +750,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, ...@@ -750,8 +750,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
case ACPI_TYPE_STRING: case ACPI_TYPE_STRING:
obj_desc->string.pointer = op->common.value.string; obj_desc->string.pointer = op->common.value.string;
obj_desc->string.length = obj_desc->string.length = (u32)strlen(op->common.value.string);
(u32)ACPI_STRLEN(op->common.value.string);
/* /*
* The string is contained in the ACPI table, don't ever try * The string is contained in the ACPI table, don't ever try
......
...@@ -572,8 +572,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state, ...@@ -572,8 +572,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
obj_desc = obj_desc =
acpi_ut_create_string_object((acpi_size) name_length); acpi_ut_create_string_object((acpi_size) name_length);
ACPI_STRNCPY(obj_desc->string.pointer, strncpy(obj_desc->string.pointer,
name_string, name_length); name_string, name_length);
status = AE_OK; status = AE_OK;
} else { } else {
/* /*
......
...@@ -377,7 +377,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle, ...@@ -377,7 +377,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
/* 4) The last two characters of the name are the hex GPE Number */ /* 4) The last two characters of the name are the hex GPE Number */
gpe_number = ACPI_STRTOUL(&name[2], NULL, 16); gpe_number = strtoul(&name[2], NULL, 16);
if (gpe_number == ACPI_UINT32_MAX) { if (gpe_number == ACPI_UINT32_MAX) {
/* Conversion failed; invalid method, just ignore it */ /* Conversion failed; invalid method, just ignore it */
......
...@@ -470,7 +470,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, ...@@ -470,7 +470,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
return_ACPI_STATUS(AE_NO_MEMORY); return_ACPI_STATUS(AE_NO_MEMORY);
} }
ACPI_MEMCPY(table, table_header, length); memcpy(table, table_header, length);
break; break;
default: default:
......
...@@ -227,9 +227,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc, ...@@ -227,9 +227,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
/* Copy the integer to the buffer, LSB first */ /* Copy the integer to the buffer, LSB first */
new_buf = return_desc->buffer.pointer; new_buf = return_desc->buffer.pointer;
ACPI_MEMCPY(new_buf, memcpy(new_buf,
&obj_desc->integer.value, &obj_desc->integer.value, acpi_gbl_integer_byte_width);
acpi_gbl_integer_byte_width);
break; break;
case ACPI_TYPE_STRING: case ACPI_TYPE_STRING:
...@@ -252,8 +251,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc, ...@@ -252,8 +251,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
/* Copy the string to the buffer */ /* Copy the string to the buffer */
new_buf = return_desc->buffer.pointer; new_buf = return_desc->buffer.pointer;
ACPI_STRNCPY((char *)new_buf, (char *)obj_desc->string.pointer, strncpy((char *)new_buf, (char *)obj_desc->string.pointer,
obj_desc->string.length); obj_desc->string.length);
break; break;
default: default:
......
...@@ -428,7 +428,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc, ...@@ -428,7 +428,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
} }
buffer = buffer_desc->buffer.pointer; buffer = buffer_desc->buffer.pointer;
ACPI_MEMCPY(buffer, source_desc->buffer.pointer, length); memcpy(buffer, source_desc->buffer.pointer, length);
/* Lock entire transaction if requested */ /* Lock entire transaction if requested */
......
...@@ -416,22 +416,22 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc, ...@@ -416,22 +416,22 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
* Copy the data from the source buffer. * Copy the data from the source buffer.
* Length is the field width in bytes. * Length is the field width in bytes.
*/ */
ACPI_MEMCPY(value, memcpy(value,
(obj_desc->buffer_field.buffer_obj)->buffer. (obj_desc->buffer_field.buffer_obj)->buffer.
pointer + pointer +
obj_desc->buffer_field.base_byte_offset + obj_desc->buffer_field.base_byte_offset +
field_datum_byte_offset, field_datum_byte_offset,
obj_desc->common_field.access_byte_width); obj_desc->common_field.access_byte_width);
} else { } else {
/* /*
* Copy the data to the target buffer. * Copy the data to the target buffer.
* Length is the field width in bytes. * Length is the field width in bytes.
*/ */
ACPI_MEMCPY((obj_desc->buffer_field.buffer_obj)->buffer. memcpy((obj_desc->buffer_field.buffer_obj)->buffer.
pointer + pointer +
obj_desc->buffer_field.base_byte_offset + obj_desc->buffer_field.base_byte_offset +
field_datum_byte_offset, value, field_datum_byte_offset, value,
obj_desc->common_field.access_byte_width); obj_desc->common_field.access_byte_width);
} }
status = AE_OK; status = AE_OK;
...@@ -703,7 +703,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc, ...@@ -703,7 +703,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
return_ACPI_STATUS(AE_BUFFER_OVERFLOW); return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
} }
ACPI_MEMSET(buffer, 0, buffer_length); memset(buffer, 0, buffer_length);
access_bit_width = ACPI_MUL_8(obj_desc->common_field.access_byte_width); access_bit_width = ACPI_MUL_8(obj_desc->common_field.access_byte_width);
/* Handle the simple case here */ /* Handle the simple case here */
...@@ -720,7 +720,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc, ...@@ -720,7 +720,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
status = status =
acpi_ex_field_datum_io(obj_desc, 0, &raw_datum, acpi_ex_field_datum_io(obj_desc, 0, &raw_datum,
ACPI_READ); ACPI_READ);
ACPI_MEMCPY(buffer, &raw_datum, buffer_length); memcpy(buffer, &raw_datum, buffer_length);
} }
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
...@@ -793,9 +793,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc, ...@@ -793,9 +793,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
/* Write merged datum to target buffer */ /* Write merged datum to target buffer */
ACPI_MEMCPY(((char *)buffer) + buffer_offset, &merged_datum, memcpy(((char *)buffer) + buffer_offset, &merged_datum,
ACPI_MIN(obj_desc->common_field.access_byte_width, ACPI_MIN(obj_desc->common_field.access_byte_width,
buffer_length - buffer_offset)); buffer_length - buffer_offset));
buffer_offset += obj_desc->common_field.access_byte_width; buffer_offset += obj_desc->common_field.access_byte_width;
merged_datum = merged_datum =
...@@ -811,9 +811,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc, ...@@ -811,9 +811,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
/* Write the last datum to the buffer */ /* Write the last datum to the buffer */
ACPI_MEMCPY(((char *)buffer) + buffer_offset, &merged_datum, memcpy(((char *)buffer) + buffer_offset, &merged_datum,
ACPI_MIN(obj_desc->common_field.access_byte_width, ACPI_MIN(obj_desc->common_field.access_byte_width,
buffer_length - buffer_offset)); buffer_length - buffer_offset));
return_ACPI_STATUS(AE_OK); return_ACPI_STATUS(AE_OK);
} }
...@@ -878,7 +878,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc, ...@@ -878,7 +878,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
* at Byte zero. All unused (upper) bytes of the * at Byte zero. All unused (upper) bytes of the
* buffer will be 0. * buffer will be 0.
*/ */
ACPI_MEMCPY((char *)new_buffer, (char *)buffer, buffer_length); memcpy((char *)new_buffer, (char *)buffer, buffer_length);
buffer = new_buffer; buffer = new_buffer;
buffer_length = required_length; buffer_length = required_length;
} }
...@@ -918,9 +918,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc, ...@@ -918,9 +918,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
/* Get initial Datum from the input buffer */ /* Get initial Datum from the input buffer */
ACPI_MEMCPY(&raw_datum, buffer, memcpy(&raw_datum, buffer,
ACPI_MIN(obj_desc->common_field.access_byte_width, ACPI_MIN(obj_desc->common_field.access_byte_width,
buffer_length - buffer_offset)); buffer_length - buffer_offset));
merged_datum = merged_datum =
raw_datum << obj_desc->common_field.start_field_bit_offset; raw_datum << obj_desc->common_field.start_field_bit_offset;
...@@ -970,9 +970,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc, ...@@ -970,9 +970,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
/* Get the next input datum from the buffer */ /* Get the next input datum from the buffer */
buffer_offset += obj_desc->common_field.access_byte_width; buffer_offset += obj_desc->common_field.access_byte_width;
ACPI_MEMCPY(&raw_datum, ((char *)buffer) + buffer_offset, memcpy(&raw_datum, ((char *)buffer) + buffer_offset,
ACPI_MIN(obj_desc->common_field.access_byte_width, ACPI_MIN(obj_desc->common_field.access_byte_width,
buffer_length - buffer_offset)); buffer_length - buffer_offset));
merged_datum |= merged_datum |=
raw_datum << obj_desc->common_field.start_field_bit_offset; raw_datum << obj_desc->common_field.start_field_bit_offset;
......
...@@ -209,8 +209,8 @@ acpi_ex_concat_template(union acpi_operand_object *operand0, ...@@ -209,8 +209,8 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
* end_tag descriptor is copied from Operand1. * end_tag descriptor is copied from Operand1.
*/ */
new_buf = return_desc->buffer.pointer; new_buf = return_desc->buffer.pointer;
ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length0); memcpy(new_buf, operand0->buffer.pointer, length0);
ACPI_MEMCPY(new_buf + length0, operand1->buffer.pointer, length1); memcpy(new_buf + length0, operand1->buffer.pointer, length1);
/* Insert end_tag and set the checksum to zero, means "ignore checksum" */ /* Insert end_tag and set the checksum to zero, means "ignore checksum" */
...@@ -318,14 +318,14 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, ...@@ -318,14 +318,14 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
/* Copy the first integer, LSB first */ /* Copy the first integer, LSB first */
ACPI_MEMCPY(new_buf, &operand0->integer.value, memcpy(new_buf, &operand0->integer.value,
acpi_gbl_integer_byte_width); acpi_gbl_integer_byte_width);
/* Copy the second integer (LSB first) after the first */ /* Copy the second integer (LSB first) after the first */
ACPI_MEMCPY(new_buf + acpi_gbl_integer_byte_width, memcpy(new_buf + acpi_gbl_integer_byte_width,
&local_operand1->integer.value, &local_operand1->integer.value,
acpi_gbl_integer_byte_width); acpi_gbl_integer_byte_width);
break; break;
case ACPI_TYPE_STRING: case ACPI_TYPE_STRING:
...@@ -346,9 +346,9 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, ...@@ -346,9 +346,9 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
/* Concatenate the strings */ /* Concatenate the strings */
ACPI_STRCPY(new_buf, operand0->string.pointer); strcpy(new_buf, operand0->string.pointer);
ACPI_STRCPY(new_buf + operand0->string.length, strcpy(new_buf + operand0->string.length,
local_operand1->string.pointer); local_operand1->string.pointer);
break; break;
case ACPI_TYPE_BUFFER: case ACPI_TYPE_BUFFER:
...@@ -369,11 +369,11 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, ...@@ -369,11 +369,11 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
/* Concatenate the buffers */ /* Concatenate the buffers */
ACPI_MEMCPY(new_buf, operand0->buffer.pointer, memcpy(new_buf, operand0->buffer.pointer,
operand0->buffer.length); operand0->buffer.length);
ACPI_MEMCPY(new_buf + operand0->buffer.length, memcpy(new_buf + operand0->buffer.length,
local_operand1->buffer.pointer, local_operand1->buffer.pointer,
local_operand1->buffer.length); local_operand1->buffer.length);
break; break;
default: default:
...@@ -660,9 +660,9 @@ acpi_ex_do_logical_op(u16 opcode, ...@@ -660,9 +660,9 @@ acpi_ex_do_logical_op(u16 opcode,
/* Lexicographic compare: compare the data bytes */ /* Lexicographic compare: compare the data bytes */
compare = ACPI_MEMCMP(operand0->buffer.pointer, compare = memcmp(operand0->buffer.pointer,
local_operand1->buffer.pointer, local_operand1->buffer.pointer,
(length0 > length1) ? length1 : length0); (length0 > length1) ? length1 : length0);
switch (opcode) { switch (opcode) {
case AML_LEQUAL_OP: /* LEqual (Operand0, Operand1) */ case AML_LEQUAL_OP: /* LEqual (Operand0, Operand1) */
......
...@@ -192,7 +192,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string) ...@@ -192,7 +192,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
char_buf[4] = '\0'; char_buf[4] = '\0';
if (name_string) { if (name_string) {
ACPI_STRCAT(name_string, char_buf); strcat(name_string, char_buf);
ACPI_DEBUG_PRINT((ACPI_DB_NAMES, ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
"Appended to - %s\n", name_string)); "Appended to - %s\n", name_string));
} else { } else {
......
...@@ -337,8 +337,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) ...@@ -337,8 +337,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
* Copy the raw buffer data with no transform. * Copy the raw buffer data with no transform.
* (NULL terminated already) * (NULL terminated already)
*/ */
ACPI_MEMCPY(return_desc->string.pointer, memcpy(return_desc->string.pointer,
operand[0]->buffer.pointer, length); operand[0]->buffer.pointer, length);
break; break;
case AML_CONCAT_RES_OP: case AML_CONCAT_RES_OP:
......
...@@ -237,8 +237,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state) ...@@ -237,8 +237,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
/* We have a buffer, copy the portion requested */ /* We have a buffer, copy the portion requested */
ACPI_MEMCPY(buffer, operand[0]->string.pointer + index, memcpy(buffer, operand[0]->string.pointer + index,
length); length);
} }
/* Set the length of the new String/Buffer */ /* Set the length of the new String/Buffer */
......
...@@ -517,15 +517,14 @@ acpi_ex_data_table_space_handler(u32 function, ...@@ -517,15 +517,14 @@ acpi_ex_data_table_space_handler(u32 function,
switch (function) { switch (function) {
case ACPI_READ: case ACPI_READ:
ACPI_MEMCPY(ACPI_CAST_PTR(char, value), memcpy(ACPI_CAST_PTR(char, value),
ACPI_PHYSADDR_TO_PTR(address), ACPI_PHYSADDR_TO_PTR(address), ACPI_DIV_8(bit_width));
ACPI_DIV_8(bit_width));
break; break;
case ACPI_WRITE: case ACPI_WRITE:
ACPI_MEMCPY(ACPI_PHYSADDR_TO_PTR(address), memcpy(ACPI_PHYSADDR_TO_PTR(address),
ACPI_CAST_PTR(char, value), ACPI_DIV_8(bit_width)); ACPI_CAST_PTR(char, value), ACPI_DIV_8(bit_width));
break; break;
default: default:
......
...@@ -100,9 +100,9 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc, ...@@ -100,9 +100,9 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
/* Clear existing buffer and copy in the new one */ /* Clear existing buffer and copy in the new one */
ACPI_MEMSET(target_desc->buffer.pointer, 0, memset(target_desc->buffer.pointer, 0,
target_desc->buffer.length); target_desc->buffer.length);
ACPI_MEMCPY(target_desc->buffer.pointer, buffer, length); memcpy(target_desc->buffer.pointer, buffer, length);
#ifdef ACPI_OBSOLETE_BEHAVIOR #ifdef ACPI_OBSOLETE_BEHAVIOR
/* /*
...@@ -129,8 +129,8 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc, ...@@ -129,8 +129,8 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
} else { } else {
/* Truncate the source, copy only what will fit */ /* Truncate the source, copy only what will fit */
ACPI_MEMCPY(target_desc->buffer.pointer, buffer, memcpy(target_desc->buffer.pointer, buffer,
target_desc->buffer.length); target_desc->buffer.length);
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Truncating source buffer from %X to %X\n", "Truncating source buffer from %X to %X\n",
...@@ -187,9 +187,9 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc, ...@@ -187,9 +187,9 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
* String will fit in existing non-static buffer. * String will fit in existing non-static buffer.
* Clear old string and copy in the new one * Clear old string and copy in the new one
*/ */
ACPI_MEMSET(target_desc->string.pointer, 0, memset(target_desc->string.pointer, 0,
(acpi_size) target_desc->string.length + 1); (acpi_size) target_desc->string.length + 1);
ACPI_MEMCPY(target_desc->string.pointer, buffer, length); memcpy(target_desc->string.pointer, buffer, length);
} else { } else {
/* /*
* Free the current buffer, then allocate a new buffer * Free the current buffer, then allocate a new buffer
...@@ -210,7 +210,7 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc, ...@@ -210,7 +210,7 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
} }
target_desc->common.flags &= ~AOPOBJ_STATIC_POINTER; target_desc->common.flags &= ~AOPOBJ_STATIC_POINTER;
ACPI_MEMCPY(target_desc->string.pointer, buffer, length); memcpy(target_desc->string.pointer, buffer, length);
} }
/* Set the new target length */ /* Set the new target length */
......
...@@ -102,7 +102,7 @@ acpi_status acpi_ns_root_initialize(void) ...@@ -102,7 +102,7 @@ acpi_status acpi_ns_root_initialize(void)
/* _OSI is optional for now, will be permanent later */ /* _OSI is optional for now, will be permanent later */
if (!ACPI_STRCMP(init_val->name, "_OSI") if (!strcmp(init_val->name, "_OSI")
&& !acpi_gbl_create_osi_method) { && !acpi_gbl_create_osi_method) {
continue; continue;
} }
...@@ -180,7 +180,7 @@ acpi_status acpi_ns_root_initialize(void) ...@@ -180,7 +180,7 @@ acpi_status acpi_ns_root_initialize(void)
/* Build an object around the static string */ /* Build an object around the static string */
obj_desc->string.length = (u32)ACPI_STRLEN(val); obj_desc->string.length = (u32)strlen(val);
obj_desc->string.pointer = val; obj_desc->string.pointer = val;
obj_desc->common.flags |= AOPOBJ_STATIC_POINTER; obj_desc->common.flags |= AOPOBJ_STATIC_POINTER;
break; break;
...@@ -203,7 +203,7 @@ acpi_status acpi_ns_root_initialize(void) ...@@ -203,7 +203,7 @@ acpi_status acpi_ns_root_initialize(void)
/* Special case for ACPI Global Lock */ /* Special case for ACPI Global Lock */
if (ACPI_STRCMP(init_val->name, "_GL_") == 0) { if (strcmp(init_val->name, "_GL_") == 0) {
acpi_gbl_global_lock_mutex = obj_desc; acpi_gbl_global_lock_mutex = obj_desc;
/* Create additional counting semaphore for global lock */ /* Create additional counting semaphore for global lock */
......
...@@ -187,8 +187,8 @@ acpi_ns_convert_to_string(union acpi_operand_object *original_object, ...@@ -187,8 +187,8 @@ acpi_ns_convert_to_string(union acpi_operand_object *original_object,
* Copy the raw buffer data with no transform. String is already NULL * Copy the raw buffer data with no transform. String is already NULL
* terminated at Length+1. * terminated at Length+1.
*/ */
ACPI_MEMCPY(new_object->string.pointer, memcpy(new_object->string.pointer,
original_object->buffer.pointer, length); original_object->buffer.pointer, length);
break; break;
default: default:
...@@ -251,9 +251,9 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object, ...@@ -251,9 +251,9 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
ACPI_MEMCPY(new_object->buffer.pointer, memcpy(new_object->buffer.pointer,
original_object->string.pointer, original_object->string.pointer,
original_object->string.length); original_object->string.length);
break; break;
case ACPI_TYPE_PACKAGE: case ACPI_TYPE_PACKAGE:
......
...@@ -101,7 +101,7 @@ void acpi_ns_print_pathname(u32 num_segments, char *pathname) ...@@ -101,7 +101,7 @@ void acpi_ns_print_pathname(u32 num_segments, char *pathname)
while (num_segments) { while (num_segments) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
ACPI_IS_PRINT(pathname[i]) ? isprint((int)pathname[i]) ?
acpi_os_printf("%c", pathname[i]) : acpi_os_printf("%c", pathname[i]) :
acpi_os_printf("?"); acpi_os_printf("?");
} }
......
...@@ -440,7 +440,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj, ...@@ -440,7 +440,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
/* Initialize the evaluation information block */ /* Initialize the evaluation information block */
ACPI_MEMSET(info, 0, sizeof(struct acpi_evaluate_info)); memset(info, 0, sizeof(struct acpi_evaluate_info));
info->prefix_node = parent_node; info->prefix_node = parent_node;
/* /*
......
...@@ -90,7 +90,7 @@ acpi_status acpi_ns_initialize_objects(void) ...@@ -90,7 +90,7 @@ acpi_status acpi_ns_initialize_objects(void)
/* Set all init info to zero */ /* Set all init info to zero */
ACPI_MEMSET(&info, 0, sizeof(struct acpi_init_walk_info)); memset(&info, 0, sizeof(struct acpi_init_walk_info));
/* Walk entire namespace from the supplied root */ /* Walk entire namespace from the supplied root */
...@@ -566,7 +566,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle, ...@@ -566,7 +566,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
(ACPI_TYPE_METHOD, device_node, METHOD_NAME__INI)); (ACPI_TYPE_METHOD, device_node, METHOD_NAME__INI));
ACPI_MEMSET(info, 0, sizeof(struct acpi_evaluate_info)); memset(info, 0, sizeof(struct acpi_evaluate_info));
info->prefix_node = device_node; info->prefix_node = device_node;
info->relative_pathname = METHOD_NAME__INI; info->relative_pathname = METHOD_NAME__INI;
info->parameters = NULL; info->parameters = NULL;
......
...@@ -580,7 +580,7 @@ acpi_ns_repair_HID(struct acpi_evaluate_info *info, ...@@ -580,7 +580,7 @@ acpi_ns_repair_HID(struct acpi_evaluate_info *info,
* # is a hex digit. * # is a hex digit.
*/ */
for (dest = new_string->string.pointer; *source; dest++, source++) { for (dest = new_string->string.pointer; *source; dest++, source++) {
*dest = (char)ACPI_TOUPPER(*source); *dest = (char)toupper((int)*source);
} }
acpi_ut_remove_reference(return_object); acpi_ut_remove_reference(return_object);
......
...@@ -292,8 +292,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info) ...@@ -292,8 +292,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
} else { } else {
/* Convert the character to uppercase and save it */ /* Convert the character to uppercase and save it */
result[i] = result[i] = (char)toupper((int)*external_name);
(char)ACPI_TOUPPER((int)*external_name);
external_name++; external_name++;
} }
} }
......
...@@ -696,7 +696,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, ...@@ -696,7 +696,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
return (AE_CTRL_DEPTH); return (AE_CTRL_DEPTH);
} }
no_match = ACPI_STRCMP(hid->string, info->hid); no_match = strcmp(hid->string, info->hid);
ACPI_FREE(hid); ACPI_FREE(hid);
if (no_match) { if (no_match) {
...@@ -715,8 +715,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, ...@@ -715,8 +715,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
found = FALSE; found = FALSE;
for (i = 0; i < cid->count; i++) { for (i = 0; i < cid->count; i++) {
if (ACPI_STRCMP(cid->ids[i].string, info->hid) if (strcmp(cid->ids[i].string, info->hid) == 0) {
== 0) {
/* Found a matching CID */ /* Found a matching CID */
......
...@@ -114,7 +114,7 @@ acpi_get_handle(acpi_handle parent, ...@@ -114,7 +114,7 @@ acpi_get_handle(acpi_handle parent,
/* Special case for root-only, since we can't search for it */ /* Special case for root-only, since we can't search for it */
if (!ACPI_STRCMP(pathname, ACPI_NS_ROOT_PATH)) { if (!strcmp(pathname, ACPI_NS_ROOT_PATH)) {
*ret_handle = *ret_handle =
ACPI_CAST_PTR(acpi_handle, acpi_gbl_root_node); ACPI_CAST_PTR(acpi_handle, acpi_gbl_root_node);
return (AE_OK); return (AE_OK);
...@@ -242,7 +242,7 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest, ...@@ -242,7 +242,7 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
/* Copy actual string and return a pointer to the next string area */ /* Copy actual string and return a pointer to the next string area */
ACPI_MEMCPY(string_area, source->string, source->length); memcpy(string_area, source->string, source->length);
return (string_area + source->length); return (string_area + source->length);
} }
...@@ -637,7 +637,7 @@ acpi_status acpi_install_method(u8 *buffer) ...@@ -637,7 +637,7 @@ acpi_status acpi_install_method(u8 *buffer)
/* Copy the method AML to the local buffer */ /* Copy the method AML to the local buffer */
ACPI_MEMCPY(aml_buffer, aml_start, aml_length); memcpy(aml_buffer, aml_start, aml_length);
/* Initialize the method object with the new method's information */ /* Initialize the method object with the new method's information */
......
...@@ -93,10 +93,9 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode) ...@@ -93,10 +93,9 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode)
op->common.descriptor_type = ACPI_DESC_TYPE_PARSER; op->common.descriptor_type = ACPI_DESC_TYPE_PARSER;
op->common.aml_opcode = opcode; op->common.aml_opcode = opcode;
ACPI_DISASM_ONLY_MEMBERS(ACPI_STRNCPY(op->common.aml_op_name, ACPI_DISASM_ONLY_MEMBERS(strncpy(op->common.aml_op_name,
(acpi_ps_get_opcode_info (acpi_ps_get_opcode_info(opcode))->
(opcode))->name, name, sizeof(op->common.aml_op_name)));
sizeof(op->common.aml_op_name)));
} }
/******************************************************************************* /*******************************************************************************
......
...@@ -353,13 +353,13 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, ...@@ -353,13 +353,13 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
/* +1 to include null terminator */ /* +1 to include null terminator */
user_prt->length += user_prt->length +=
(u32)ACPI_STRLEN(user_prt->source) + 1; (u32)strlen(user_prt->source) + 1;
break; break;
case ACPI_TYPE_STRING: case ACPI_TYPE_STRING:
ACPI_STRCPY(user_prt->source, strcpy(user_prt->source,
obj_desc->string.pointer); obj_desc->string.pointer);
/* /*
* Add to the Length field the length of the string * Add to the Length field the length of the string
......
...@@ -119,7 +119,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource, ...@@ -119,7 +119,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
/* /*
* Get the resource type and the initial (minimum) length * Get the resource type and the initial (minimum) length
*/ */
ACPI_MEMSET(resource, 0, INIT_RESOURCE_LENGTH(info)); memset(resource, 0, INIT_RESOURCE_LENGTH(info));
resource->type = INIT_RESOURCE_TYPE(info); resource->type = INIT_RESOURCE_TYPE(info);
resource->length = INIT_RESOURCE_LENGTH(info); resource->length = INIT_RESOURCE_LENGTH(info);
break; break;
...@@ -324,13 +324,13 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource, ...@@ -324,13 +324,13 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
case ACPI_RSC_SET8: case ACPI_RSC_SET8:
ACPI_MEMSET(destination, info->aml_offset, info->value); memset(destination, info->aml_offset, info->value);
break; break;
case ACPI_RSC_DATA8: case ACPI_RSC_DATA8:
target = ACPI_ADD_PTR(char, resource, info->value); target = ACPI_ADD_PTR(char, resource, info->value);
ACPI_MEMCPY(destination, source, ACPI_GET16(target)); memcpy(destination, source, ACPI_GET16(target));
break; break;
case ACPI_RSC_ADDRESS: case ACPI_RSC_ADDRESS:
...@@ -502,7 +502,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource, ...@@ -502,7 +502,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
switch (info->opcode) { switch (info->opcode) {
case ACPI_RSC_INITSET: case ACPI_RSC_INITSET:
ACPI_MEMSET(aml, 0, INIT_RESOURCE_LENGTH(info)); memset(aml, 0, INIT_RESOURCE_LENGTH(info));
aml_length = INIT_RESOURCE_LENGTH(info); aml_length = INIT_RESOURCE_LENGTH(info);
acpi_rs_set_resource_header(INIT_RESOURCE_TYPE(info), acpi_rs_set_resource_header(INIT_RESOURCE_TYPE(info),
aml_length, aml); aml_length, aml);
......
...@@ -148,7 +148,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type) ...@@ -148,7 +148,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
case ACPI_RSC_MOVE_SERIAL_VEN: case ACPI_RSC_MOVE_SERIAL_VEN:
case ACPI_RSC_MOVE_SERIAL_RES: case ACPI_RSC_MOVE_SERIAL_RES:
ACPI_MEMCPY(destination, source, item_count); memcpy(destination, source, item_count);
return; return;
/* /*
...@@ -364,12 +364,11 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length, ...@@ -364,12 +364,11 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
* Zero the entire area of the buffer. * Zero the entire area of the buffer.
*/ */
total_length = total_length =
(u32) (u32)strlen(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
1; 1;
total_length = (u32)ACPI_ROUND_UP_TO_NATIVE_WORD(total_length); total_length = (u32)ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
ACPI_MEMSET(resource_source->string_ptr, 0, total_length); memset(resource_source->string_ptr, 0, total_length);
/* Copy the resource_source string to the destination */ /* Copy the resource_source string to the destination */
...@@ -432,8 +431,8 @@ acpi_rs_set_resource_source(union aml_resource * aml, ...@@ -432,8 +431,8 @@ acpi_rs_set_resource_source(union aml_resource * aml,
/* Copy the resource_source string */ /* Copy the resource_source string */
ACPI_STRCPY(ACPI_CAST_PTR(char, &aml_resource_source[1]), strcpy(ACPI_CAST_PTR(char, &aml_resource_source[1]),
resource_source->string_ptr); resource_source->string_ptr);
/* /*
* Add the length of the string (+ 1 for null terminator) to the * Add the length of the string (+ 1 for null terminator) to the
......
...@@ -398,8 +398,8 @@ acpi_resource_to_address64(struct acpi_resource *resource, ...@@ -398,8 +398,8 @@ acpi_resource_to_address64(struct acpi_resource *resource,
/* Simple copy for 64 bit source */ /* Simple copy for 64 bit source */
ACPI_MEMCPY(out, &resource->data, memcpy(out, &resource->data,
sizeof(struct acpi_resource_address64)); sizeof(struct acpi_resource_address64));
break; break;
default: default:
...@@ -499,7 +499,7 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context) ...@@ -499,7 +499,7 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
*/ */
if ((vendor->byte_length < (ACPI_UUID_LENGTH + 1)) || if ((vendor->byte_length < (ACPI_UUID_LENGTH + 1)) ||
(vendor->uuid_subtype != info->uuid->subtype) || (vendor->uuid_subtype != info->uuid->subtype) ||
(ACPI_MEMCMP(vendor->uuid, info->uuid->data, ACPI_UUID_LENGTH))) { (memcmp(vendor->uuid, info->uuid->data, ACPI_UUID_LENGTH))) {
return (AE_OK); return (AE_OK);
} }
...@@ -513,7 +513,7 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context) ...@@ -513,7 +513,7 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
/* Found the correct resource, copy and return it */ /* Found the correct resource, copy and return it */
ACPI_MEMCPY(buffer->pointer, resource, resource->length); memcpy(buffer->pointer, resource, resource->length);
buffer->length = resource->length; buffer->length = resource->length;
/* Found the desired descriptor, terminate resource walk */ /* Found the desired descriptor, terminate resource walk */
......
...@@ -73,7 +73,7 @@ acpi_tb_init_table_descriptor(struct acpi_table_desc *table_desc, ...@@ -73,7 +73,7 @@ acpi_tb_init_table_descriptor(struct acpi_table_desc *table_desc,
* Initialize the table descriptor. Set the pointer to NULL, since the * Initialize the table descriptor. Set the pointer to NULL, since the
* table is not fully mapped at this time. * table is not fully mapped at this time.
*/ */
ACPI_MEMSET(table_desc, 0, sizeof(struct acpi_table_desc)); memset(table_desc, 0, sizeof(struct acpi_table_desc));
table_desc->address = address; table_desc->address = address;
table_desc->length = table->length; table_desc->length = table->length;
table_desc->flags = flags; table_desc->flags = flags;
...@@ -465,9 +465,9 @@ acpi_status acpi_tb_resize_root_table_list(void) ...@@ -465,9 +465,9 @@ acpi_status acpi_tb_resize_root_table_list(void)
/* Copy and free the previous table array */ /* Copy and free the previous table array */
if (acpi_gbl_root_table_list.tables) { if (acpi_gbl_root_table_list.tables) {
ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables, memcpy(tables, acpi_gbl_root_table_list.tables,
(acpi_size) table_count * (acpi_size) table_count *
sizeof(struct acpi_table_desc)); sizeof(struct acpi_table_desc));
if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) { if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
ACPI_FREE(acpi_gbl_root_table_list.tables); ACPI_FREE(acpi_gbl_root_table_list.tables);
......
...@@ -398,12 +398,12 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length) ...@@ -398,12 +398,12 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
/* Clear the entire local FADT */ /* Clear the entire local FADT */
ACPI_MEMSET(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt)); memset(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt));
/* Copy the original FADT, up to sizeof (struct acpi_table_fadt) */ /* Copy the original FADT, up to sizeof (struct acpi_table_fadt) */
ACPI_MEMCPY(&acpi_gbl_FADT, table, memcpy(&acpi_gbl_FADT, table,
ACPI_MIN(length, sizeof(struct acpi_table_fadt))); ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
/* Take a copy of the Hardware Reduced flag */ /* Take a copy of the Hardware Reduced flag */
......
...@@ -76,16 +76,16 @@ acpi_tb_find_table(char *signature, ...@@ -76,16 +76,16 @@ acpi_tb_find_table(char *signature,
/* Normalize the input strings */ /* Normalize the input strings */
ACPI_MEMSET(&header, 0, sizeof(struct acpi_table_header)); memset(&header, 0, sizeof(struct acpi_table_header));
ACPI_MOVE_NAME(header.signature, signature); ACPI_MOVE_NAME(header.signature, signature);
ACPI_STRNCPY(header.oem_id, oem_id, ACPI_OEM_ID_SIZE); strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
ACPI_STRNCPY(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE); strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
/* Search for the table */ /* Search for the table */
for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) { for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
if (ACPI_MEMCMP(&(acpi_gbl_root_table_list.tables[i].signature), if (memcmp(&(acpi_gbl_root_table_list.tables[i].signature),
header.signature, ACPI_NAME_SIZE)) { header.signature, ACPI_NAME_SIZE)) {
/* Not the requested table */ /* Not the requested table */
...@@ -112,21 +112,20 @@ acpi_tb_find_table(char *signature, ...@@ -112,21 +112,20 @@ acpi_tb_find_table(char *signature,
/* Check for table match on all IDs */ /* Check for table match on all IDs */
if (!ACPI_MEMCMP if (!memcmp
(acpi_gbl_root_table_list.tables[i].pointer->signature, (acpi_gbl_root_table_list.tables[i].pointer->signature,
header.signature, ACPI_NAME_SIZE) && (!oem_id[0] header.signature, ACPI_NAME_SIZE) && (!oem_id[0]
|| ||
!ACPI_MEMCMP !memcmp
(acpi_gbl_root_table_list. (acpi_gbl_root_table_list.
tables[i].pointer-> tables[i].pointer->
oem_id, oem_id,
header.oem_id, header.oem_id,
ACPI_OEM_ID_SIZE)) ACPI_OEM_ID_SIZE))
&& (!oem_table_id[0] && (!oem_table_id[0]
|| !ACPI_MEMCMP(acpi_gbl_root_table_list.tables[i]. || !memcmp(acpi_gbl_root_table_list.tables[i].pointer->
pointer->oem_table_id, oem_table_id, header.oem_table_id,
header.oem_table_id, ACPI_OEM_TABLE_ID_SIZE))) {
ACPI_OEM_TABLE_ID_SIZE))) {
*table_index = i; *table_index = i;
ACPI_DEBUG_PRINT((ACPI_DB_TABLES, ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
......
...@@ -87,8 +87,8 @@ acpi_tb_compare_tables(struct acpi_table_desc *table_desc, u32 table_index) ...@@ -87,8 +87,8 @@ acpi_tb_compare_tables(struct acpi_table_desc *table_desc, u32 table_index)
* not just the header. * not just the header.
*/ */
is_identical = (u8)((table_desc->length != table_length || is_identical = (u8)((table_desc->length != table_length ||
ACPI_MEMCMP(table_desc->pointer, table, memcmp(table_desc->pointer, table, table_length)) ?
table_length)) ? FALSE : TRUE); FALSE : TRUE);
/* Release the acquired table */ /* Release the acquired table */
...@@ -289,8 +289,7 @@ acpi_tb_install_standard_table(acpi_physical_address address, ...@@ -289,8 +289,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,
if ((new_table_desc.signature.ascii[0] != 0x00) && if ((new_table_desc.signature.ascii[0] != 0x00) &&
(!ACPI_COMPARE_NAME (!ACPI_COMPARE_NAME
(&new_table_desc.signature, ACPI_SIG_SSDT)) (&new_table_desc.signature, ACPI_SIG_SSDT))
&& (ACPI_STRNCMP(new_table_desc.signature.ascii, "OEM", 3))) && (strncmp(new_table_desc.signature.ascii, "OEM", 3))) {
{
ACPI_BIOS_ERROR((AE_INFO, ACPI_BIOS_ERROR((AE_INFO,
"Table has invalid signature [%4.4s] (0x%8.8X), " "Table has invalid signature [%4.4s] (0x%8.8X), "
"must be SSDT or OEMx", "must be SSDT or OEMx",
......
...@@ -73,7 +73,7 @@ static void acpi_tb_fix_string(char *string, acpi_size length) ...@@ -73,7 +73,7 @@ static void acpi_tb_fix_string(char *string, acpi_size length)
{ {
while (length && *string) { while (length && *string) {
if (!ACPI_IS_PRINT(*string)) { if (!isprint((int)*string)) {
*string = '?'; *string = '?';
} }
string++; string++;
...@@ -100,7 +100,7 @@ acpi_tb_cleanup_table_header(struct acpi_table_header *out_header, ...@@ -100,7 +100,7 @@ acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
struct acpi_table_header *header) struct acpi_table_header *header)
{ {
ACPI_MEMCPY(out_header, header, sizeof(struct acpi_table_header)); memcpy(out_header, header, sizeof(struct acpi_table_header));
acpi_tb_fix_string(out_header->signature, ACPI_NAME_SIZE); acpi_tb_fix_string(out_header->signature, ACPI_NAME_SIZE);
acpi_tb_fix_string(out_header->oem_id, ACPI_OEM_ID_SIZE); acpi_tb_fix_string(out_header->oem_id, ACPI_OEM_ID_SIZE);
...@@ -138,9 +138,9 @@ acpi_tb_print_table_header(acpi_physical_address address, ...@@ -138,9 +138,9 @@ acpi_tb_print_table_header(acpi_physical_address address,
/* RSDP has no common fields */ /* RSDP has no common fields */
ACPI_MEMCPY(local_header.oem_id, memcpy(local_header.oem_id,
ACPI_CAST_PTR(struct acpi_table_rsdp, ACPI_CAST_PTR(struct acpi_table_rsdp, header)->oem_id,
header)->oem_id, ACPI_OEM_ID_SIZE); ACPI_OEM_ID_SIZE);
acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE); acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);
ACPI_INFO((AE_INFO, "RSDP 0x%8.8X%8.8X %06X (v%.2d %-6.6s)", ACPI_INFO((AE_INFO, "RSDP 0x%8.8X%8.8X %06X (v%.2d %-6.6s)",
......
...@@ -188,7 +188,7 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index) ...@@ -188,7 +188,7 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
return (NULL); return (NULL);
} }
ACPI_MEMCPY(new_table, table_desc->pointer, table_desc->length); memcpy(new_table, table_desc->pointer, table_desc->length);
acpi_tb_uninstall_table(table_desc); acpi_tb_uninstall_table(table_desc);
acpi_tb_init_table_descriptor(&acpi_gbl_root_table_list. acpi_tb_init_table_descriptor(&acpi_gbl_root_table_list.
......
...@@ -119,9 +119,9 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array, ...@@ -119,9 +119,9 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
} else { } else {
/* Root Table Array has been statically allocated by the host */ /* Root Table Array has been statically allocated by the host */
ACPI_MEMSET(initial_table_array, 0, memset(initial_table_array, 0,
(acpi_size) initial_table_count * (acpi_size) initial_table_count *
sizeof(struct acpi_table_desc)); sizeof(struct acpi_table_desc));
acpi_gbl_root_table_list.tables = initial_table_array; acpi_gbl_root_table_list.tables = initial_table_array;
acpi_gbl_root_table_list.max_table_count = initial_table_count; acpi_gbl_root_table_list.max_table_count = initial_table_count;
...@@ -243,8 +243,8 @@ acpi_get_table_header(char *signature, ...@@ -243,8 +243,8 @@ acpi_get_table_header(char *signature,
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
ACPI_MEMCPY(out_table_header, header, memcpy(out_table_header, header,
sizeof(struct acpi_table_header)); sizeof(struct acpi_table_header));
acpi_os_unmap_memory(header, acpi_os_unmap_memory(header,
sizeof(struct sizeof(struct
acpi_table_header)); acpi_table_header));
...@@ -252,9 +252,9 @@ acpi_get_table_header(char *signature, ...@@ -252,9 +252,9 @@ acpi_get_table_header(char *signature,
return (AE_NOT_FOUND); return (AE_NOT_FOUND);
} }
} else { } else {
ACPI_MEMCPY(out_table_header, memcpy(out_table_header,
acpi_gbl_root_table_list.tables[i].pointer, acpi_gbl_root_table_list.tables[i].pointer,
sizeof(struct acpi_table_header)); sizeof(struct acpi_table_header));
} }
return (AE_OK); return (AE_OK);
} }
......
...@@ -150,8 +150,8 @@ static acpi_status acpi_tb_load_namespace(void) ...@@ -150,8 +150,8 @@ static acpi_status acpi_tb_load_namespace(void)
* Save the original DSDT header for detection of table corruption * Save the original DSDT header for detection of table corruption
* and/or replacement of the DSDT from outside the OS. * and/or replacement of the DSDT from outside the OS.
*/ */
ACPI_MEMCPY(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT, memcpy(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT,
sizeof(struct acpi_table_header)); sizeof(struct acpi_table_header));
(void)acpi_ut_release_mutex(ACPI_MTX_TABLES); (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
......
...@@ -73,7 +73,7 @@ void *acpi_os_allocate_zeroed(acpi_size size) ...@@ -73,7 +73,7 @@ void *acpi_os_allocate_zeroed(acpi_size size)
/* Clear the memory block */ /* Clear the memory block */
ACPI_MEMSET(allocation, 0, size); memset(allocation, 0, size);
} }
return (allocation); return (allocation);
...@@ -181,7 +181,7 @@ acpi_status acpi_ut_delete_caches(void) ...@@ -181,7 +181,7 @@ acpi_status acpi_ut_delete_caches(void)
char buffer[7]; char buffer[7];
if (acpi_gbl_display_final_mem_stats) { if (acpi_gbl_display_final_mem_stats) {
ACPI_STRCPY(buffer, "MEMORY"); strcpy(buffer, "MEMORY");
(void)acpi_db_display_statistics(buffer); (void)acpi_db_display_statistics(buffer);
} }
#endif #endif
...@@ -337,6 +337,6 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer, ...@@ -337,6 +337,6 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
/* Have a valid buffer, clear it */ /* Have a valid buffer, clear it */
ACPI_MEMSET(buffer->pointer, 0, required_length); memset(buffer->pointer, 0, required_length);
return (AE_OK); return (AE_OK);
} }
...@@ -159,7 +159,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset) ...@@ -159,7 +159,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
} }
buf_char = buffer[(acpi_size) i + j]; buf_char = buffer[(acpi_size) i + j];
if (ACPI_IS_PRINT(buf_char)) { if (isprint(buf_char)) {
acpi_os_printf("%c", buf_char); acpi_os_printf("%c", buf_char);
} else { } else {
acpi_os_printf("."); acpi_os_printf(".");
...@@ -319,7 +319,7 @@ acpi_ut_dump_buffer_to_file(ACPI_FILE file, ...@@ -319,7 +319,7 @@ acpi_ut_dump_buffer_to_file(ACPI_FILE file,
} }
buf_char = buffer[(acpi_size) i + j]; buf_char = buffer[(acpi_size) i + j];
if (ACPI_IS_PRINT(buf_char)) { if (isprint(buf_char)) {
acpi_ut_file_printf(file, "%c", buf_char); acpi_ut_file_printf(file, "%c", buf_char);
} else { } else {
acpi_ut_file_printf(file, "."); acpi_ut_file_printf(file, ".");
......
...@@ -84,7 +84,7 @@ acpi_os_create_cache(char *cache_name, ...@@ -84,7 +84,7 @@ acpi_os_create_cache(char *cache_name,
/* Populate the cache object and return it */ /* Populate the cache object and return it */
ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list)); memset(cache, 0, sizeof(struct acpi_memory_list));
cache->list_name = cache_name; cache->list_name = cache_name;
cache->object_size = object_size; cache->object_size = object_size;
cache->max_depth = max_depth; cache->max_depth = max_depth;
...@@ -212,7 +212,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object) ...@@ -212,7 +212,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object)
/* Mark the object as cached */ /* Mark the object as cached */
ACPI_MEMSET(object, 0xCA, cache->object_size); memset(object, 0xCA, cache->object_size);
ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_CACHED); ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_CACHED);
/* Put the object at the head of the cache list */ /* Put the object at the head of the cache list */
...@@ -281,7 +281,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache) ...@@ -281,7 +281,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
/* Clear (zero) the previously used Object */ /* Clear (zero) the previously used Object */
ACPI_MEMSET(object, 0, cache->object_size); memset(object, 0, cache->object_size);
} else { } else {
/* The cache is empty, create a new object */ /* The cache is empty, create a new object */
......
...@@ -129,7 +129,7 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object, ...@@ -129,7 +129,7 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
/* Always clear the external object */ /* Always clear the external object */
ACPI_MEMSET(external_object, 0, sizeof(union acpi_object)); memset(external_object, 0, sizeof(union acpi_object));
/* /*
* In general, the external object will be the same type as * In general, the external object will be the same type as
...@@ -149,9 +149,9 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object, ...@@ -149,9 +149,9 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
string. string.
length + 1); length + 1);
ACPI_MEMCPY((void *)data_space, memcpy((void *)data_space,
(void *)internal_object->string.pointer, (void *)internal_object->string.pointer,
(acpi_size) internal_object->string.length + 1); (acpi_size) internal_object->string.length + 1);
break; break;
case ACPI_TYPE_BUFFER: case ACPI_TYPE_BUFFER:
...@@ -162,9 +162,9 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object, ...@@ -162,9 +162,9 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
ACPI_ROUND_UP_TO_NATIVE_WORD(internal_object->string. ACPI_ROUND_UP_TO_NATIVE_WORD(internal_object->string.
length); length);
ACPI_MEMCPY((void *)data_space, memcpy((void *)data_space,
(void *)internal_object->buffer.pointer, (void *)internal_object->buffer.pointer,
internal_object->buffer.length); internal_object->buffer.length);
break; break;
case ACPI_TYPE_INTEGER: case ACPI_TYPE_INTEGER:
...@@ -502,9 +502,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object, ...@@ -502,9 +502,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
goto error_exit; goto error_exit;
} }
ACPI_MEMCPY(internal_object->string.pointer, memcpy(internal_object->string.pointer,
external_object->string.pointer, external_object->string.pointer,
external_object->string.length); external_object->string.length);
internal_object->string.length = external_object->string.length; internal_object->string.length = external_object->string.length;
break; break;
...@@ -517,9 +517,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object, ...@@ -517,9 +517,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
goto error_exit; goto error_exit;
} }
ACPI_MEMCPY(internal_object->buffer.pointer, memcpy(internal_object->buffer.pointer,
external_object->buffer.pointer, external_object->buffer.pointer,
external_object->buffer.length); external_object->buffer.length);
internal_object->buffer.length = external_object->buffer.length; internal_object->buffer.length = external_object->buffer.length;
...@@ -694,8 +694,8 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc, ...@@ -694,8 +694,8 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
copy_size = sizeof(struct acpi_namespace_node); copy_size = sizeof(struct acpi_namespace_node);
} }
ACPI_MEMCPY(ACPI_CAST_PTR(char, dest_desc), memcpy(ACPI_CAST_PTR(char, dest_desc),
ACPI_CAST_PTR(char, source_desc), copy_size); ACPI_CAST_PTR(char, source_desc), copy_size);
/* Restore the saved fields */ /* Restore the saved fields */
...@@ -725,9 +725,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc, ...@@ -725,9 +725,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
/* Copy the actual buffer data */ /* Copy the actual buffer data */
ACPI_MEMCPY(dest_desc->buffer.pointer, memcpy(dest_desc->buffer.pointer,
source_desc->buffer.pointer, source_desc->buffer.pointer,
source_desc->buffer.length); source_desc->buffer.length);
} }
break; break;
...@@ -747,9 +747,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc, ...@@ -747,9 +747,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
/* Copy the actual string data */ /* Copy the actual string data */
ACPI_MEMCPY(dest_desc->string.pointer, memcpy(dest_desc->string.pointer,
source_desc->string.pointer, source_desc->string.pointer,
(acpi_size) source_desc->string.length + 1); (acpi_size) source_desc->string.length + 1);
} }
break; break;
......
...@@ -111,7 +111,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node, ...@@ -111,7 +111,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
if (obj_desc->common.type == ACPI_TYPE_INTEGER) { if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
acpi_ex_eisa_id_to_string(hid->string, obj_desc->integer.value); acpi_ex_eisa_id_to_string(hid->string, obj_desc->integer.value);
} else { } else {
ACPI_STRCPY(hid->string, obj_desc->string.pointer); strcpy(hid->string, obj_desc->string.pointer);
} }
hid->length = length; hid->length = length;
...@@ -180,7 +180,7 @@ acpi_ut_execute_SUB(struct acpi_namespace_node *device_node, ...@@ -180,7 +180,7 @@ acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
/* Simply copy existing string */ /* Simply copy existing string */
ACPI_STRCPY(sub->string, obj_desc->string.pointer); strcpy(sub->string, obj_desc->string.pointer);
sub->length = length; sub->length = length;
*return_id = sub; *return_id = sub;
...@@ -256,7 +256,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node, ...@@ -256,7 +256,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
if (obj_desc->common.type == ACPI_TYPE_INTEGER) { if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
acpi_ex_integer_to_string(uid->string, obj_desc->integer.value); acpi_ex_integer_to_string(uid->string, obj_desc->integer.value);
} else { } else {
ACPI_STRCPY(uid->string, obj_desc->string.pointer); strcpy(uid->string, obj_desc->string.pointer);
} }
uid->length = length; uid->length = length;
...@@ -393,8 +393,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node, ...@@ -393,8 +393,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
/* Copy the String CID from the returned object */ /* Copy the String CID from the returned object */
ACPI_STRCPY(next_id_string, strcpy(next_id_string, cid_objects[i]->string.pointer);
cid_objects[i]->string.pointer);
length = cid_objects[i]->string.length + 1; length = cid_objects[i]->string.length + 1;
} }
......
...@@ -66,9 +66,9 @@ u8 acpi_ut_is_pci_root_bridge(char *id) ...@@ -66,9 +66,9 @@ u8 acpi_ut_is_pci_root_bridge(char *id)
* Check if this is a PCI root bridge. * Check if this is a PCI root bridge.
* ACPI 3.0+: check for a PCI Express root also. * ACPI 3.0+: check for a PCI Express root also.
*/ */
if (!(ACPI_STRCMP(id, if (!(strcmp(id,
PCI_ROOT_HID_STRING)) || PCI_ROOT_HID_STRING)) ||
!(ACPI_STRCMP(id, PCI_EXPRESS_ROOT_HID_STRING))) { !(strcmp(id, PCI_EXPRESS_ROOT_HID_STRING))) {
return (TRUE); return (TRUE);
} }
......
...@@ -232,8 +232,7 @@ acpi_status acpi_ut_install_interface(acpi_string interface_name) ...@@ -232,8 +232,7 @@ acpi_status acpi_ut_install_interface(acpi_string interface_name)
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
interface_info->name = interface_info->name = ACPI_ALLOCATE_ZEROED(strlen(interface_name) + 1);
ACPI_ALLOCATE_ZEROED(ACPI_STRLEN(interface_name) + 1);
if (!interface_info->name) { if (!interface_info->name) {
ACPI_FREE(interface_info); ACPI_FREE(interface_info);
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
...@@ -241,7 +240,7 @@ acpi_status acpi_ut_install_interface(acpi_string interface_name) ...@@ -241,7 +240,7 @@ acpi_status acpi_ut_install_interface(acpi_string interface_name)
/* Initialize new info and insert at the head of the global list */ /* Initialize new info and insert at the head of the global list */
ACPI_STRCPY(interface_info->name, interface_name); strcpy(interface_info->name, interface_name);
interface_info->flags = ACPI_OSI_DYNAMIC; interface_info->flags = ACPI_OSI_DYNAMIC;
interface_info->next = acpi_gbl_supported_interfaces; interface_info->next = acpi_gbl_supported_interfaces;
...@@ -269,7 +268,7 @@ acpi_status acpi_ut_remove_interface(acpi_string interface_name) ...@@ -269,7 +268,7 @@ acpi_status acpi_ut_remove_interface(acpi_string interface_name)
previous_interface = next_interface = acpi_gbl_supported_interfaces; previous_interface = next_interface = acpi_gbl_supported_interfaces;
while (next_interface) { while (next_interface) {
if (!ACPI_STRCMP(interface_name, next_interface->name)) { if (!strcmp(interface_name, next_interface->name)) {
/* Found: name is in either the static list or was added at runtime */ /* Found: name is in either the static list or was added at runtime */
...@@ -373,7 +372,7 @@ struct acpi_interface_info *acpi_ut_get_interface(acpi_string interface_name) ...@@ -373,7 +372,7 @@ struct acpi_interface_info *acpi_ut_get_interface(acpi_string interface_name)
next_interface = acpi_gbl_supported_interfaces; next_interface = acpi_gbl_supported_interfaces;
while (next_interface) { while (next_interface) {
if (!ACPI_STRCMP(interface_name, next_interface->name)) { if (!strcmp(interface_name, next_interface->name)) {
return (next_interface); return (next_interface);
} }
......
...@@ -148,7 +148,7 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes) ...@@ -148,7 +148,7 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
u32 j; u32 j;
if (!expected_btypes) { if (!expected_btypes) {
ACPI_STRCPY(buffer, "NONE"); strcpy(buffer, "NONE");
return; return;
} }
...@@ -161,7 +161,7 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes) ...@@ -161,7 +161,7 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
/* If one of the expected types, concatenate the name of this type */ /* If one of the expected types, concatenate the name of this type */
if (expected_btypes & this_rtype) { if (expected_btypes & this_rtype) {
ACPI_STRCAT(buffer, &ut_rtype_names[i][j]); strcat(buffer, &ut_rtype_names[i][j]);
j = 0; /* Use name separator from now on */ j = 0; /* Use name separator from now on */
} }
......
...@@ -180,7 +180,7 @@ const char *acpi_ut_scan_number(const char *string, u64 *number_ptr) ...@@ -180,7 +180,7 @@ const char *acpi_ut_scan_number(const char *string, u64 *number_ptr)
{ {
u64 number = 0; u64 number = 0;
while (ACPI_IS_DIGIT(*string)) { while (isdigit((int)*string)) {
number *= 10; number *= 10;
number += *(string++) - '0'; number += *(string++) - '0';
} }
...@@ -405,7 +405,7 @@ acpi_ut_vsnprintf(char *string, ...@@ -405,7 +405,7 @@ acpi_ut_vsnprintf(char *string,
/* Process width */ /* Process width */
width = -1; width = -1;
if (ACPI_IS_DIGIT(*format)) { if (isdigit((int)*format)) {
format = acpi_ut_scan_number(format, &number); format = acpi_ut_scan_number(format, &number);
width = (s32) number; width = (s32) number;
} else if (*format == '*') { } else if (*format == '*') {
...@@ -422,7 +422,7 @@ acpi_ut_vsnprintf(char *string, ...@@ -422,7 +422,7 @@ acpi_ut_vsnprintf(char *string,
precision = -1; precision = -1;
if (*format == '.') { if (*format == '.') {
++format; ++format;
if (ACPI_IS_DIGIT(*format)) { if (isdigit((int)*format)) {
format = acpi_ut_scan_number(format, &number); format = acpi_ut_scan_number(format, &number);
precision = (s32) number; precision = (s32) number;
} else if (*format == '*') { } else if (*format == '*') {
......
...@@ -79,7 +79,7 @@ void acpi_ut_strlwr(char *src_string) ...@@ -79,7 +79,7 @@ void acpi_ut_strlwr(char *src_string)
/* Walk entire string, lowercasing the letters */ /* Walk entire string, lowercasing the letters */
for (string = src_string; *string; string++) { for (string = src_string; *string; string++) {
*string = (char)ACPI_TOLOWER(*string); *string = (char)tolower((int)*string);
} }
return; return;
...@@ -145,7 +145,7 @@ void acpi_ut_strupr(char *src_string) ...@@ -145,7 +145,7 @@ void acpi_ut_strupr(char *src_string)
/* Walk entire string, uppercasing the letters */ /* Walk entire string, uppercasing the letters */
for (string = src_string; *string; string++) { for (string = src_string; *string; string++) {
*string = (char)ACPI_TOUPPER(*string); *string = (char)toupper((int)*string);
} }
return; return;
...@@ -202,7 +202,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer) ...@@ -202,7 +202,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
/* Skip over any white space in the buffer */ /* Skip over any white space in the buffer */
while ((*string) && (ACPI_IS_SPACE(*string) || *string == '\t')) { while ((*string) && (isspace((int)*string) || *string == '\t')) {
string++; string++;
} }
...@@ -211,7 +211,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer) ...@@ -211,7 +211,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
* Base equal to ACPI_ANY_BASE means 'ToInteger operation case'. * Base equal to ACPI_ANY_BASE means 'ToInteger operation case'.
* We need to determine if it is decimal or hexadecimal. * We need to determine if it is decimal or hexadecimal.
*/ */
if ((*string == '0') && (ACPI_TOLOWER(*(string + 1)) == 'x')) { if ((*string == '0') && (tolower((int)*(string + 1)) == 'x')) {
sign_of0x = 1; sign_of0x = 1;
base = 16; base = 16;
...@@ -224,7 +224,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer) ...@@ -224,7 +224,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
/* Any string left? Check that '0x' is not followed by white space. */ /* Any string left? Check that '0x' is not followed by white space. */
if (!(*string) || ACPI_IS_SPACE(*string) || *string == '\t') { if (!(*string) || isspace((int)*string) || *string == '\t') {
if (to_integer_op) { if (to_integer_op) {
goto error_exit; goto error_exit;
} else { } else {
...@@ -241,7 +241,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer) ...@@ -241,7 +241,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
/* Main loop: convert the string to a 32- or 64-bit integer */ /* Main loop: convert the string to a 32- or 64-bit integer */
while (*string) { while (*string) {
if (ACPI_IS_DIGIT(*string)) { if (isdigit((int)*string)) {
/* Convert ASCII 0-9 to Decimal value */ /* Convert ASCII 0-9 to Decimal value */
...@@ -252,8 +252,8 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer) ...@@ -252,8 +252,8 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
term = 1; term = 1;
} else { } else {
this_digit = (u8)ACPI_TOUPPER(*string); this_digit = (u8)toupper((int)*string);
if (ACPI_IS_XDIGIT((char)this_digit)) { if (isxdigit((int)this_digit)) {
/* Convert ASCII Hex char to value */ /* Convert ASCII Hex char to value */
...@@ -404,7 +404,7 @@ void acpi_ut_print_string(char *string, u16 max_length) ...@@ -404,7 +404,7 @@ void acpi_ut_print_string(char *string, u16 max_length)
/* Check for printable character or hex escape */ /* Check for printable character or hex escape */
if (ACPI_IS_PRINT(string[i])) { if (isprint((int)string[i])) {
/* This is a normal character */ /* This is a normal character */
acpi_os_printf("%c", (int)string[i]); acpi_os_printf("%c", (int)string[i]);
...@@ -609,22 +609,22 @@ void ut_convert_backslashes(char *pathname) ...@@ -609,22 +609,22 @@ void ut_convert_backslashes(char *pathname)
u8 acpi_ut_safe_strcpy(char *dest, acpi_size dest_size, char *source) u8 acpi_ut_safe_strcpy(char *dest, acpi_size dest_size, char *source)
{ {
if (ACPI_STRLEN(source) >= dest_size) { if (strlen(source) >= dest_size) {
return (TRUE); return (TRUE);
} }
ACPI_STRCPY(dest, source); strcpy(dest, source);
return (FALSE); return (FALSE);
} }
u8 acpi_ut_safe_strcat(char *dest, acpi_size dest_size, char *source) u8 acpi_ut_safe_strcat(char *dest, acpi_size dest_size, char *source)
{ {
if ((ACPI_STRLEN(dest) + ACPI_STRLEN(source)) >= dest_size) { if ((strlen(dest) + strlen(source)) >= dest_size) {
return (TRUE); return (TRUE);
} }
ACPI_STRCAT(dest, source); strcat(dest, source);
return (FALSE); return (FALSE);
} }
...@@ -635,14 +635,13 @@ acpi_ut_safe_strncat(char *dest, ...@@ -635,14 +635,13 @@ acpi_ut_safe_strncat(char *dest,
{ {
acpi_size actual_transfer_length; acpi_size actual_transfer_length;
actual_transfer_length = actual_transfer_length = ACPI_MIN(max_transfer_length, strlen(source));
ACPI_MIN(max_transfer_length, ACPI_STRLEN(source));
if ((ACPI_STRLEN(dest) + actual_transfer_length) >= dest_size) { if ((strlen(dest) + actual_transfer_length) >= dest_size) {
return (TRUE); return (TRUE);
} }
ACPI_STRNCAT(dest, source, max_transfer_length); strncat(dest, source, max_transfer_length);
return (FALSE); return (FALSE);
} }
#endif #endif
...@@ -100,7 +100,7 @@ acpi_ut_create_list(char *list_name, ...@@ -100,7 +100,7 @@ acpi_ut_create_list(char *list_name,
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list)); memset(cache, 0, sizeof(struct acpi_memory_list));
cache->list_name = list_name; cache->list_name = list_name;
cache->object_size = object_size; cache->object_size = object_size;
...@@ -402,7 +402,7 @@ acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation, ...@@ -402,7 +402,7 @@ acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
allocation->component = component; allocation->component = component;
allocation->line = line; allocation->line = line;
ACPI_STRNCPY(allocation->module, module, ACPI_MAX_MODULE_NAME); strncpy(allocation->module, module, ACPI_MAX_MODULE_NAME);
allocation->module[ACPI_MAX_MODULE_NAME - 1] = 0; allocation->module[ACPI_MAX_MODULE_NAME - 1] = 0;
if (!element) { if (!element) {
...@@ -497,7 +497,7 @@ acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation, ...@@ -497,7 +497,7 @@ acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
/* Mark the segment as deleted */ /* Mark the segment as deleted */
ACPI_MEMSET(&allocation->user_space, 0xEA, allocation->size); memset(&allocation->user_space, 0xEA, allocation->size);
status = acpi_ut_release_mutex(ACPI_MTX_MEMORY); status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
return (status); return (status);
...@@ -595,7 +595,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module) ...@@ -595,7 +595,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
while (element) { while (element) {
if ((element->component & component) && if ((element->component & component) &&
((module == NULL) ((module == NULL)
|| (0 == ACPI_STRCMP(module, element->module)))) { || (0 == strcmp(module, element->module)))) {
descriptor = descriptor =
ACPI_CAST_PTR(union acpi_descriptor, ACPI_CAST_PTR(union acpi_descriptor,
&element->user_space); &element->user_space);
......
...@@ -234,8 +234,8 @@ acpi_status acpi_get_statistics(struct acpi_statistics *stats) ...@@ -234,8 +234,8 @@ acpi_status acpi_get_statistics(struct acpi_statistics *stats)
stats->sci_count = acpi_sci_count; stats->sci_count = acpi_sci_count;
stats->gpe_count = acpi_gpe_count; stats->gpe_count = acpi_gpe_count;
ACPI_MEMCPY(stats->fixed_event_count, acpi_fixed_event_count, memcpy(stats->fixed_event_count, acpi_fixed_event_count,
sizeof(acpi_fixed_event_count)); sizeof(acpi_fixed_event_count));
/* Other counters */ /* Other counters */
...@@ -322,7 +322,7 @@ acpi_status acpi_install_interface(acpi_string interface_name) ...@@ -322,7 +322,7 @@ acpi_status acpi_install_interface(acpi_string interface_name)
/* Parameter validation */ /* Parameter validation */
if (!interface_name || (ACPI_STRLEN(interface_name) == 0)) { if (!interface_name || (strlen(interface_name) == 0)) {
return (AE_BAD_PARAMETER); return (AE_BAD_PARAMETER);
} }
...@@ -374,7 +374,7 @@ acpi_status acpi_remove_interface(acpi_string interface_name) ...@@ -374,7 +374,7 @@ acpi_status acpi_remove_interface(acpi_string interface_name)
/* Parameter validation */ /* Parameter validation */
if (!interface_name || (ACPI_STRLEN(interface_name) == 0)) { if (!interface_name || (strlen(interface_name) == 0)) {
return (AE_BAD_PARAMETER); return (AE_BAD_PARAMETER);
} }
......
...@@ -542,14 +542,14 @@ typedef u64 acpi_integer; ...@@ -542,14 +542,14 @@ typedef u64 acpi_integer;
#define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (u32, (a)) == *ACPI_CAST_PTR (u32, (b))) #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_MOVE_NAME(dest,src) (*ACPI_CAST_PTR (u32, (dest)) = *ACPI_CAST_PTR (u32, (src)))
#else #else
#define ACPI_COMPARE_NAME(a,b) (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE)) #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) (ACPI_STRNCPY (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE)) #define ACPI_MOVE_NAME(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))
#endif #endif
/* Support for the special RSDP signature (8 characters) */ /* Support for the special RSDP signature (8 characters) */
#define ACPI_VALIDATE_RSDP_SIG(a) (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8)) #define ACPI_VALIDATE_RSDP_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8))
#define ACPI_MAKE_RSDP_SIG(dest) (ACPI_MEMCPY (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8)) #define ACPI_MAKE_RSDP_SIG(dest) (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8))
/******************************************************************************* /*******************************************************************************
* *
......
...@@ -346,28 +346,6 @@ ...@@ -346,28 +346,6 @@
/* We will be linking to the standard Clib functions */ /* We will be linking to the standard Clib functions */
#define ACPI_STRSTR(s1,s2) strstr((s1), (s2))
#define ACPI_STRCHR(s1,c) strchr((s1), (c))
#define ACPI_STRLEN(s) (acpi_size) strlen((s))
#define ACPI_STRCPY(d,s) (void) strcpy((d), (s))
#define ACPI_STRNCPY(d,s,n) (void) strncpy((d), (s), (acpi_size)(n))
#define ACPI_STRNCMP(d,s,n) strncmp((d), (s), (acpi_size)(n))
#define ACPI_STRCMP(d,s) strcmp((d), (s))
#define ACPI_STRCAT(d,s) (void) strcat((d), (s))
#define ACPI_STRNCAT(d,s,n) strncat((d), (s), (acpi_size)(n))
#define ACPI_STRTOUL(d,s,n) strtoul((d), (s), (acpi_size)(n))
#define ACPI_MEMCMP(s1,s2,n) memcmp((const char *)(s1), (const char *)(s2), (acpi_size)(n))
#define ACPI_MEMCPY(d,s,n) (void) memcpy((d), (s), (acpi_size)(n))
#define ACPI_MEMSET(d,s,n) (void) memset((d), (s), (acpi_size)(n))
#define ACPI_TOUPPER(i) toupper((int) (i))
#define ACPI_TOLOWER(i) tolower((int) (i))
#define ACPI_IS_XDIGIT(i) isxdigit((int) (i))
#define ACPI_IS_DIGIT(i) isdigit((int) (i))
#define ACPI_IS_SPACE(i) isspace((int) (i))
#define ACPI_IS_UPPER(i) isupper((int) (i))
#define ACPI_IS_PRINT(i) isprint((int) (i))
#define ACPI_IS_ALPHA(i) isalpha((int) (i))
#else #else
/****************************************************************************** /******************************************************************************
...@@ -405,22 +383,6 @@ typedef char *va_list; ...@@ -405,22 +383,6 @@ typedef char *va_list;
/* Use the local (ACPICA) definitions of the clib functions */ /* Use the local (ACPICA) definitions of the clib functions */
#define ACPI_STRSTR(s1,s2) acpi_ut_strstr ((s1), (s2))
#define ACPI_STRCHR(s1,c) acpi_ut_strchr ((s1), (c))
#define ACPI_STRLEN(s) (acpi_size) acpi_ut_strlen ((s))
#define ACPI_STRCPY(d,s) (void) acpi_ut_strcpy ((d), (s))
#define ACPI_STRNCPY(d,s,n) (void) acpi_ut_strncpy ((d), (s), (acpi_size)(n))
#define ACPI_STRNCMP(d,s,n) acpi_ut_strncmp ((d), (s), (acpi_size)(n))
#define ACPI_STRCMP(d,s) acpi_ut_strcmp ((d), (s))
#define ACPI_STRCAT(d,s) (void) acpi_ut_strcat ((d), (s))
#define ACPI_STRNCAT(d,s,n) acpi_ut_strncat ((d), (s), (acpi_size)(n))
#define ACPI_STRTOUL(d,s,n) acpi_ut_strtoul ((d), (s), (acpi_size)(n))
#define ACPI_MEMCMP(s1,s2,n) acpi_ut_memcmp((const char *)(s1), (const char *)(s2), (acpi_size)(n))
#define ACPI_MEMCPY(d,s,n) (void) acpi_ut_memcpy ((d), (s), (acpi_size)(n))
#define ACPI_MEMSET(d,v,n) (void) acpi_ut_memset ((d), (v), (acpi_size)(n))
#define ACPI_TOUPPER(c) acpi_ut_to_upper ((int) (c))
#define ACPI_TOLOWER(c) acpi_ut_to_lower ((int) (c))
#endif /* ACPI_USE_SYSTEM_CLIBRARY */ #endif /* ACPI_USE_SYSTEM_CLIBRARY */
#ifndef ACPI_FILE #ifndef ACPI_FILE
......
...@@ -127,7 +127,7 @@ int acpi_getopt(int argc, char **argv, char *opts) ...@@ -127,7 +127,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
argv[acpi_gbl_optind][0] != '-' || argv[acpi_gbl_optind][0] != '-' ||
argv[acpi_gbl_optind][1] == '\0') { argv[acpi_gbl_optind][1] == '\0') {
return (ACPI_OPT_END); return (ACPI_OPT_END);
} else if (ACPI_STRCMP(argv[acpi_gbl_optind], "--") == 0) { } else if (strcmp(argv[acpi_gbl_optind], "--") == 0) {
acpi_gbl_optind++; acpi_gbl_optind++;
return (ACPI_OPT_END); return (ACPI_OPT_END);
} }
...@@ -140,7 +140,7 @@ int acpi_getopt(int argc, char **argv, char *opts) ...@@ -140,7 +140,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
/* Make sure that the option is legal */ /* Make sure that the option is legal */
if (current_char == ':' || if (current_char == ':' ||
(opts_ptr = ACPI_STRCHR(opts, current_char)) == NULL) { (opts_ptr = strchr(opts, current_char)) == NULL) {
ACPI_OPTION_ERROR("Illegal option: -", current_char); ACPI_OPTION_ERROR("Illegal option: -", current_char);
if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') { if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') {
......
...@@ -222,7 +222,7 @@ acpi_os_get_table_by_address(acpi_physical_address address, ...@@ -222,7 +222,7 @@ acpi_os_get_table_by_address(acpi_physical_address address,
goto exit; goto exit;
} }
ACPI_MEMCPY(local_table, mapped_table, table_length); memcpy(local_table, mapped_table, table_length);
exit: exit:
osl_unmap_table(mapped_table); osl_unmap_table(mapped_table);
...@@ -531,7 +531,7 @@ static acpi_status osl_load_rsdp(void) ...@@ -531,7 +531,7 @@ static acpi_status osl_load_rsdp(void)
gbl_rsdp_address = gbl_rsdp_address =
rsdp_base + (ACPI_CAST8(mapped_table) - rsdp_address); rsdp_base + (ACPI_CAST8(mapped_table) - rsdp_address);
ACPI_MEMCPY(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp)); memcpy(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp));
acpi_os_unmap_memory(rsdp_address, rsdp_size); acpi_os_unmap_memory(rsdp_address, rsdp_size);
return (AE_OK); return (AE_OK);
...@@ -964,7 +964,7 @@ osl_get_bios_table(char *signature, ...@@ -964,7 +964,7 @@ osl_get_bios_table(char *signature,
goto exit; goto exit;
} }
ACPI_MEMCPY(local_table, mapped_table, table_length); memcpy(local_table, mapped_table, table_length);
*address = table_address; *address = table_address;
*table = local_table; *table = local_table;
......
...@@ -329,7 +329,7 @@ int ap_dump_table_by_name(char *signature) ...@@ -329,7 +329,7 @@ int ap_dump_table_by_name(char *signature)
acpi_status status; acpi_status status;
int table_status; int table_status;
if (ACPI_STRLEN(signature) != ACPI_NAME_SIZE) { if (strlen(signature) != ACPI_NAME_SIZE) {
acpi_log_error acpi_log_error
("Invalid table signature [%s]: must be exactly 4 characters\n", ("Invalid table signature [%s]: must be exactly 4 characters\n",
signature); signature);
...@@ -338,15 +338,15 @@ int ap_dump_table_by_name(char *signature) ...@@ -338,15 +338,15 @@ int ap_dump_table_by_name(char *signature)
/* Table signatures are expected to be uppercase */ /* Table signatures are expected to be uppercase */
ACPI_STRCPY(local_signature, signature); strcpy(local_signature, signature);
acpi_ut_strupr(local_signature); acpi_ut_strupr(local_signature);
/* To be friendly, handle tables whose signatures do not match the name */ /* To be friendly, handle tables whose signatures do not match the name */
if (ACPI_COMPARE_NAME(local_signature, "FADT")) { if (ACPI_COMPARE_NAME(local_signature, "FADT")) {
ACPI_STRCPY(local_signature, ACPI_SIG_FADT); strcpy(local_signature, ACPI_SIG_FADT);
} else if (ACPI_COMPARE_NAME(local_signature, "MADT")) { } else if (ACPI_COMPARE_NAME(local_signature, "MADT")) {
ACPI_STRCPY(local_signature, ACPI_SIG_MADT); strcpy(local_signature, ACPI_SIG_MADT);
} }
/* Dump all instances of this signature (to handle multiple SSDTs) */ /* Dump all instances of this signature (to handle multiple SSDTs) */
......
...@@ -136,10 +136,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance) ...@@ -136,10 +136,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
} else { } else {
ACPI_MOVE_NAME(filename, table->signature); ACPI_MOVE_NAME(filename, table->signature);
} }
filename[0] = (char)ACPI_TOLOWER(filename[0]); filename[0] = (char)tolower((int)filename[0]);
filename[1] = (char)ACPI_TOLOWER(filename[1]); filename[1] = (char)tolower((int)filename[1]);
filename[2] = (char)ACPI_TOLOWER(filename[2]); filename[2] = (char)tolower((int)filename[2]);
filename[3] = (char)ACPI_TOLOWER(filename[3]); filename[3] = (char)tolower((int)filename[3]);
filename[ACPI_NAME_SIZE] = 0; filename[ACPI_NAME_SIZE] = 0;
/* Handle multiple SSDts - create different filenames for each */ /* Handle multiple SSDts - create different filenames for each */
...@@ -147,10 +147,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance) ...@@ -147,10 +147,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
if (instance > 0) { if (instance > 0) {
acpi_ut_snprintf(instance_str, sizeof(instance_str), "%u", acpi_ut_snprintf(instance_str, sizeof(instance_str), "%u",
instance); instance);
ACPI_STRCAT(filename, instance_str); strcat(filename, instance_str);
} }
ACPI_STRCAT(filename, ACPI_TABLE_FILE_SUFFIX); strcat(filename, ACPI_TABLE_FILE_SUFFIX);
if (gbl_verbose_mode) { if (gbl_verbose_mode) {
acpi_log_error acpi_log_error
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment