ACPICA: Split exception code utilities to a new file, utexcep.c
Simplifies sharing of these functions. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bob Moore
Len Brown
Родитель
5179f59ecb
Коммит
bc7db14539
|
|
@ -140,6 +140,7 @@ acpi-y += \
|
|||
utaddress.o \
|
||||
utalloc.o \
|
||||
utcopy.o \
|
||||
utexcep.o \
|
||||
utdebug.o \
|
||||
utdecode.o \
|
||||
utdelete.o \
|
||||
|
|
|
|||
|
|
@ -326,14 +326,6 @@ extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
|
|||
|
||||
#endif
|
||||
|
||||
/* Exception codes */
|
||||
|
||||
extern char const *acpi_gbl_exception_names_env[];
|
||||
extern char const *acpi_gbl_exception_names_pgm[];
|
||||
extern char const *acpi_gbl_exception_names_tbl[];
|
||||
extern char const *acpi_gbl_exception_names_aml[];
|
||||
extern char const *acpi_gbl_exception_names_ctrl[];
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Namespace globals
|
||||
|
|
|
|||
|
|
@ -49,41 +49,6 @@
|
|||
#define _COMPONENT ACPI_UTILITIES
|
||||
ACPI_MODULE_NAME("utdecode")
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_format_exception
|
||||
*
|
||||
* PARAMETERS: Status - The acpi_status code to be formatted
|
||||
*
|
||||
* RETURN: A string containing the exception text. A valid pointer is
|
||||
* always returned.
|
||||
*
|
||||
* DESCRIPTION: This function translates an ACPI exception into an ASCII string
|
||||
* It is here instead of utxface.c so it is always present.
|
||||
*
|
||||
******************************************************************************/
|
||||
const char *acpi_format_exception(acpi_status status)
|
||||
{
|
||||
const char *exception = NULL;
|
||||
|
||||
ACPI_FUNCTION_ENTRY();
|
||||
|
||||
exception = acpi_ut_validate_exception(status);
|
||||
if (!exception) {
|
||||
|
||||
/* Exception code was not recognized */
|
||||
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Unknown exception code: 0x%8.8X", status));
|
||||
|
||||
exception = "UNKNOWN_STATUS_CODE";
|
||||
}
|
||||
|
||||
return (ACPI_CAST_PTR(const char, exception));
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_format_exception)
|
||||
|
||||
/*
|
||||
* Properties of the ACPI Object Types, both internal and external.
|
||||
* The table is indexed by values of acpi_object_type
|
||||
|
|
|
|||
|
|
@ -0,0 +1,153 @@
|
|||
/*******************************************************************************
|
||||
*
|
||||
* Module Name: utexcep - Exception code support
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2012, Intel Corp.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions, and the following disclaimer,
|
||||
* without modification.
|
||||
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
||||
* substantially similar to the "NO WARRANTY" disclaimer below
|
||||
* ("Disclaimer") and any redistribution must be conditioned upon
|
||||
* including a substantially similar Disclaimer requirement for further
|
||||
* binary redistribution.
|
||||
* 3. Neither the names of the above-listed copyright holders nor the names
|
||||
* of any contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* Alternatively, this software may be distributed under the terms of the
|
||||
* GNU General Public License ("GPL") version 2 as published by the Free
|
||||
* Software Foundation.
|
||||
*
|
||||
* NO WARRANTY
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGES.
|
||||
*/
|
||||
|
||||
#define ACPI_DEFINE_EXCEPTION_TABLE
|
||||
#include <linux/export.h>
|
||||
#include <acpi/acpi.h>
|
||||
#include "accommon.h"
|
||||
|
||||
#define _COMPONENT ACPI_UTILITIES
|
||||
ACPI_MODULE_NAME("utexcep")
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_format_exception
|
||||
*
|
||||
* PARAMETERS: status - The acpi_status code to be formatted
|
||||
*
|
||||
* RETURN: A string containing the exception text. A valid pointer is
|
||||
* always returned.
|
||||
*
|
||||
* DESCRIPTION: This function translates an ACPI exception into an ASCII
|
||||
* string. Returns "unknown status" string for invalid codes.
|
||||
*
|
||||
******************************************************************************/
|
||||
const char *acpi_format_exception(acpi_status status)
|
||||
{
|
||||
const char *exception = NULL;
|
||||
|
||||
ACPI_FUNCTION_ENTRY();
|
||||
|
||||
exception = acpi_ut_validate_exception(status);
|
||||
if (!exception) {
|
||||
|
||||
/* Exception code was not recognized */
|
||||
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Unknown exception code: 0x%8.8X", status));
|
||||
|
||||
exception = "UNKNOWN_STATUS_CODE";
|
||||
}
|
||||
|
||||
return (ACPI_CAST_PTR(const char, exception));
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_format_exception)
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_ut_validate_exception
|
||||
*
|
||||
* PARAMETERS: status - The acpi_status code to be formatted
|
||||
*
|
||||
* RETURN: A string containing the exception text. NULL if exception is
|
||||
* not valid.
|
||||
*
|
||||
* DESCRIPTION: This function validates and translates an ACPI exception into
|
||||
* an ASCII string.
|
||||
*
|
||||
******************************************************************************/
|
||||
const char *acpi_ut_validate_exception(acpi_status status)
|
||||
{
|
||||
u32 sub_status;
|
||||
const char *exception = NULL;
|
||||
|
||||
ACPI_FUNCTION_ENTRY();
|
||||
|
||||
/*
|
||||
* Status is composed of two parts, a "type" and an actual code
|
||||
*/
|
||||
sub_status = (status & ~AE_CODE_MASK);
|
||||
|
||||
switch (status & AE_CODE_MASK) {
|
||||
case AE_CODE_ENVIRONMENTAL:
|
||||
|
||||
if (sub_status <= AE_CODE_ENV_MAX) {
|
||||
exception = acpi_gbl_exception_names_env[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
case AE_CODE_PROGRAMMER:
|
||||
|
||||
if (sub_status <= AE_CODE_PGM_MAX) {
|
||||
exception = acpi_gbl_exception_names_pgm[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
case AE_CODE_ACPI_TABLES:
|
||||
|
||||
if (sub_status <= AE_CODE_TBL_MAX) {
|
||||
exception = acpi_gbl_exception_names_tbl[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
case AE_CODE_AML:
|
||||
|
||||
if (sub_status <= AE_CODE_AML_MAX) {
|
||||
exception = acpi_gbl_exception_names_aml[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
case AE_CODE_CONTROL:
|
||||
|
||||
if (sub_status <= AE_CODE_CTRL_MAX) {
|
||||
exception = acpi_gbl_exception_names_ctrl[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return (ACPI_CAST_PTR(const char, exception));
|
||||
}
|
||||
|
|
@ -80,75 +80,6 @@ void ut_convert_backslashes(char *pathname)
|
|||
}
|
||||
#endif
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_ut_validate_exception
|
||||
*
|
||||
* PARAMETERS: Status - The acpi_status code to be formatted
|
||||
*
|
||||
* RETURN: A string containing the exception text. NULL if exception is
|
||||
* not valid.
|
||||
*
|
||||
* DESCRIPTION: This function validates and translates an ACPI exception into
|
||||
* an ASCII string.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
const char *acpi_ut_validate_exception(acpi_status status)
|
||||
{
|
||||
u32 sub_status;
|
||||
const char *exception = NULL;
|
||||
|
||||
ACPI_FUNCTION_ENTRY();
|
||||
|
||||
/*
|
||||
* Status is composed of two parts, a "type" and an actual code
|
||||
*/
|
||||
sub_status = (status & ~AE_CODE_MASK);
|
||||
|
||||
switch (status & AE_CODE_MASK) {
|
||||
case AE_CODE_ENVIRONMENTAL:
|
||||
|
||||
if (sub_status <= AE_CODE_ENV_MAX) {
|
||||
exception = acpi_gbl_exception_names_env[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
case AE_CODE_PROGRAMMER:
|
||||
|
||||
if (sub_status <= AE_CODE_PGM_MAX) {
|
||||
exception = acpi_gbl_exception_names_pgm[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
case AE_CODE_ACPI_TABLES:
|
||||
|
||||
if (sub_status <= AE_CODE_TBL_MAX) {
|
||||
exception = acpi_gbl_exception_names_tbl[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
case AE_CODE_AML:
|
||||
|
||||
if (sub_status <= AE_CODE_AML_MAX) {
|
||||
exception = acpi_gbl_exception_names_aml[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
case AE_CODE_CONTROL:
|
||||
|
||||
if (sub_status <= AE_CODE_CTRL_MAX) {
|
||||
exception = acpi_gbl_exception_names_ctrl[sub_status];
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return (ACPI_CAST_PTR(const char, exception));
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_ut_is_pci_root_bridge
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
#define AE_CODE_ACPI_TABLES 0x2000
|
||||
#define AE_CODE_AML 0x3000
|
||||
#define AE_CODE_CONTROL 0x4000
|
||||
#define AE_CODE_MAX 0x4000
|
||||
#define AE_CODE_MASK 0xF000
|
||||
|
||||
#define ACPI_SUCCESS(a) (!(a))
|
||||
|
|
@ -181,7 +182,7 @@
|
|||
|
||||
/* Exception strings for acpi_format_exception */
|
||||
|
||||
#ifdef DEFINE_ACPI_GLOBALS
|
||||
#ifdef ACPI_DEFINE_EXCEPTION_TABLE
|
||||
|
||||
/*
|
||||
* String versions of the exception codes above
|
||||
|
|
@ -295,6 +296,6 @@ char const *acpi_gbl_exception_names_ctrl[] = {
|
|||
"AE_CTRL_PARSE_PENDING"
|
||||
};
|
||||
|
||||
#endif /* ACPI GLOBALS */
|
||||
#endif /* EXCEPTION_TABLE */
|
||||
|
||||
#endif /* __ACEXCEP_H__ */
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче