Commit 6a0df32c authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Move all ASCII utilities to a common file 

ACPICA commit ba60e4500053010bf775d58f6f61febbdb94d817

New file is utascii.c

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


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

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ acpi-y += \ 
acpi-y +=		\

	utaddress.o	\

	utalloc.o	\

	utascii.o	\

	utbuffer.o	\

	utcopy.o	\

	utexcep.o	\

drivers/acpi/acpica/actables.h

+0 −2
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ acpi_tb_install_fixed_table(acpi_physical_address address, 


acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);



u8 acpi_is_valid_signature(char *signature);



/*

 * tbxfload

 */

drivers/acpi/acpica/acutils.h

+9 −4
Original line number Diff line number Diff line
@@ -166,6 +166,15 @@ struct acpi_pkg_info { 
#define DB_DWORD_DISPLAY    4

#define DB_QWORD_DISPLAY    8



/*

 * utascii - ASCII utilities

 */

u8 acpi_ut_valid_nameseg(char *signature);



u8 acpi_ut_valid_name_char(char character, u32 position);



void acpi_ut_check_and_repair_ascii(u8 *name, char *repaired_name, u32 count);



/*

 * utnonansi - Non-ANSI C library functions

 */
@@ -579,10 +588,6 @@ void acpi_ut_print_string(char *string, u16 max_length); 
void ut_convert_backslashes(char *pathname);

#endif



u8 acpi_ut_valid_acpi_name(char *name);



u8 acpi_ut_valid_acpi_char(char character, u32 position);



void acpi_ut_repair_name(char *name);



#if defined (ACPI_DEBUGGER) || defined (ACPI_APPLICATION)

drivers/acpi/acpica/dbnames.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ acpi_db_integrity_walk(acpi_handle obj_handle, 
		return (AE_OK);

	}



	if (!acpi_ut_valid_acpi_name(node->name.ascii)) {

	if (!acpi_ut_valid_nameseg(node->name.ascii)) {

		acpi_os_printf("Invalid AcpiName for Node %p\n", node);

		return (AE_OK);

	}

drivers/acpi/acpica/exnames.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string) 


	for (index = 0;

	     (index < ACPI_NAME_SIZE)

	     && (acpi_ut_valid_acpi_char(*aml_address, 0)); index++) {

	     && (acpi_ut_valid_name_char(*aml_address, 0)); index++) {

		char_buf[index] = *aml_address++;

		ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE