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

ACPICA: Clib: Eliminate acpi_os_XXXFile()/acpi_log_error and link clibrary... 

ACPICA: Clib: Eliminate acpi_os_XXXFile()/acpi_log_error and link clibrary fxxx()/errno/perror() instead

ACPICA commit 189429fb7d06cdb89043ae32d615faf553467f1d

This patch follows new ACPICA design, eliminates old portable OSLs, and
implements fopen/fread/fwrite/fclose/fseek/ftell for GNU EFI
environment. This patch also eliminates acpi_log_error(), convering them
into fprintf(stderr)/perror(). Lv Zheng.

Link: https://github.com/acpica/acpica/commit/189429fb
Link: https://bugs.acpica.org/show_bug.cgi?id=1302


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 f173a775

drivers/acpi/acpica/utdebug.c

+0 −24
Original line number Diff line number Diff line
@@ -628,27 +628,3 @@ acpi_trace_point(acpi_trace_event_type type, u8 begin, u8 *aml, char *pathname) 


ACPI_EXPORT_SYMBOL(acpi_trace_point)

#endif
 
#ifdef ACPI_APPLICATION

/*******************************************************************************

 *

 * FUNCTION:    acpi_log_error

 *

 * PARAMETERS:  format              - Printf format field

 *              ...                 - Optional printf arguments

 *

 * RETURN:      None

 *

 * DESCRIPTION: Print error message to the console, used by applications.

 *

 ******************************************************************************/

void ACPI_INTERNAL_VAR_XFACE acpi_log_error(const char *format, ...)

{

	va_list args;



	va_start(args, format);

	(void)vfprintf(ACPI_FILE_ERR, format, args);

	va_end(args);

}



ACPI_EXPORT_SYMBOL(acpi_log_error)

#endif

drivers/acpi/acpica/utprint.c

+2 −3
Original line number Diff line number Diff line
@@ -656,8 +656,7 @@ int vprintf(const char *format, va_list args) 
	length = vsnprintf(acpi_gbl_print_buffer,

			   sizeof(acpi_gbl_print_buffer), format, args);



	(void)acpi_os_write_file(ACPI_FILE_OUT, acpi_gbl_print_buffer, length,

				 1);

	(void)fwrite(acpi_gbl_print_buffer, length, 1, ACPI_FILE_OUT);

	acpi_os_release_lock(acpi_gbl_print_lock, flags);



	return (length);
@@ -710,7 +709,7 @@ int vfprintf(FILE * file, const char *format, va_list args) 
	length = vsnprintf(acpi_gbl_print_buffer,

			   sizeof(acpi_gbl_print_buffer), format, args);



	(void)acpi_os_write_file(file, acpi_gbl_print_buffer, length, 1);

	(void)fwrite(acpi_gbl_print_buffer, length, 1, file);

	acpi_os_release_lock(acpi_gbl_print_lock, flags);



	return (length);

include/acpi/acpiosxf.h

+6 −37
Original line number Diff line number Diff line
@@ -371,6 +371,12 @@ acpi_status acpi_os_wait_command_ready(void); 
acpi_status acpi_os_notify_command_complete(void);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_trace_point

void

acpi_os_trace_point(acpi_trace_event_type type,

		    u8 begin, u8 *aml, char *pathname);

#endif



/*

 * Obtain ACPI table(s)

 */
@@ -416,41 +422,4 @@ char *acpi_os_get_next_filename(void *dir_handle); 
void acpi_os_close_directory(void *dir_handle);

#endif



/*

 * File I/O and related support

 */

#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_open_file

ACPI_FILE acpi_os_open_file(const char *path, u8 modes);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_close_file

void acpi_os_close_file(ACPI_FILE file);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_read_file

int

acpi_os_read_file(ACPI_FILE file,

		  void *buffer, acpi_size size, acpi_size count);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_write_file

int

acpi_os_write_file(ACPI_FILE file,

		   void *buffer, acpi_size size, acpi_size count);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_file_offset

long acpi_os_get_file_offset(ACPI_FILE file);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_set_file_offset

acpi_status acpi_os_set_file_offset(ACPI_FILE file, long offset, u8 from);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_trace_point

void

acpi_os_trace_point(acpi_trace_event_type type,

		    u8 begin, u8 *aml, char *pathname);

#endif



#endif				/* __ACPIOSXF_H__ */

include/acpi/acpixf.h

+0 −3
Original line number Diff line number Diff line
@@ -943,9 +943,6 @@ ACPI_DBG_DEPENDENT_RETURN_VOID(void 
			       acpi_trace_point(acpi_trace_event_type type,

						u8 begin,

						u8 *aml, char *pathname))

ACPI_APP_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(1)

				void ACPI_INTERNAL_VAR_XFACE

				acpi_log_error(const char *format, ...))



acpi_status acpi_initialize_debugger(void);

include/acpi/actypes.h

+0 −9
Original line number Diff line number Diff line
@@ -1288,15 +1288,6 @@ typedef enum { 
#define ACPI_OSI_WIN_8                  0x0C

#define ACPI_OSI_WIN_10                 0x0D



/* Definitions of file IO */



#define ACPI_FILE_READING               0x01

#define ACPI_FILE_WRITING               0x02

#define ACPI_FILE_BINARY                0x04



#define ACPI_FILE_BEGIN                 0x01

#define ACPI_FILE_END                   0x02



/* Definitions of getopt */



#define ACPI_OPT_END                    -1

CRA Git | Maintained and supported by SUSTech CRA and CCSE