Skip to content

L
linux
Commit 82015ca1 authored by Andy Grover's avatar Andy Grover
Browse files
Options

ACPI: remove non-Linux revision on files, and make types more Linux-like

parent 70fd4199
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 737 additions and 888 deletions
drivers/acpi/dispatcher/dsfield.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: dsfield - Dispatcher field routines
* $Revision: 70 $
*
*****************************************************************************/
......@@ -183,7 +182,7 @@ acpi_ds_create_buffer_field (
acpi_status
acpi_ds_get_field_names (
ACPI_CREATE_FIELD_INFO *info,
acpi_create_field_info *info,
acpi_walk_state *walk_state,
acpi_parse_object *arg)
{
......@@ -316,7 +315,7 @@ acpi_ds_create_field (
{
acpi_status status;
acpi_parse_object *arg;
ACPI_CREATE_FIELD_INFO info;
acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_field", op);
......@@ -458,7 +457,7 @@ acpi_ds_create_bank_field (
{
acpi_status status;
acpi_parse_object *arg;
ACPI_CREATE_FIELD_INFO info;
acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_bank_field", op);
......@@ -531,7 +530,7 @@ acpi_ds_create_index_field (
{
acpi_status status;
acpi_parse_object *arg;
ACPI_CREATE_FIELD_INFO info;
acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_index_field", op);
......
drivers/acpi/dispatcher/dsinit.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: dsinit - Object initialization namespace walk
* $Revision: 4 $
*
*****************************************************************************/
......
drivers/acpi/dispatcher/dsmethod.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: dsmethod - Parser/Interpreter interface - control method parsing
* $Revision: 89 $
*
*****************************************************************************/
......@@ -243,7 +242,7 @@ acpi_ds_begin_method_execution (
acpi_status
acpi_ds_call_control_method (
ACPI_THREAD_STATE *thread,
acpi_thread_state *thread,
acpi_walk_state *this_walk_state,
acpi_parse_object *op)
{
......
drivers/acpi/dispatcher/dsmthdat.c
View file @ 82015ca1
/*******************************************************************************
*
* Module Name: dsmthdat - control method arguments and local variables
* $Revision: 68 $
*
******************************************************************************/
......
drivers/acpi/dispatcher/dsobject.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: dsobject - Dispatcher object management routines
* $Revision: 112 $
*
*****************************************************************************/
......@@ -295,7 +294,7 @@ acpi_ds_build_internal_package_obj (
* that the list is always null terminated.
*/
obj_desc->package.elements = ACPI_MEM_CALLOCATE (
((ACPI_SIZE) obj_desc->package.count + 1) * sizeof (void *));
((acpi_size) obj_desc->package.count + 1) * sizeof (void *));
if (!obj_desc->package.elements) {
acpi_ut_delete_object_desc (obj_desc);
......
drivers/acpi/dispatcher/dsopcode.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: dsopcode - Dispatcher Op Region support and handling of
* "control" opcodes
* $Revision: 84 $
*
*****************************************************************************/
......@@ -710,7 +709,7 @@ acpi_ds_eval_region_operands (
*/
operand_desc = walk_state->operands[walk_state->num_operands - 2];
obj_desc->region.address = (ACPI_PHYSICAL_ADDRESS) operand_desc->integer.value;
obj_desc->region.address = (acpi_physical_address) operand_desc->integer.value;
acpi_ut_remove_reference (operand_desc);
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Rgn_obj %p Addr %8.8X%8.8X Len %X\n",
......
drivers/acpi/dispatcher/dsutils.c
View file @ 82015ca1
/*******************************************************************************
*
* Module Name: dsutils - Dispatcher utilities
* $Revision: 98 $
*
******************************************************************************/
......
drivers/acpi/dispatcher/dswexec.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: dswexec - Dispatcher method execution callbacks;
* dispatch to interpreter.
* $Revision: 97 $
*
*****************************************************************************/
......
drivers/acpi/dispatcher/dswload.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: dswload - Dispatcher namespace load callbacks
* $Revision: 82 $
*
*****************************************************************************/
......@@ -340,7 +339,7 @@ acpi_ds_load1_end_op (
if (op->common.aml_opcode == AML_REGION_OP) {
status = acpi_ex_create_region (op->named.data, op->named.length,
(ACPI_ADR_SPACE_TYPE) ((op->common.value.arg)->common.value.integer), walk_state);
(acpi_adr_space_type) ((op->common.value.arg)->common.value.integer), walk_state);
if (ACPI_FAILURE (status)) {
return (status);
}
......
drivers/acpi/dispatcher/dswscope.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: dswscope - Scope stack manipulation
* $Revision: 56 $
*
*****************************************************************************/
......
drivers/acpi/dispatcher/dswstate.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: dswstate - Dispatcher parse tree walk management routines
* $Revision: 73 $
*
*****************************************************************************/
......@@ -174,7 +173,7 @@ acpi_ds_result_pop (
acpi_operand_object **object,
acpi_walk_state *walk_state)
{
NATIVE_UINT index;
acpi_native_uint index;
acpi_generic_state *state;
......@@ -234,7 +233,7 @@ acpi_ds_result_pop_from_bottom (
acpi_operand_object **object,
acpi_walk_state *walk_state)
{
NATIVE_UINT index;
acpi_native_uint index;
acpi_generic_state *state;
......@@ -689,7 +688,7 @@ acpi_ds_obj_stack_get_value (
return_PTR (NULL);
}
return_PTR (walk_state->operands[(NATIVE_UINT)(walk_state->num_operands - 1) -
return_PTR (walk_state->operands[(acpi_native_uint)(walk_state->num_operands - 1) -
index]);
}
......@@ -709,7 +708,7 @@ acpi_ds_obj_stack_get_value (
acpi_walk_state *
acpi_ds_get_current_walk_state (
ACPI_THREAD_STATE *thread)
acpi_thread_state *thread)
{
ACPI_FUNCTION_NAME ("Ds_get_current_walk_state");
......@@ -742,7 +741,7 @@ acpi_ds_get_current_walk_state (
void
acpi_ds_push_walk_state (
acpi_walk_state *walk_state,
ACPI_THREAD_STATE *thread)
acpi_thread_state *thread)
{
ACPI_FUNCTION_TRACE ("Ds_push_walk_state");
......@@ -770,7 +769,7 @@ acpi_ds_push_walk_state (
acpi_walk_state *
acpi_ds_pop_walk_state (
ACPI_THREAD_STATE *thread)
acpi_thread_state *thread)
{
acpi_walk_state *walk_state;
......@@ -815,7 +814,7 @@ acpi_ds_create_walk_state (
acpi_owner_id owner_id,
acpi_parse_object *origin,
acpi_operand_object *mth_desc,
ACPI_THREAD_STATE *thread)
acpi_thread_state *thread)
{
acpi_walk_state *walk_state;
acpi_status status;
......
drivers/acpi/ec.c
View file @ 82015ca1
......@@ -422,7 +422,7 @@ acpi_ec_space_setup (
static acpi_status
acpi_ec_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......
drivers/acpi/events/evevent.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: evevent - Fixed Event handling and dispatch
* $Revision: 104 $
*
*****************************************************************************/
......@@ -25,7 +24,6 @@
#include "acpi.h"
#include "acevents.h"
#include "acnamesp.h"
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evevent")
......@@ -158,7 +156,7 @@ acpi_status
acpi_ev_fixed_event_initialize (
void)
{
NATIVE_UINT i;
acpi_native_uint i;
acpi_status status;
......@@ -204,7 +202,7 @@ acpi_ev_fixed_event_detect (
u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
u32 fixed_status;
u32 fixed_enable;
NATIVE_UINT_MAX32 i;
acpi_native_uint i;
ACPI_FUNCTION_NAME ("Ev_fixed_event_detect");
......@@ -231,7 +229,7 @@ acpi_ev_fixed_event_detect (
(fixed_enable & acpi_gbl_fixed_event_info[i].enable_bit_mask)) {
/* Found an active (signalled) event */
int_status |= acpi_ev_fixed_event_dispatch (i);
int_status |= acpi_ev_fixed_event_dispatch ((u32) i);
}
}
......
drivers/acpi/events/evgpe.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: evgpe - General Purpose Event handling and dispatch
* $Revision: 3 $
*
*****************************************************************************/
......@@ -46,13 +45,13 @@
acpi_status
acpi_ev_gpe_initialize (void)
{
NATIVE_UINT_MAX32 i;
NATIVE_UINT_MAX32 j;
acpi_native_uint i;
acpi_native_uint j;
u32 gpe_block;
u32 gpe_register;
u32 gpe_number_index;
u32 gpe_number;
ACPI_GPE_REGISTER_INFO *gpe_register_info;
acpi_gpe_register_info *gpe_register_info;
acpi_status status;
......@@ -149,8 +148,8 @@ acpi_ev_gpe_initialize (void)
/* Allocate the GPE number-to-index translation table */
acpi_gbl_gpe_number_to_index = ACPI_MEM_CALLOCATE (
sizeof (ACPI_GPE_INDEX_INFO) *
((ACPI_SIZE) acpi_gbl_gpe_number_max + 1));
sizeof (acpi_gpe_index_info) *
((acpi_size) acpi_gbl_gpe_number_max + 1));
if (!acpi_gbl_gpe_number_to_index) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Could not allocate the Gpe_number_to_index table\n"));
......@@ -160,13 +159,13 @@ acpi_ev_gpe_initialize (void)
/* Set the Gpe index table to GPE_INVALID */
ACPI_MEMSET (acpi_gbl_gpe_number_to_index, (int) ACPI_GPE_INVALID,
sizeof (ACPI_GPE_INDEX_INFO) * ((ACPI_SIZE) acpi_gbl_gpe_number_max + 1));
sizeof (acpi_gpe_index_info) * ((acpi_size) acpi_gbl_gpe_number_max + 1));
/* Allocate the GPE register information block */
acpi_gbl_gpe_register_info = ACPI_MEM_CALLOCATE (
(ACPI_SIZE) acpi_gbl_gpe_register_count *
sizeof (ACPI_GPE_REGISTER_INFO));
(acpi_size) acpi_gbl_gpe_register_count *
sizeof (acpi_gpe_register_info));
if (!acpi_gbl_gpe_register_info) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Could not allocate the Gpe_register_info table\n"));
......@@ -178,8 +177,8 @@ acpi_ev_gpe_initialize (void)
* per register. Initialization to zeros is sufficient.
*/
acpi_gbl_gpe_number_info = ACPI_MEM_CALLOCATE (
(ACPI_SIZE) (acpi_gbl_gpe_register_count * ACPI_GPE_REGISTER_WIDTH) *
sizeof (ACPI_GPE_NUMBER_INFO));
((acpi_size) acpi_gbl_gpe_register_count * ACPI_GPE_REGISTER_WIDTH) *
sizeof (acpi_gpe_number_info));
if (!acpi_gbl_gpe_number_info) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not allocate the Gpe_number_info table\n"));
goto error_exit2;
......@@ -223,7 +222,7 @@ acpi_ev_gpe_initialize (void)
/* Init the Index mapping info for each GPE number within this register */
for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
gpe_number = gpe_register_info->base_gpe_number + j;
gpe_number = gpe_register_info->base_gpe_number + (u32) j;
acpi_gbl_gpe_number_to_index[gpe_number].number_index = (u8) gpe_number_index;
acpi_gbl_gpe_number_info[gpe_number_index].bit_mask = acpi_gbl_decode_to8bit[j];
......@@ -446,7 +445,7 @@ acpi_ev_gpe_detect (void)
u32 j;
u8 enabled_status_byte;
u8 bit_mask;
ACPI_GPE_REGISTER_INFO *gpe_register_info;
acpi_gpe_register_info *gpe_register_info;
u32 in_value;
acpi_status status;
......@@ -533,7 +532,7 @@ acpi_ev_asynch_execute_gpe_method (
{
u32 gpe_number = (u32) ACPI_TO_INTEGER (context);
u32 gpe_number_index;
ACPI_GPE_NUMBER_INFO gpe_info;
acpi_gpe_number_info gpe_info;
acpi_status status;
......@@ -611,7 +610,7 @@ acpi_ev_gpe_dispatch (
u32 gpe_number)
{
u32 gpe_number_index;
ACPI_GPE_NUMBER_INFO *gpe_info;
acpi_gpe_number_info *gpe_info;
acpi_status status;
......
drivers/acpi/events/evmisc.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: evmisc - Miscellaneous event manager support functions
* $Revision: 60 $
*
*****************************************************************************/
......@@ -555,7 +554,7 @@ acpi_ev_release_global_lock (void)
void
acpi_ev_terminate (void)
{
NATIVE_UINT_MAX32 i;
acpi_native_uint i;
acpi_status status;
......@@ -572,9 +571,9 @@ acpi_ev_terminate (void)
* Disable all fixed events
*/
for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
status = acpi_disable_event(i, ACPI_EVENT_FIXED, 0);
status = acpi_disable_event ((u32) i, ACPI_EVENT_FIXED, 0);
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable fixed event %d\n", i));
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable fixed event %d\n", (u32) i));
}
}
......@@ -582,10 +581,10 @@ acpi_ev_terminate (void)
* Disable all GPEs
*/
for (i = 0; i < acpi_gbl_gpe_number_max; i++) {
if (acpi_ev_get_gpe_number_index(i) != ACPI_GPE_INVALID) {
status = acpi_hw_disable_gpe(i);
if (acpi_ev_get_gpe_number_index ((u32)i) != ACPI_GPE_INVALID) {
status = acpi_hw_disable_gpe((u32) i);
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable GPE %d\n", i));
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable GPE %d\n", (u32) i));
}
}
}
......@@ -593,7 +592,7 @@ acpi_ev_terminate (void)
/*
* Remove SCI handler
*/
status = acpi_ev_remove_sci_handler();
status = acpi_ev_remove_sci_handler ();
if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not remove SCI handler\n"));
}
......
drivers/acpi/events/evregion.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: evregion - ACPI Address_space (Op_region) handler dispatch
* $Revision: 136 $
*
*****************************************************************************/
......@@ -206,7 +205,7 @@ acpi_status
acpi_ev_address_space_dispatch (
acpi_operand_object *region_obj,
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
void *value)
{
......
drivers/acpi/events/evrgnini.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: evrgnini- ACPI Address_space (Op_region) init
* $Revision: 64 $
*
*****************************************************************************/
......@@ -406,7 +405,7 @@ acpi_ev_initialize_region (
{
acpi_operand_object *handler_obj;
acpi_operand_object *obj_desc;
ACPI_ADR_SPACE_TYPE space_id;
acpi_adr_space_type space_id;
acpi_namespace_node *node;
acpi_status status;
acpi_namespace_node *method_node;
......
drivers/acpi/events/evsci.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: evsci - System Control Interrupt configuration and
* legacy to ACPI mode state transition functions
* $Revision: 86 $
*
******************************************************************************/
......
drivers/acpi/events/evxface.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: evxface - External interfaces for ACPI events
* $Revision: 132 $
*
*****************************************************************************/
......
drivers/acpi/events/evxfevnt.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: evxfevnt - External Interfaces, ACPI event disable/enable
* $Revision: 59 $
*
*****************************************************************************/
......
drivers/acpi/events/evxfregn.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: evxfregn - External Interfaces, ACPI Operation Regions and
* Address Spaces.
* $Revision: 52 $
*
*****************************************************************************/
......@@ -53,7 +52,7 @@
acpi_status
acpi_install_address_space_handler (
acpi_handle device,
ACPI_ADR_SPACE_TYPE space_id,
acpi_adr_space_type space_id,
acpi_adr_space_handler handler,
acpi_adr_space_setup setup,
void *context)
......@@ -283,7 +282,7 @@ acpi_install_address_space_handler (
acpi_status
acpi_remove_address_space_handler (
acpi_handle device,
ACPI_ADR_SPACE_TYPE space_id,
acpi_adr_space_type space_id,
acpi_adr_space_handler handler)
{
acpi_operand_object *obj_desc;
......
drivers/acpi/executer/exconfig.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: exconfig - Namespace reconfiguration (Load/Unload opcodes)
* $Revision: 69 $
*
*****************************************************************************/
......@@ -75,7 +74,7 @@ acpi_ex_add_table (
/* Install the new table into the local data structures */
table_info.pointer = table;
table_info.length = (ACPI_SIZE) table->length;
table_info.length = (acpi_size) table->length;
table_info.allocation = ACPI_MEM_ALLOCATED;
status = acpi_tb_install_table (&table_info);
......@@ -282,7 +281,7 @@ acpi_ex_load_op (
table_header.length = 0;
for (i = 0; i < sizeof (acpi_table_header); i++) {
status = acpi_ev_address_space_dispatch (obj_desc, ACPI_READ,
(ACPI_PHYSICAL_ADDRESS) i, 8,
(acpi_physical_address) i, 8,
((u8 *) &table_header) + i);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
......@@ -305,7 +304,7 @@ acpi_ex_load_op (
for (i = 0; i < table_header.length; i++) {
status = acpi_ev_address_space_dispatch (obj_desc, ACPI_READ,
(ACPI_PHYSICAL_ADDRESS) i, 8,
(acpi_physical_address) i, 8,
((u8 *) table_data_ptr + i));
if (ACPI_FAILURE (status)) {
goto cleanup;
......
drivers/acpi/executer/exconvrt.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: exconvrt - Object conversion routines
* $Revision: 47 $
*
*****************************************************************************/
......@@ -230,7 +229,7 @@ acpi_ex_convert_to_buffer (
* Create a new Buffer object
* Size will be the string length
*/
ret_desc = acpi_ut_create_buffer_object ((ACPI_SIZE) obj_desc->string.length);
ret_desc = acpi_ut_create_buffer_object ((acpi_size) obj_desc->string.length);
if (!ret_desc) {
return_ACPI_STATUS (AE_NO_MEMORY);
}
......@@ -398,7 +397,6 @@ acpi_ex_convert_to_string (
{
acpi_operand_object *ret_desc;
u32 i;
u32 index;
u32 string_length;
u8 *new_buf;
u8 *pointer;
......@@ -438,7 +436,7 @@ acpi_ex_convert_to_string (
/* Need enough space for one ASCII integer plus null terminator */
new_buf = ACPI_MEM_CALLOCATE ((ACPI_SIZE) string_length + 1);
new_buf = ACPI_MEM_CALLOCATE ((acpi_size) string_length + 1);
if (!new_buf) {
ACPI_REPORT_ERROR
(("Ex_convert_to_string: Buffer allocation failure\n"));
......@@ -467,9 +465,15 @@ acpi_ex_convert_to_string (
case ACPI_TYPE_BUFFER:
string_length = obj_desc->buffer.length * 3;
if (base == 10) {
string_length = obj_desc->buffer.length * 4;
/* Find the string length */
pointer = obj_desc->buffer.pointer;
for (string_length = 0; string_length < obj_desc->buffer.length; string_length++) {
/* Exit on null terminator */
if (!pointer[string_length]) {
break;
}
}
if (max_length > ACPI_MAX_STRING_CONVERSION) {
......@@ -492,7 +496,7 @@ acpi_ex_convert_to_string (
string_length = max_length;
}
new_buf = ACPI_MEM_CALLOCATE ((ACPI_SIZE) string_length + 1);
new_buf = ACPI_MEM_CALLOCATE ((acpi_size) string_length + 1);
if (!new_buf) {
ACPI_REPORT_ERROR
(("Ex_convert_to_string: Buffer allocation failure\n"));
......@@ -500,23 +504,15 @@ acpi_ex_convert_to_string (
return_ACPI_STATUS (AE_NO_MEMORY);
}
/*
* Convert each byte of the buffer to two ASCII characters plus a space.
*/
pointer = obj_desc->buffer.pointer;
index = 0;
for (i = 0, index = 0; i < obj_desc->buffer.length; i++) {
index += acpi_ex_convert_to_ascii ((acpi_integer) pointer[i], base, &new_buf[index], 1);
/* Copy the appropriate number of buffer characters */
new_buf[index] = ' ';
index++;
}
ACPI_MEMCPY (new_buf, pointer, string_length);
/* Null terminate */
new_buf [index-1] = 0;
new_buf [string_length] = 0;
ret_desc->buffer.pointer = new_buf;
ret_desc->string.length = (u32) ACPI_STRLEN ((char *) new_buf);
ret_desc->string.length = string_length;
break;
......
drivers/acpi/executer/excreate.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: excreate - Named object creation
* $Revision: 98 $
*
*****************************************************************************/
......@@ -392,7 +391,7 @@ acpi_ex_create_table_region (
/* Init the region from the operands */
obj_desc->region.space_id = REGION_DATA_TABLE;
obj_desc->region.address = (ACPI_PHYSICAL_ADDRESS) ACPI_TO_INTEGER (table);
obj_desc->region.address = (acpi_physical_address) ACPI_TO_INTEGER (table);
obj_desc->region.length = table->length;
obj_desc->region.node = node;
obj_desc->region.flags = AOPOBJ_DATA_VALID;
......@@ -463,7 +462,7 @@ acpi_ex_create_processor (
* Initialize the processor object from the operands
*/
obj_desc->processor.proc_id = (u8) operand[1]->integer.value;
obj_desc->processor.address = (ACPI_IO_ADDRESS) operand[2]->integer.value;
obj_desc->processor.address = (acpi_io_address) operand[2]->integer.value;
obj_desc->processor.length = (u8) operand[3]->integer.value;
/* Install the processor object in the parent Node */
......
drivers/acpi/executer/exdump.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: exdump - Interpreter debug output routines
* $Revision: 164 $
*
*****************************************************************************/
......@@ -392,7 +391,7 @@ acpi_ex_dump_operands (
char *module_name,
u32 line_number)
{
NATIVE_UINT i;
acpi_native_uint i;
acpi_operand_object **obj_desc;
......@@ -469,7 +468,7 @@ acpi_ex_out_integer (
void
acpi_ex_out_address (
char *title,
ACPI_PHYSICAL_ADDRESS value)
acpi_physical_address value)
{
#if ACPI_MACHINE_WIDTH == 16
......@@ -673,7 +672,7 @@ acpi_ex_dump_object_descriptor (
acpi_ex_out_integer ("Processor ID", obj_desc->processor.proc_id);
acpi_ex_out_integer ("Length", obj_desc->processor.length);
acpi_ex_out_address ("Address", (ACPI_PHYSICAL_ADDRESS) obj_desc->processor.address);
acpi_ex_out_address ("Address", (acpi_physical_address) obj_desc->processor.address);
acpi_ex_out_pointer ("Sys_handler", obj_desc->processor.sys_handler);
acpi_ex_out_pointer ("Drv_handler", obj_desc->processor.drv_handler);
acpi_ex_out_pointer ("Addr_handler", obj_desc->processor.addr_handler);
......
drivers/acpi/executer/exfield.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: exfield - ACPI AML (p-code) execution - field manipulation
* $Revision: 117 $
*
*****************************************************************************/
......@@ -56,7 +55,7 @@ acpi_ex_read_data_from_field (
{
acpi_status status;
acpi_operand_object *buffer_desc;
ACPI_SIZE length;
acpi_size length;
void *buffer;
u8 locked;
......@@ -118,7 +117,7 @@ acpi_ex_read_data_from_field (
*
* Note: Field.length is in bits.
*/
length = (ACPI_SIZE) ACPI_ROUND_BITS_UP_TO_BYTES (obj_desc->field.bit_length);
length = (acpi_size) ACPI_ROUND_BITS_UP_TO_BYTES (obj_desc->field.bit_length);
if (length > acpi_gbl_integer_byte_width) {
/* Field is too large for an Integer, create a Buffer instead */
......
drivers/acpi/executer/exfldio.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: exfldio - Aml Field I/O
* $Revision: 91 $
*
*****************************************************************************/
......@@ -155,7 +154,7 @@ acpi_ex_access_region (
{
acpi_status status;
acpi_operand_object *rgn_desc;
ACPI_PHYSICAL_ADDRESS address;
acpi_physical_address address;
ACPI_FUNCTION_TRACE ("Ex_access_region");
......
drivers/acpi/executer/exmisc.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
* $Revision: 114 $
*
*****************************************************************************/
......@@ -152,8 +151,8 @@ acpi_ex_concat_template (
u8 *new_buf;
u8 *end_tag1;
u8 *end_tag2;
ACPI_SIZE length1;
ACPI_SIZE length2;
acpi_size length1;
acpi_size length2;
ACPI_FUNCTION_TRACE ("Ex_concat_template");
......@@ -281,8 +280,8 @@ acpi_ex_do_concatenate (
/* Operand0 is string */
new_buf = ACPI_MEM_CALLOCATE ((ACPI_SIZE) obj_desc1->string.length +
(ACPI_SIZE) obj_desc2->string.length + 1);
new_buf = ACPI_MEM_CALLOCATE ((acpi_size) obj_desc1->string.length +
(acpi_size) obj_desc2->string.length + 1);
if (!new_buf) {
ACPI_REPORT_ERROR
(("Ex_do_concatenate: String allocation failure\n"));
......@@ -309,8 +308,8 @@ acpi_ex_do_concatenate (
/* Result of two Buffers is a Buffer */
return_desc = acpi_ut_create_buffer_object (
(ACPI_SIZE) obj_desc1->buffer.length +
(ACPI_SIZE) obj_desc2->buffer.length);
(acpi_size) obj_desc1->buffer.length +
(acpi_size) obj_desc2->buffer.length);
if (!return_desc) {
return (AE_NO_MEMORY);
}
......
drivers/acpi/executer/exmutex.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exmutex - ASL Mutex Acquire/Release functions
* $Revision: 17 $
*
*****************************************************************************/
......@@ -48,7 +47,7 @@ void
acpi_ex_unlink_mutex (
acpi_operand_object *obj_desc)
{
ACPI_THREAD_STATE *thread = obj_desc->mutex.owner_thread;
acpi_thread_state *thread = obj_desc->mutex.owner_thread;
if (!thread) {
......@@ -84,7 +83,7 @@ acpi_ex_unlink_mutex (
void
acpi_ex_link_mutex (
acpi_operand_object *obj_desc,
ACPI_THREAD_STATE *thread)
acpi_thread_state *thread)
{
acpi_operand_object *list_head;
......@@ -298,7 +297,7 @@ acpi_ex_release_mutex (
void
acpi_ex_release_all_mutexes (
ACPI_THREAD_STATE *thread)
acpi_thread_state *thread)
{
acpi_operand_object *next = thread->acquired_mutex_list;
acpi_operand_object *this;
......
drivers/acpi/executer/exnames.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exnames - interpreter/scanner name load/execute
* $Revision: 93 $
*
*****************************************************************************/
......
drivers/acpi/executer/exoparg1.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exoparg1 - AML execution - opcodes with 1 argument
* $Revision: 146 $
*
*****************************************************************************/
......
drivers/acpi/executer/exoparg2.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: exoparg2 - AML execution - opcodes with 2 arguments
* $Revision: 116 $
*
*****************************************************************************/
......@@ -247,7 +246,7 @@ acpi_ex_opcode_2A_1T_1R (
acpi_operand_object *temp_desc = NULL;
u32 index;
acpi_status status = AE_OK;
ACPI_SIZE length;
acpi_size length;
ACPI_FUNCTION_TRACE_STR ("Ex_opcode_2A_1T_1R", acpi_ps_get_opcode_name (walk_state->opcode));
......
drivers/acpi/executer/exoparg3.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exoparg3 - AML execution - opcodes with 3 arguments
* $Revision: 15 $
*
*****************************************************************************/
......@@ -75,7 +74,7 @@ acpi_ex_opcode_3A_0T_0R (
acpi_walk_state *walk_state)
{
acpi_operand_object **operand = &walk_state->operands[0];
ACPI_SIGNAL_FATAL_INFO *fatal;
acpi_signal_fatal_info *fatal;
acpi_status status = AE_OK;
......@@ -92,7 +91,7 @@ acpi_ex_opcode_3A_0T_0R (
(u32) operand[2]->integer.value));
fatal = ACPI_MEM_ALLOCATE (sizeof (ACPI_SIGNAL_FATAL_INFO));
fatal = ACPI_MEM_ALLOCATE (sizeof (acpi_signal_fatal_info));
if (fatal) {
fatal->type = (u32) operand[0]->integer.value;
fatal->code = (u32) operand[1]->integer.value;
......@@ -145,8 +144,8 @@ acpi_ex_opcode_3A_1T_1R (
acpi_operand_object *return_desc = NULL;
char *buffer;
acpi_status status = AE_OK;
NATIVE_UINT index;
ACPI_SIZE length;
acpi_native_uint index;
acpi_size length;
ACPI_FUNCTION_TRACE_STR ("Ex_opcode_3A_1T_1R", acpi_ps_get_opcode_name (walk_state->opcode));
......@@ -167,8 +166,8 @@ acpi_ex_opcode_3A_1T_1R (
/* Get the Integer values from the objects */
index = (NATIVE_UINT) operand[1]->integer.value;
length = (ACPI_SIZE) operand[2]->integer.value;
index = (acpi_native_uint) operand[1]->integer.value;
length = (acpi_size) operand[2]->integer.value;
/*
* If the index is beyond the length of the String/Buffer, or if the
......@@ -180,12 +179,12 @@ acpi_ex_opcode_3A_1T_1R (
if ((index + length) >
operand[0]->string.length) {
length = (ACPI_SIZE) operand[0]->string.length - index;
length = (acpi_size) operand[0]->string.length - index;
}
/* Allocate a new buffer for the String/Buffer */
buffer = ACPI_MEM_CALLOCATE ((ACPI_SIZE) length + 1);
buffer = ACPI_MEM_CALLOCATE ((acpi_size) length + 1);
if (!buffer) {
status = AE_NO_MEMORY;
goto cleanup;
......
drivers/acpi/executer/exoparg6.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exoparg6 - AML execution - opcodes with 6 arguments
* $Revision: 11 $
*
*****************************************************************************/
......
drivers/acpi/executer/exprep.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exprep - ACPI AML (p-code) execution - field prep utilities
* $Revision: 121 $
*
*****************************************************************************/
......@@ -297,7 +296,7 @@ acpi_ex_prep_common_field_object (
acpi_status
acpi_ex_prep_field_value (
ACPI_CREATE_FIELD_INFO *info)
acpi_create_field_info *info)
{
acpi_operand_object *obj_desc;
u32 type;
......
drivers/acpi/executer/exregion.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exregion - ACPI default Op_region (address space) handlers
* $Revision: 81 $
*
*****************************************************************************/
......@@ -54,7 +53,7 @@
acpi_status
acpi_ex_system_memory_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -64,7 +63,7 @@ acpi_ex_system_memory_space_handler (
void *logical_addr_ptr = NULL;
acpi_mem_space_context *mem_info = region_context;
u32 length;
ACPI_SIZE window_size;
acpi_size window_size;
#ifndef _HW_ALIGNMENT_SUPPORT
u32 remainder;
#endif
......@@ -132,7 +131,7 @@ acpi_ex_system_memory_space_handler (
* Don't attempt to map memory beyond the end of the region, and
* constrain the maximum mapping size to something reasonable.
*/
window_size = (ACPI_SIZE) ((mem_info->address + mem_info->length) - address);
window_size = (acpi_size) ((mem_info->address + mem_info->length) - address);
if (window_size > ACPI_SYSMEM_REGION_WINDOW_SIZE) {
window_size = ACPI_SYSMEM_REGION_WINDOW_SIZE;
}
......@@ -258,7 +257,7 @@ acpi_ex_system_memory_space_handler (
acpi_status
acpi_ex_system_io_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -280,12 +279,12 @@ acpi_ex_system_io_space_handler (
case ACPI_READ:
*value = 0;
status = acpi_os_read_port ((ACPI_IO_ADDRESS) address, value, bit_width);
status = acpi_os_read_port ((acpi_io_address) address, value, bit_width);
break;
case ACPI_WRITE:
status = acpi_os_write_port ((ACPI_IO_ADDRESS) address, *value, bit_width);
status = acpi_os_write_port ((acpi_io_address) address, *value, bit_width);
break;
default:
......@@ -318,7 +317,7 @@ acpi_ex_system_io_space_handler (
acpi_status
acpi_ex_pci_config_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -395,7 +394,7 @@ acpi_ex_pci_config_space_handler (
acpi_status
acpi_ex_cmos_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -432,7 +431,7 @@ acpi_ex_cmos_space_handler (
acpi_status
acpi_ex_pci_bar_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -469,7 +468,7 @@ acpi_ex_pci_bar_space_handler (
acpi_status
acpi_ex_data_table_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......
drivers/acpi/executer/exresnte.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exresnte - AML Interpreter object resolution
* $Revision: 61 $
*
*****************************************************************************/
......
drivers/acpi/executer/exresolv.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exresolv - AML Interpreter object resolution
* $Revision: 118 $
*
*****************************************************************************/
......
drivers/acpi/executer/exresop.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exresop - AML Interpreter operand/object resolution
* $Revision: 60 $
*
*****************************************************************************/
......
drivers/acpi/executer/exstore.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exstore - AML Interpreter object store support
* $Revision: 174 $
*
*****************************************************************************/
......
drivers/acpi/executer/exstoren.c
View file @ 82015ca1
......@@ -3,7 +3,6 @@
*
* Module Name: exstoren - AML Interpreter object store support,
* Store to Node (namespace object)
* $Revision: 54 $
*
*****************************************************************************/
......
drivers/acpi/executer/exstorob.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exstorob - AML Interpreter object store support, store to object
* $Revision: 49 $
*
*****************************************************************************/
......@@ -148,7 +147,7 @@ acpi_ex_store_string_to_string (
* String will fit in existing non-static buffer.
* Clear old string and copy in the new one
*/
ACPI_MEMSET (target_desc->string.pointer, 0, (ACPI_SIZE) target_desc->string.length + 1);
ACPI_MEMSET (target_desc->string.pointer, 0, (acpi_size) target_desc->string.length + 1);
ACPI_MEMCPY (target_desc->string.pointer, buffer, length);
}
else {
......@@ -164,7 +163,7 @@ acpi_ex_store_string_to_string (
ACPI_MEM_FREE (target_desc->string.pointer);
}
target_desc->string.pointer = ACPI_MEM_CALLOCATE ((ACPI_SIZE) length + 1);
target_desc->string.pointer = ACPI_MEM_CALLOCATE ((acpi_size) length + 1);
if (!target_desc->string.pointer) {
return_ACPI_STATUS (AE_NO_MEMORY);
}
......
drivers/acpi/executer/exsystem.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exsystem - Interface to OS services
* $Revision: 74 $
*
*****************************************************************************/
......
drivers/acpi/executer/exutils.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: exutils - interpreter/scanner utilities
* $Revision: 107 $
*
*****************************************************************************/
......
drivers/acpi/hardware/hwacpi.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: hwacpi - ACPI Hardware Initialization/Mode Interface
* $Revision: 61 $
*
*****************************************************************************/
......
drivers/acpi/hardware/hwgpe.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: hwgpe - Low level GPE enable/disable/clear functions
* $Revision: 42 $
*
*****************************************************************************/
......@@ -296,7 +295,7 @@ acpi_hw_get_gpe_status (
u32 in_byte = 0;
u32 register_index = 0;
u8 bit_mask = 0;
ACPI_GPE_REGISTER_INFO *gpe_register_info;
acpi_gpe_register_info *gpe_register_info;
acpi_status status;
......@@ -370,7 +369,7 @@ acpi_hw_disable_non_wakeup_gpes (
void)
{
u32 i;
ACPI_GPE_REGISTER_INFO *gpe_register_info;
acpi_gpe_register_info *gpe_register_info;
u32 in_value;
acpi_status status;
......@@ -423,7 +422,7 @@ acpi_hw_enable_non_wakeup_gpes (
void)
{
u32 i;
ACPI_GPE_REGISTER_INFO *gpe_register_info;
acpi_gpe_register_info *gpe_register_info;
acpi_status status;
......
drivers/acpi/hardware/hwregs.c
View file @ 82015ca1
......@@ -3,7 +3,6 @@
*
* Module Name: hwregs - Read/write access functions for the various ACPI
* control and status registers.
* $Revision: 138 $
*
******************************************************************************/
......@@ -48,8 +47,8 @@
acpi_status
acpi_hw_clear_acpi_status (void)
{
NATIVE_UINT_MAX32 i;
NATIVE_UINT gpe_block;
acpi_native_uint i;
acpi_native_uint gpe_block;
acpi_status status;
......@@ -87,7 +86,7 @@ acpi_hw_clear_acpi_status (void)
for (gpe_block = 0; gpe_block < ACPI_MAX_GPE_BLOCKS; gpe_block++) {
for (i = 0; i < acpi_gbl_gpe_block_info[gpe_block].register_count; i++) {
status = acpi_hw_low_level_write (8, 0xFF,
acpi_gbl_gpe_block_info[gpe_block].block_address, i);
acpi_gbl_gpe_block_info[gpe_block].block_address, (u32) i);
if (ACPI_FAILURE (status)) {
goto unlock_and_exit;
}
......@@ -208,7 +207,7 @@ acpi_get_sleep_type_data (
*
******************************************************************************/
ACPI_BIT_REGISTER_INFO *
acpi_bit_register_info *
acpi_hw_get_bit_register_info (
u32 register_id)
{
......@@ -245,7 +244,7 @@ acpi_get_register (
u32 flags)
{
u32 register_value = 0;
ACPI_BIT_REGISTER_INFO *bit_reg_info;
acpi_bit_register_info *bit_reg_info;
acpi_status status;
......@@ -310,7 +309,7 @@ acpi_set_register (
u32 flags)
{
u32 register_value = 0;
ACPI_BIT_REGISTER_INFO *bit_reg_info;
acpi_bit_register_info *bit_reg_info;
acpi_status status;
......@@ -684,8 +683,8 @@ acpi_hw_low_level_read (
acpi_generic_address *reg,
u32 offset)
{
ACPI_PHYSICAL_ADDRESS mem_address;
ACPI_IO_ADDRESS io_address;
acpi_physical_address mem_address;
acpi_io_address io_address;
acpi_pci_id pci_id;
u16 pci_register;
acpi_status status;
......@@ -713,7 +712,7 @@ acpi_hw_low_level_read (
case ACPI_ADR_SPACE_SYSTEM_MEMORY:
mem_address = (reg->address
+ (ACPI_PHYSICAL_ADDRESS) offset);
+ (acpi_physical_address) offset);
status = acpi_os_read_memory (mem_address, value, width);
break;
......@@ -721,8 +720,8 @@ acpi_hw_low_level_read (
case ACPI_ADR_SPACE_SYSTEM_IO:
io_address = (ACPI_IO_ADDRESS) (reg->address
+ (ACPI_PHYSICAL_ADDRESS) offset);
io_address = (acpi_io_address) (reg->address
+ (acpi_physical_address) offset);
status = acpi_os_read_port (io_address, value, width);
break;
......@@ -774,8 +773,8 @@ acpi_hw_low_level_write (
acpi_generic_address *reg,
u32 offset)
{
ACPI_PHYSICAL_ADDRESS mem_address;
ACPI_IO_ADDRESS io_address;
acpi_physical_address mem_address;
acpi_io_address io_address;
acpi_pci_id pci_id;
u16 pci_register;
acpi_status status;
......@@ -801,7 +800,7 @@ acpi_hw_low_level_write (
case ACPI_ADR_SPACE_SYSTEM_MEMORY:
mem_address = (reg->address
+ (ACPI_PHYSICAL_ADDRESS) offset);
+ (acpi_physical_address) offset);
status = acpi_os_write_memory (mem_address, (acpi_integer) value, width);
break;
......@@ -809,8 +808,8 @@ acpi_hw_low_level_write (
case ACPI_ADR_SPACE_SYSTEM_IO:
io_address = (ACPI_IO_ADDRESS) (reg->address
+ (ACPI_PHYSICAL_ADDRESS) offset);
io_address = (acpi_io_address) (reg->address
+ (acpi_physical_address) offset);
status = acpi_os_write_port (io_address, (acpi_integer) value, width);
break;
......
drivers/acpi/hardware/hwsleep.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Name: hwsleep.c - ACPI Hardware Sleep/Wake Interface
* $Revision: 48 $
*
*****************************************************************************/
......@@ -45,7 +44,7 @@
acpi_status
acpi_set_firmware_waking_vector (
ACPI_PHYSICAL_ADDRESS physical_address)
acpi_physical_address physical_address)
{
ACPI_FUNCTION_TRACE ("Acpi_set_firmware_waking_vector");
......@@ -82,7 +81,7 @@ acpi_set_firmware_waking_vector (
acpi_status
acpi_get_firmware_waking_vector (
ACPI_PHYSICAL_ADDRESS *physical_address)
acpi_physical_address *physical_address)
{
ACPI_FUNCTION_TRACE ("Acpi_get_firmware_waking_vector");
......@@ -95,7 +94,7 @@ acpi_get_firmware_waking_vector (
/* Get the vector */
if (acpi_gbl_common_fACS.vector_width == 32) {
*physical_address = (ACPI_PHYSICAL_ADDRESS)
*physical_address = (acpi_physical_address)
*(ACPI_CAST_PTR (u32, acpi_gbl_common_fACS.firmware_waking_vector));
}
else {
......@@ -186,8 +185,8 @@ acpi_enter_sleep_state (
{
u32 PM1Acontrol;
u32 PM1Bcontrol;
ACPI_BIT_REGISTER_INFO *sleep_type_reg_info;
ACPI_BIT_REGISTER_INFO *sleep_enable_reg_info;
acpi_bit_register_info *sleep_type_reg_info;
acpi_bit_register_info *sleep_enable_reg_info;
u32 in_value;
acpi_status status;
......
drivers/acpi/hardware/hwtimer.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Name: hwtimer.c - ACPI Power Management Timer Interface
* $Revision: 21 $
*
*****************************************************************************/
......
drivers/acpi/include/acconfig.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
* $Revision: 123 $
*
*****************************************************************************/
......
drivers/acpi/include/acdebug.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acdebug.h - ACPI/AML debugger
* $Revision: 65 $
*
*****************************************************************************/
......
drivers/acpi/include/acdispat.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acdispat.h - dispatcher (parser to interpreter interface)
* $Revision: 55 $
*
*****************************************************************************/
......@@ -146,7 +145,7 @@ acpi_ds_exec_end_op (
acpi_status
acpi_ds_get_field_names (
ACPI_CREATE_FIELD_INFO *info,
acpi_create_field_info *info,
acpi_walk_state *walk_state,
acpi_parse_object *arg);
......@@ -282,7 +281,7 @@ acpi_ds_parse_method (
acpi_status
acpi_ds_call_control_method (
ACPI_THREAD_STATE *thread,
acpi_thread_state *thread,
acpi_walk_state *walk_state,
acpi_parse_object *op);
......@@ -410,7 +409,7 @@ acpi_ds_create_walk_state (
acpi_owner_id owner_id,
acpi_parse_object *origin,
acpi_operand_object *mth_desc,
ACPI_THREAD_STATE *thread);
acpi_thread_state *thread);
acpi_status
acpi_ds_init_aml_walk (
......@@ -438,12 +437,12 @@ acpi_ds_delete_walk_state (
acpi_walk_state *
acpi_ds_pop_walk_state (
ACPI_THREAD_STATE *thread);
acpi_thread_state *thread);
void
acpi_ds_push_walk_state (
acpi_walk_state *walk_state,
ACPI_THREAD_STATE *thread);
acpi_thread_state *thread);
acpi_status
acpi_ds_result_stack_pop (
......@@ -459,7 +458,7 @@ acpi_ds_result_stack_clear (
acpi_walk_state *
acpi_ds_get_current_walk_state (
ACPI_THREAD_STATE *thread);
acpi_thread_state *thread);
void
acpi_ds_delete_walk_state_cache (
......
drivers/acpi/include/acevents.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acevents.h - Event subcomponent prototypes and defines
* $Revision: 80 $
*
*****************************************************************************/
......@@ -123,7 +122,7 @@ acpi_status
acpi_ev_address_space_dispatch (
acpi_operand_object *region_obj,
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
void *value);
......
drivers/acpi/include/acexcep.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acexcep.h - Exception codes returned by the ACPI subsystem
* $Revision: 66 $
*
*****************************************************************************/
......
drivers/acpi/include/acglobal.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acglobal.h - Declarations for global variables
* $Revision: 135 $
*
*****************************************************************************/
......@@ -73,7 +72,7 @@ extern u32 acpi_gbl_nesting_level;
*/
ACPI_EXTERN u32 acpi_gbl_table_flags;
ACPI_EXTERN u32 acpi_gbl_rsdt_table_count;
ACPI_EXTERN RSDP_DESCRIPTOR *acpi_gbl_RSDP;
ACPI_EXTERN rsdp_descriptor *acpi_gbl_RSDP;
ACPI_EXTERN xsdt_descriptor *acpi_gbl_XSDT;
ACPI_EXTERN FADT_DESCRIPTOR *acpi_gbl_FADT;
ACPI_EXTERN acpi_table_header *acpi_gbl_DSDT;
......@@ -115,10 +114,10 @@ ACPI_EXTERN acpi_mutex_info acpi_gbl_acpi_mutex_info [NUM_MTX];
****************************************************************************/
ACPI_EXTERN ACPI_MEMORY_LIST acpi_gbl_memory_lists[ACPI_NUM_MEM_LISTS];
ACPI_EXTERN ACPI_OBJECT_NOTIFY_HANDLER acpi_gbl_drv_notify;
ACPI_EXTERN ACPI_OBJECT_NOTIFY_HANDLER acpi_gbl_sys_notify;
ACPI_EXTERN ACPI_INIT_HANDLER acpi_gbl_init_handler;
ACPI_EXTERN acpi_memory_list acpi_gbl_memory_lists[ACPI_NUM_MEM_LISTS];
ACPI_EXTERN acpi_object_notify_handler acpi_gbl_drv_notify;
ACPI_EXTERN acpi_object_notify_handler acpi_gbl_sys_notify;
ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler;
ACPI_EXTERN acpi_walk_state *acpi_gbl_breakpoint_walk;
ACPI_EXTERN acpi_handle acpi_gbl_global_lock_semaphore;
......@@ -170,8 +169,8 @@ extern const acpi_predefined_names acpi_gbl_pre_defined_names [NUM_PREDEFIN
ACPI_EXTERN u32 acpi_gbl_current_node_count;
ACPI_EXTERN u32 acpi_gbl_current_node_size;
ACPI_EXTERN u32 acpi_gbl_max_concurrent_node_count;
ACPI_EXTERN ACPI_SIZE acpi_gbl_entry_stack_pointer;
ACPI_EXTERN ACPI_SIZE acpi_gbl_lowest_stack_pointer;
ACPI_EXTERN acpi_size acpi_gbl_entry_stack_pointer;
ACPI_EXTERN acpi_size acpi_gbl_lowest_stack_pointer;
ACPI_EXTERN u32 acpi_gbl_deepest_nesting;
#endif
......@@ -182,7 +181,7 @@ ACPI_EXTERN u32 acpi_gbl_deepest_nesting;
****************************************************************************/
ACPI_EXTERN ACPI_THREAD_STATE *acpi_gbl_current_walk_list;
ACPI_EXTERN acpi_thread_state *acpi_gbl_current_walk_list;
/* Control method single step flag */
......@@ -203,7 +202,7 @@ ACPI_EXTERN acpi_parse_object *acpi_gbl_parsed_namespace_root;
*
****************************************************************************/
extern ACPI_BIT_REGISTER_INFO acpi_gbl_bit_register_info[ACPI_NUM_BITREG];
extern acpi_bit_register_info acpi_gbl_bit_register_info[ACPI_NUM_BITREG];
ACPI_EXTERN u8 acpi_gbl_sleep_type_a;
ACPI_EXTERN u8 acpi_gbl_sleep_type_b;
......@@ -215,14 +214,14 @@ ACPI_EXTERN u8 acpi_gbl_sleep_type_b;
****************************************************************************/
extern acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];
ACPI_EXTERN ACPI_FIXED_EVENT_HANDLER acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
ACPI_EXTERN acpi_fixed_event_handler acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
ACPI_EXTERN acpi_handle acpi_gbl_gpe_obj_handle;
ACPI_EXTERN u32 acpi_gbl_gpe_register_count;
ACPI_EXTERN u32 acpi_gbl_gpe_number_max;
ACPI_EXTERN ACPI_GPE_REGISTER_INFO *acpi_gbl_gpe_register_info;
ACPI_EXTERN ACPI_GPE_NUMBER_INFO *acpi_gbl_gpe_number_info;
ACPI_EXTERN ACPI_GPE_BLOCK_INFO acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLOCKS];
ACPI_EXTERN acpi_gpe_register_info *acpi_gbl_gpe_register_info;
ACPI_EXTERN acpi_gpe_number_info *acpi_gbl_gpe_number_info;
ACPI_EXTERN acpi_gpe_block_info acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLOCKS];
/*
* GPE translation table
......@@ -231,7 +230,7 @@ ACPI_EXTERN ACPI_GPE_BLOCK_INFO acpi_gbl_gpe_block_info[ACPI_MAX_GPE_BLO
* This table is needed because the GPE numbers supported by block 1 do not
* have to be contiguous with the GPE numbers supported by block 0.
*/
ACPI_EXTERN ACPI_GPE_INDEX_INFO *acpi_gbl_gpe_number_to_index;
ACPI_EXTERN acpi_gpe_index_info *acpi_gbl_gpe_number_to_index;
/*****************************************************************************
......
drivers/acpi/include/achware.h
View file @ 82015ca1
/******************************************************************************
*
* Name: achware.h -- hardware specific interfaces
* $Revision: 60 $
*
*****************************************************************************/
......@@ -60,7 +59,7 @@ acpi_hw_get_mode_capabilities (
/* Register I/O Prototypes */
ACPI_BIT_REGISTER_INFO *
acpi_bit_register_info *
acpi_hw_get_bit_register_info (
u32 register_id);
......
drivers/acpi/include/acinterp.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acinterp.h - Interpreter subcomponent prototypes and defines
* $Revision: 144 $
*
*****************************************************************************/
......@@ -310,7 +309,7 @@ acpi_ex_release_mutex (
void
acpi_ex_release_all_mutexes (
ACPI_THREAD_STATE *thread);
acpi_thread_state *thread);
void
acpi_ex_unlink_mutex (
......@@ -319,7 +318,7 @@ acpi_ex_unlink_mutex (
void
acpi_ex_link_mutex (
acpi_operand_object *obj_desc,
ACPI_THREAD_STATE *thread);
acpi_thread_state *thread);
/*
* exprep - ACPI AML (p-code) execution - prep utilities
......@@ -335,7 +334,7 @@ acpi_ex_prep_common_field_object (
acpi_status
acpi_ex_prep_field_value (
ACPI_CREATE_FIELD_INFO *info);
acpi_create_field_info *info);
/*
* exsystem - Interface to OS services
......@@ -489,7 +488,7 @@ acpi_ex_out_integer (
void
acpi_ex_out_address (
char *title,
ACPI_PHYSICAL_ADDRESS value);
acpi_physical_address value);
/*
......@@ -645,7 +644,7 @@ acpi_ex_unsigned_integer_to_string (
acpi_status
acpi_ex_system_memory_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -654,7 +653,7 @@ acpi_ex_system_memory_space_handler (
acpi_status
acpi_ex_system_io_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -663,7 +662,7 @@ acpi_ex_system_io_space_handler (
acpi_status
acpi_ex_pci_config_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -672,7 +671,7 @@ acpi_ex_pci_config_space_handler (
acpi_status
acpi_ex_cmos_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -681,7 +680,7 @@ acpi_ex_cmos_space_handler (
acpi_status
acpi_ex_pci_bar_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -690,7 +689,7 @@ acpi_ex_pci_bar_space_handler (
acpi_status
acpi_ex_embedded_controller_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -699,7 +698,7 @@ acpi_ex_embedded_controller_space_handler (
acpi_status
acpi_ex_sm_bus_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......@@ -709,7 +708,7 @@ acpi_ex_sm_bus_space_handler (
acpi_status
acpi_ex_data_table_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......
drivers/acpi/include/aclocal.h
View file @ 82015ca1
/******************************************************************************
*
* Name: aclocal.h - Internal data types used across the ACPI subsystem
* $Revision: 183 $
*
*****************************************************************************/
......@@ -30,7 +29,7 @@
#define ACPI_WAIT_FOREVER 0xFFFF /* u16, as per ACPI spec */
typedef void* acpi_mutex;
typedef u32 ACPI_MUTEX_HANDLE;
typedef u32 acpi_mutex_handle;
/* Total number of aml opcodes defined */
......@@ -168,14 +167,14 @@ typedef union acpi_name_union
{
u32 integer;
char ascii[4];
} ACPI_NAME_UNION;
} acpi_name_union;
typedef struct acpi_node
{
u8 descriptor; /* Used to differentiate object descriptor types */
u8 type; /* Type associated with this name */
u16 owner_id;
ACPI_NAME_UNION name; /* ACPI Name, always 4 chars per ACPI spec */
acpi_name_union name; /* ACPI Name, always 4 chars per ACPI spec */
union acpi_operand_obj *object; /* Pointer to attached ACPI object (optional) */
......@@ -215,7 +214,7 @@ typedef struct acpi_table_desc
u8 *aml_start;
u64 physical_address;
u32 aml_length;
ACPI_SIZE length;
acpi_size length;
u32 count;
acpi_owner_id table_id;
u8 type;
......@@ -288,7 +287,7 @@ typedef struct
u8 attribute;
u8 field_type;
} ACPI_CREATE_FIELD_INFO;
} acpi_create_field_info;
/*****************************************************************************
......@@ -305,7 +304,7 @@ typedef struct
u16 register_count;
u8 block_base_number;
} ACPI_GPE_BLOCK_INFO;
} acpi_gpe_block_info;
/* Information about a particular GPE register pair */
......@@ -318,7 +317,7 @@ typedef struct
u8 wake_enable; /* Mask of bits to keep enabled when sleeping */
u8 base_gpe_number; /* Base GPE number for this register */
} ACPI_GPE_REGISTER_INFO;
} acpi_gpe_register_info;
#define ACPI_GPE_LEVEL_TRIGGERED 1
......@@ -336,14 +335,14 @@ typedef struct
u8 bit_mask;
} ACPI_GPE_NUMBER_INFO;
} acpi_gpe_number_info;
typedef struct
{
u8 number_index;
} ACPI_GPE_INDEX_INFO;
} acpi_gpe_index_info;
/* Information about each particular fixed event */
......@@ -352,7 +351,7 @@ typedef struct
acpi_event_handler handler; /* Address of handler. */
void *context; /* Context to be passed to handler */
} ACPI_FIXED_EVENT_HANDLER;
} acpi_fixed_event_handler;
typedef struct
......@@ -486,7 +485,7 @@ typedef struct acpi_thread_state
u32 thread_id; /* Running thread ID */
u16 current_sync_level; /* Mutex Sync (nested acquire) level */
} ACPI_THREAD_STATE;
} acpi_thread_state;
/*
......@@ -536,7 +535,7 @@ typedef union acpi_gen_state
acpi_scope_state scope;
acpi_pscope_state parse_scope;
acpi_pkg_state pkg;
ACPI_THREAD_STATE thread;
acpi_thread_state thread;
acpi_result_values results;
acpi_notify_info notify;
......@@ -622,7 +621,7 @@ typedef union acpi_parse_val
typedef struct acpi_parseobj_common
{
ACPI_PARSE_COMMON
} ACPI_PARSE_OBJ_COMMON;
} acpi_parse_obj_common;
/*
......@@ -637,7 +636,7 @@ typedef struct acpi_parseobj_named
u32 length; /* AML length */
u32 name; /* 4-byte name or zero if no name */
} ACPI_PARSE_OBJ_NAMED;
} acpi_parse_obj_named;
/* The parse node is the fundamental element of the parse tree */
......@@ -673,14 +672,14 @@ typedef struct acpi_parseobj_asl
u8 extra;
char parse_op_name[12];
} ACPI_PARSE_OBJ_ASL;
} acpi_parse_obj_asl;
typedef union acpi_parse_obj
{
ACPI_PARSE_OBJ_COMMON common;
ACPI_PARSE_OBJ_NAMED named;
ACPI_PARSE_OBJ_ASL asl;
acpi_parse_obj_common common;
acpi_parse_obj_named named;
acpi_parse_obj_asl asl;
} acpi_parse_object;
......@@ -735,7 +734,7 @@ typedef struct
u8 bit_position;
u16 access_bit_mask;
} ACPI_BIT_REGISTER_INFO;
} acpi_bit_register_info;
/*
......@@ -981,7 +980,7 @@ typedef struct
char *list_name;
#endif
} ACPI_MEMORY_LIST;
} acpi_memory_list;
#endif /* __ACLOCAL_H__ */
drivers/acpi/include/acmacros.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acmacros.h - C macros for the entire subsystem.
* $Revision: 135 $
*
*****************************************************************************/
......@@ -71,7 +70,7 @@
#define ACPI_HIDWORD(l) ((u32)(((*(uint64_struct *)(void *)(&l))).hi))
#define ACPI_GET_ADDRESS(a) (a)
#define ACPI_STORE_ADDRESS(a,b) ((a)=(ACPI_PHYSICAL_ADDRESS)(b))
#define ACPI_STORE_ADDRESS(a,b) ((a)=(acpi_physical_address)(b))
#define ACPI_VALID_ADDRESS(a) (a)
#endif
#endif
......@@ -84,14 +83,14 @@
/* Pointer arithmetic */
#define ACPI_PTR_ADD(t,a,b) (t *) (void *)((char *)(a) + (NATIVE_UINT)(b))
#define ACPI_PTR_DIFF(a,b) (NATIVE_UINT) ((char *)(a) - (char *)(b))
#define ACPI_PTR_ADD(t,a,b) (t *) (void *)((char *)(a) + (acpi_native_uint)(b))
#define ACPI_PTR_DIFF(a,b) (acpi_native_uint) ((char *)(a) - (char *)(b))
/* Pointer/Integer type conversions */
#define ACPI_TO_POINTER(i) ACPI_PTR_ADD (void, (void *) NULL,(NATIVE_UINT)i)
#define ACPI_TO_POINTER(i) ACPI_PTR_ADD (void, (void *) NULL,(acpi_native_uint)i)
#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p,(void *) NULL)
#define ACPI_OFFSET(d,f) (ACPI_SIZE) ACPI_PTR_DIFF (&(((d *)0)->f),(void *) NULL)
#define ACPI_OFFSET(d,f) (acpi_size) ACPI_PTR_DIFF (&(((d *)0)->f),(void *) NULL)
#define ACPI_FADT_OFFSET(f) ACPI_OFFSET (FADT_DESCRIPTOR, f)
#define ACPI_CAST_PTR(t, p) ((t *)(void *)(p))
......@@ -178,8 +177,8 @@
/*
* Rounding macros (Power of two boundaries only)
*/
#define ACPI_ROUND_DOWN(value,boundary) (((NATIVE_UINT)(value)) & (~(((NATIVE_UINT) boundary)-1)))
#define ACPI_ROUND_UP(value,boundary) ((((NATIVE_UINT)(value)) + (((NATIVE_UINT) boundary)-1)) & (~(((NATIVE_UINT) boundary)-1)))
#define ACPI_ROUND_DOWN(value,boundary) (((acpi_native_uint)(value)) & (~(((acpi_native_uint) boundary)-1)))
#define ACPI_ROUND_UP(value,boundary) ((((acpi_native_uint)(value)) + (((acpi_native_uint) boundary)-1)) & (~(((acpi_native_uint) boundary)-1)))
#define ACPI_ROUND_DOWN_TO_32_BITS(a) ACPI_ROUND_DOWN(a,4)
#define ACPI_ROUND_DOWN_TO_64_BITS(a) ACPI_ROUND_DOWN(a,8)
......@@ -256,8 +255,8 @@
*
* The "Descriptor" field is the first field in both structures.
*/
#define ACPI_GET_DESCRIPTOR_TYPE(d) (((ACPI_DESCRIPTOR *)(void *)(d))->descriptor_id)
#define ACPI_SET_DESCRIPTOR_TYPE(d,t) (((ACPI_DESCRIPTOR *)(void *)(d))->descriptor_id = t)
#define ACPI_GET_DESCRIPTOR_TYPE(d) (((acpi_descriptor *)(void *)(d))->descriptor_id)
#define ACPI_SET_DESCRIPTOR_TYPE(d,t) (((acpi_descriptor *)(void *)(d))->descriptor_id = t)
/* Macro to test the object type */
......@@ -268,33 +267,17 @@
#define ACPI_IS_SINGLE_TABLE(x) (((x) & 0x01) == ACPI_TABLE_SINGLE ? 1 : 0)
/*
* Macro to check if a pointer is within an ACPI table.
* Parameter (a) is the pointer to check. Parameter (b) must be defined
* as a pointer to an acpi_table_header. (b+1) then points past the header,
* and ((u8 *)b+b->Length) points one byte past the end of the table.
*/
#if ACPI_MACHINE_WIDTH != 16
#define ACPI_IS_IN_ACPI_TABLE(a,b) (((u8 *)(a) >= (u8 *)(b + 1)) &&\
((u8 *)(a) < ((u8 *)b + b->length)))
#else
#define ACPI_IS_IN_ACPI_TABLE(a,b) (_segment)(a) == (_segment)(b) &&\
(((u8 *)(a) >= (u8 *)(b + 1)) &&\
((u8 *)(a) < ((u8 *)b + b->length)))
#endif
/*
* Macros for the master AML opcode table
*/
#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUG_OUTPUT)
#define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags) {name,Pargs,Iargs,flags,obj_type,class,type}
#define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags) {name,(u32)(Pargs),(u32)(Iargs),(u32)(flags),obj_type,class,type}
#else
#define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags) {Pargs,Iargs,flags,obj_type,class,type}
#define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags) {(u32)(Pargs),(u32)(Iargs),(u32)(flags),obj_type,class,type}
#endif
#ifdef ACPI_DISASSEMBLER
#define ACPI_DISASM_ONLY_MEMBERS(a) a;
#define ACPI_DISASM_ONLY_MEMBERS(a) a;
#else
#define ACPI_DISASM_ONLY_MEMBERS(a)
#endif
......@@ -335,10 +318,10 @@
* 5) Expand address to 64 bits
*/
#define ASL_BUILD_GAS_FROM_ENTRY(a,b,c,d) do {a.address_space_id = (u8) d;\
a.register_bit_width = (u8) ACPI_MUL_8 (b);\
a.register_bit_offset = 0;\
a.reserved = 0;\
ACPI_STORE_ADDRESS (a.address,(ACPI_PHYSICAL_ADDRESS) c);} while (0)
a.register_bit_width = (u8) ACPI_MUL_8 (b);\
a.register_bit_offset = 0;\
a.reserved = 0;\
ACPI_STORE_ADDRESS (a.address,(acpi_physical_address) c);} while (0)
/* ACPI V1.0 entries -- address space is always I/O */
......@@ -360,9 +343,9 @@
#ifdef ACPI_DEBUG_OUTPUT
#define ACPI_REPORT_INFO(fp) {acpi_ut_report_info(_THIS_MODULE,__LINE__,_COMPONENT); \
acpi_os_printf ACPI_PARAM_LIST(fp);}
acpi_os_printf ACPI_PARAM_LIST(fp);}
#define ACPI_REPORT_ERROR(fp) {acpi_ut_report_error(_THIS_MODULE,__LINE__,_COMPONENT); \
acpi_os_printf ACPI_PARAM_LIST(fp);}
acpi_os_printf ACPI_PARAM_LIST(fp);}
#define ACPI_REPORT_WARNING(fp) {acpi_ut_report_warning(_THIS_MODULE,__LINE__,_COMPONENT); \
acpi_os_printf ACPI_PARAM_LIST(fp);}
#define ACPI_REPORT_NSERROR(s,e) acpi_ns_report_error(_THIS_MODULE,__LINE__,_COMPONENT, s, e);
......@@ -572,8 +555,8 @@
/* Memory allocation */
#define ACPI_MEM_ALLOCATE(a) acpi_ut_allocate((ACPI_SIZE)(a),_COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_CALLOCATE(a) acpi_ut_callocate((ACPI_SIZE)(a), _COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_CALLOCATE(a) acpi_ut_callocate((acpi_size)(a), _COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_FREE(a) acpi_os_free(a)
#define ACPI_MEM_TRACKING(a)
......@@ -582,8 +565,8 @@
/* Memory allocation */
#define ACPI_MEM_ALLOCATE(a) acpi_ut_allocate_and_track((ACPI_SIZE)(a),_COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_CALLOCATE(a) acpi_ut_callocate_and_track((ACPI_SIZE)(a), _COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_ALLOCATE(a) acpi_ut_allocate_and_track((acpi_size)(a),_COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_CALLOCATE(a) acpi_ut_callocate_and_track((acpi_size)(a), _COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_FREE(a) acpi_ut_free_and_track(a,_COMPONENT,_THIS_MODULE,__LINE__)
#define ACPI_MEM_TRACKING(a) a
......
drivers/acpi/include/acnamesp.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acnamesp.h - Namespace subcomponent prototypes and defines
* $Revision: 132 $
*
*****************************************************************************/
......@@ -304,7 +303,7 @@ acpi_ns_opens_scope (
void
acpi_ns_build_external_path (
acpi_namespace_node *node,
ACPI_SIZE size,
acpi_size size,
char *name_buffer);
char *
......@@ -332,7 +331,7 @@ acpi_ns_get_node_by_path (
u32 flags,
acpi_namespace_node **out_node);
ACPI_SIZE
acpi_size
acpi_ns_get_pathname_length (
acpi_namespace_node *node);
......@@ -358,18 +357,18 @@ acpi_ns_get_secondary_object (
acpi_status
acpi_ns_attach_data (
acpi_namespace_node *node,
ACPI_OBJECT_HANDLER handler,
acpi_object_handler handler,
void *data);
acpi_status
acpi_ns_detach_data (
acpi_namespace_node *node,
ACPI_OBJECT_HANDLER handler);
acpi_object_handler handler);
acpi_status
acpi_ns_get_attached_data (
acpi_namespace_node *node,
ACPI_OBJECT_HANDLER handler,
acpi_object_handler handler,
void **data);
......
drivers/acpi/include/acobject.h
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Name: acobject.h - Definition of acpi_operand_object (Internal object only)
* $Revision: 115 $
*
*****************************************************************************/
......@@ -109,7 +108,7 @@ typedef struct acpi_object_common
{
ACPI_OBJECT_COMMON_HEADER
} ACPI_OBJECT_COMMON;
} acpi_object_common;
typedef struct acpi_object_integer
......@@ -118,7 +117,7 @@ typedef struct acpi_object_integer
acpi_integer value;
} ACPI_OBJECT_INTEGER;
} acpi_object_integer;
typedef struct acpi_object_string /* Null terminated, ASCII characters only */
......@@ -127,7 +126,7 @@ typedef struct acpi_object_string /* Null terminated, ASCII ch
ACPI_COMMON_BUFFER_INFO
char *pointer; /* String in AML stream or allocated string */
} ACPI_OBJECT_STRING;
} acpi_object_string;
typedef struct acpi_object_buffer
......@@ -139,7 +138,7 @@ typedef struct acpi_object_buffer
u8 *aml_start;
u32 aml_length;
} ACPI_OBJECT_BUFFER;
} acpi_object_buffer;
typedef struct acpi_object_package
......@@ -152,7 +151,7 @@ typedef struct acpi_object_package
acpi_namespace_node *node; /* Link back to parent node */
union acpi_operand_obj **elements; /* Array of pointers to Acpi_objects */
} ACPI_OBJECT_PACKAGE;
} acpi_object_package;
/******************************************************************************
......@@ -166,7 +165,7 @@ typedef struct acpi_object_event
ACPI_OBJECT_COMMON_HEADER
void *semaphore;
} ACPI_OBJECT_EVENT;
} acpi_object_event;
#define INFINITE_CONCURRENCY 0xFF
......@@ -186,7 +185,7 @@ typedef struct acpi_object_method
u8 thread_count;
acpi_owner_id owning_id;
} ACPI_OBJECT_METHOD;
} acpi_object_method;
typedef struct acpi_object_mutex
......@@ -201,7 +200,7 @@ typedef struct acpi_object_mutex
union acpi_operand_obj *next; /* Link for list of acquired mutexes */
acpi_namespace_node *node; /* containing object */
} ACPI_OBJECT_MUTEX;
} acpi_object_mutex;
typedef struct acpi_object_region
......@@ -214,9 +213,9 @@ typedef struct acpi_object_region
acpi_namespace_node *node; /* containing object */
union acpi_operand_obj *next;
u32 length;
ACPI_PHYSICAL_ADDRESS address;
acpi_physical_address address;
} ACPI_OBJECT_REGION;
} acpi_object_region;
/******************************************************************************
......@@ -230,7 +229,7 @@ typedef struct acpi_object_notify_common /* COMMON NOTIFY for POWER,
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_NOTIFY_INFO
} ACPI_OBJECT_NOTIFY_COMMON;
} acpi_object_notify_common;
typedef struct acpi_object_device
......@@ -238,7 +237,7 @@ typedef struct acpi_object_device
ACPI_OBJECT_COMMON_HEADER
ACPI_COMMON_NOTIFY_INFO
} ACPI_OBJECT_DEVICE;
} acpi_object_device;
typedef struct acpi_object_power_resource
......@@ -249,7 +248,7 @@ typedef struct acpi_object_power_resource
u32 system_level;
u32 resource_order;
} ACPI_OBJECT_POWER_RESOURCE;
} acpi_object_power_resource;
typedef struct acpi_object_processor
......@@ -259,9 +258,9 @@ typedef struct acpi_object_processor
u32 proc_id;
u32 length;
ACPI_IO_ADDRESS address;
acpi_io_address address;
} ACPI_OBJECT_PROCESSOR;
} acpi_object_processor;
typedef struct acpi_object_thermal_zone
......@@ -270,7 +269,7 @@ typedef struct acpi_object_thermal_zone
ACPI_COMMON_NOTIFY_INFO
} ACPI_OBJECT_THERMAL_ZONE;
} acpi_object_thermal_zone;
/******************************************************************************
......@@ -285,7 +284,7 @@ typedef struct acpi_object_field_common /* COMMON FIELD (for BUFFER,
ACPI_COMMON_FIELD_INFO
union acpi_operand_obj *region_obj; /* Containing Operation Region object */
/* (REGION/BANK fields only) */
} ACPI_OBJECT_FIELD_COMMON;
} acpi_object_field_common;
typedef struct acpi_object_region_field
......@@ -294,7 +293,7 @@ typedef struct acpi_object_region_field
ACPI_COMMON_FIELD_INFO
union acpi_operand_obj *region_obj; /* Containing Op_region object */
} ACPI_OBJECT_REGION_FIELD;
} acpi_object_region_field;
typedef struct acpi_object_bank_field
......@@ -305,7 +304,7 @@ typedef struct acpi_object_bank_field
union acpi_operand_obj *region_obj; /* Containing Op_region object */
union acpi_operand_obj *bank_obj; /* Bank_select Register object */
} ACPI_OBJECT_BANK_FIELD;
} acpi_object_bank_field;
typedef struct acpi_object_index_field
......@@ -321,7 +320,7 @@ typedef struct acpi_object_index_field
union acpi_operand_obj *data_obj; /* Data register */
} ACPI_OBJECT_INDEX_FIELD;
} acpi_object_index_field;
/* The Buffer_field is different in that it is part of a Buffer, not an Op_region */
......@@ -333,7 +332,7 @@ typedef struct acpi_object_buffer_field
union acpi_operand_obj *buffer_obj; /* Containing Buffer object */
} ACPI_OBJECT_BUFFER_FIELD;
} acpi_object_buffer_field;
/******************************************************************************
......@@ -350,7 +349,7 @@ typedef struct acpi_object_notify_handler
acpi_notify_handler handler;
void *context;
} ACPI_OBJECT_NOTIFY_HANDLER;
} acpi_object_notify_handler;
/* Flags for address handler */
......@@ -372,7 +371,7 @@ typedef struct acpi_object_addr_handler
union acpi_operand_obj *region_list; /* regions using this handler */
union acpi_operand_obj *next;
} ACPI_OBJECT_ADDR_HANDLER;
} acpi_object_addr_handler;
/******************************************************************************
......@@ -397,7 +396,7 @@ typedef struct acpi_object_reference
acpi_namespace_node *node;
union acpi_operand_obj **where;
} ACPI_OBJECT_REFERENCE;
} acpi_object_reference;
/*
......@@ -417,7 +416,7 @@ typedef struct acpi_object_extra
acpi_namespace_node *method_REG; /* _REG method for this region (if any) */
void *region_context; /* Region-specific data */
} ACPI_OBJECT_EXTRA;
} acpi_object_extra;
/* Additional data that can be attached to namespace nodes */
......@@ -425,10 +424,10 @@ typedef struct acpi_object_extra
typedef struct acpi_object_data
{
ACPI_OBJECT_COMMON_HEADER
ACPI_OBJECT_HANDLER handler;
acpi_object_handler handler;
void *pointer;
} ACPI_OBJECT_DATA;
} acpi_object_data;
/* Structure used when objects are cached for reuse */
......@@ -438,7 +437,7 @@ typedef struct acpi_object_cache_list
ACPI_OBJECT_COMMON_HEADER
union acpi_operand_obj *next; /* Link for object cache and internal lists*/
} ACPI_OBJECT_CACHE_LIST;
} acpi_object_cache_list;
/******************************************************************************
......@@ -449,44 +448,44 @@ typedef struct acpi_object_cache_list
typedef union acpi_operand_obj
{
ACPI_OBJECT_COMMON common;
ACPI_OBJECT_INTEGER integer;
ACPI_OBJECT_STRING string;
ACPI_OBJECT_BUFFER buffer;
ACPI_OBJECT_PACKAGE package;
ACPI_OBJECT_EVENT event;
ACPI_OBJECT_METHOD method;
ACPI_OBJECT_MUTEX mutex;
ACPI_OBJECT_REGION region;
ACPI_OBJECT_NOTIFY_COMMON common_notify;
ACPI_OBJECT_DEVICE device;
ACPI_OBJECT_POWER_RESOURCE power_resource;
ACPI_OBJECT_PROCESSOR processor;
ACPI_OBJECT_THERMAL_ZONE thermal_zone;
ACPI_OBJECT_FIELD_COMMON common_field;
ACPI_OBJECT_REGION_FIELD field;
ACPI_OBJECT_BUFFER_FIELD buffer_field;
ACPI_OBJECT_BANK_FIELD bank_field;
ACPI_OBJECT_INDEX_FIELD index_field;
ACPI_OBJECT_NOTIFY_HANDLER notify_handler;
ACPI_OBJECT_ADDR_HANDLER addr_handler;
ACPI_OBJECT_REFERENCE reference;
ACPI_OBJECT_EXTRA extra;
ACPI_OBJECT_DATA data;
ACPI_OBJECT_CACHE_LIST cache;
acpi_object_common common;
acpi_object_integer integer;
acpi_object_string string;
acpi_object_buffer buffer;
acpi_object_package package;
acpi_object_event event;
acpi_object_method method;
acpi_object_mutex mutex;
acpi_object_region region;
acpi_object_notify_common common_notify;
acpi_object_device device;
acpi_object_power_resource power_resource;
acpi_object_processor processor;
acpi_object_thermal_zone thermal_zone;
acpi_object_field_common common_field;
acpi_object_region_field field;
acpi_object_buffer_field buffer_field;
acpi_object_bank_field bank_field;
acpi_object_index_field index_field;
acpi_object_notify_handler notify_handler;
acpi_object_addr_handler addr_handler;
acpi_object_reference reference;
acpi_object_extra extra;
acpi_object_data data;
acpi_object_cache_list cache;
} acpi_operand_object;
/******************************************************************************
*
* ACPI_DESCRIPTOR - objects that share a common descriptor identifier
* acpi_descriptor - objects that share a common descriptor identifier
*
*****************************************************************************/
......@@ -517,7 +516,7 @@ typedef union acpi_desc
acpi_namespace_node node;
acpi_parse_object op;
} ACPI_DESCRIPTOR;
} acpi_descriptor;
#endif /* _ACOBJECT_H */
drivers/acpi/include/acoutput.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acoutput.h -- debug output
* $Revision: 91 $
*
*****************************************************************************/
......@@ -118,7 +117,7 @@
/*
* Debug level macros that are used in the DEBUG_PRINT macros
*/
#define ACPI_DEBUG_LEVEL(dl) dl,__LINE__,&_dbg
#define ACPI_DEBUG_LEVEL(dl) (u32) dl,__LINE__,&_dbg
/* Exception level -- used in the global "Debug_level" */
......
drivers/acpi/include/acparser.h
View file @ 82015ca1
/******************************************************************************
*
* Module Name: acparser.h - AML Parser subcomponent prototypes and defines
* $Revision: 64 $
*
*****************************************************************************/
......
drivers/acpi/include/acpi.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acpi.h - Master include file, Publics and external data.
* $Revision: 55 $
*
*****************************************************************************/
......
drivers/acpi/include/acpiosxf.h
View file @ 82015ca1
......@@ -55,7 +55,7 @@ typedef struct acpi_fatal_info
u32 code;
u32 argument;
} ACPI_SIGNAL_FATAL_INFO;
} acpi_signal_fatal_info;
/*
......@@ -91,7 +91,7 @@ acpi_os_terminate (
acpi_status
acpi_os_get_root_pointer (
u32 flags,
ACPI_POINTER *address);
acpi_pointer *address);
acpi_status
acpi_os_table_override (
......@@ -131,7 +131,7 @@ acpi_os_signal_semaphore (
void *
acpi_os_allocate (
ACPI_SIZE size);
acpi_size size);
void
acpi_os_free (
......@@ -139,19 +139,19 @@ acpi_os_free (
acpi_status
acpi_os_map_memory (
ACPI_PHYSICAL_ADDRESS physical_address,
ACPI_SIZE size,
acpi_physical_address physical_address,
acpi_size size,
void **logical_address);
void
acpi_os_unmap_memory (
void *logical_address,
ACPI_SIZE size);
acpi_size size);
acpi_status
acpi_os_get_physical_address (
void *logical_address,
ACPI_PHYSICAL_ADDRESS *physical_address);
acpi_physical_address *physical_address);
/*
......@@ -200,13 +200,13 @@ acpi_os_stall (
acpi_status
acpi_os_read_port (
ACPI_IO_ADDRESS address,
acpi_io_address address,
void *value,
u32 width);
acpi_status
acpi_os_write_port (
ACPI_IO_ADDRESS address,
acpi_io_address address,
acpi_integer value,
u32 width);
......@@ -217,13 +217,13 @@ acpi_os_write_port (
acpi_status
acpi_os_read_memory (
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
void *value,
u32 width);
acpi_status
acpi_os_write_memory (
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
acpi_integer value,
u32 width);
......
drivers/acpi/include/acpixf.h
View file @ 82015ca1
......@@ -77,7 +77,7 @@ acpi_purge_cached_objects (
acpi_status
acpi_install_initialization_handler (
ACPI_INIT_HANDLER handler,
acpi_init_handler handler,
u32 function);
/*
......@@ -104,7 +104,7 @@ acpi_free (
acpi_status
acpi_find_root_pointer (
u32 flags,
ACPI_POINTER *rsdp_address);
acpi_pointer *rsdp_address);
acpi_status
acpi_load_tables (
......@@ -173,18 +173,18 @@ acpi_get_handle (
acpi_status
acpi_attach_data (
acpi_handle obj_handle,
ACPI_OBJECT_HANDLER handler,
acpi_object_handler handler,
void *data);
acpi_status
acpi_detach_data (
acpi_handle obj_handle,
ACPI_OBJECT_HANDLER handler);
acpi_object_handler handler);
acpi_status
acpi_get_data (
acpi_handle obj_handle,
ACPI_OBJECT_HANDLER handler,
acpi_object_handler handler,
void **data);
......@@ -261,7 +261,7 @@ acpi_remove_notify_handler (
acpi_status
acpi_install_address_space_handler (
acpi_handle device,
ACPI_ADR_SPACE_TYPE space_id,
acpi_adr_space_type space_id,
acpi_adr_space_handler handler,
acpi_adr_space_setup setup,
void *context);
......@@ -269,7 +269,7 @@ acpi_install_address_space_handler (
acpi_status
acpi_remove_address_space_handler (
acpi_handle device,
ACPI_ADR_SPACE_TYPE space_id,
acpi_adr_space_type space_id,
acpi_adr_space_handler handler);
acpi_status
......@@ -359,11 +359,11 @@ acpi_set_register (
acpi_status
acpi_set_firmware_waking_vector (
ACPI_PHYSICAL_ADDRESS physical_address);
acpi_physical_address physical_address);
acpi_status
acpi_get_firmware_waking_vector (
ACPI_PHYSICAL_ADDRESS *physical_address);
acpi_physical_address *physical_address);
acpi_status
acpi_get_sleep_type_data (
......
drivers/acpi/include/acresrc.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acresrc.h - Resource Manager function prototypes
* $Revision: 34 $
*
*****************************************************************************/
......@@ -141,17 +140,17 @@ acpi_status
acpi_rs_get_list_length (
u8 *byte_stream_buffer,
u32 byte_stream_buffer_length,
ACPI_SIZE *size_needed);
acpi_size *size_needed);
acpi_status
acpi_rs_get_byte_stream_length (
acpi_resource *linked_list_buffer,
ACPI_SIZE *size_needed);
acpi_size *size_needed);
acpi_status
acpi_rs_get_pci_routing_table_length (
acpi_operand_object *package_object,
ACPI_SIZE *buffer_size_needed);
acpi_size *buffer_size_needed);
acpi_status
acpi_rs_byte_stream_to_list (
......@@ -162,203 +161,203 @@ acpi_rs_byte_stream_to_list (
acpi_status
acpi_rs_list_to_byte_stream (
acpi_resource *linked_list,
ACPI_SIZE byte_stream_size_needed,
acpi_size byte_stream_size_needed,
u8 *output_buffer);
acpi_status
acpi_rs_io_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_fixed_io_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_io_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_fixed_io_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_irq_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_irq_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_dma_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_dma_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_address16_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_address16_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_address32_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_address32_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_address64_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_address64_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_start_depend_fns_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_end_depend_fns_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_start_depend_fns_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_end_depend_fns_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_memory24_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_memory24_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_memory32_range_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_fixed_memory32_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_memory32_range_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_fixed_memory32_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_extended_irq_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_extended_irq_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_end_tag_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_end_tag_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
acpi_status
acpi_rs_vendor_resource (
u8 *byte_stream_buffer,
ACPI_SIZE *bytes_consumed,
acpi_size *bytes_consumed,
u8 **output_buffer,
ACPI_SIZE *structure_size);
acpi_size *structure_size);
acpi_status
acpi_rs_vendor_stream (
acpi_resource *linked_list,
u8 **output_buffer,
ACPI_SIZE *bytes_consumed);
acpi_size *bytes_consumed);
u8
acpi_rs_get_resource_type (
......
drivers/acpi/include/acstruct.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acstruct.h - Internal structs
* $Revision: 22 $
*
*****************************************************************************/
......@@ -94,7 +93,7 @@ typedef struct acpi_walk_state
acpi_parse_object *next_op; /* next op to be processed */
acpi_parse_downwards descending_callback;
acpi_parse_upwards ascending_callback;
ACPI_THREAD_STATE *thread;
acpi_thread_state *thread;
struct acpi_walk_state *next; /* Next Walk_state in list */
......@@ -163,16 +162,16 @@ typedef union acpi_aml_operands
struct
{
ACPI_OBJECT_INTEGER *type;
ACPI_OBJECT_INTEGER *code;
ACPI_OBJECT_INTEGER *argument;
acpi_object_integer *type;
acpi_object_integer *code;
acpi_object_integer *argument;
} fatal;
struct
{
acpi_operand_object *source;
ACPI_OBJECT_INTEGER *index;
acpi_object_integer *index;
acpi_operand_object *target;
} index;
......@@ -180,13 +179,13 @@ typedef union acpi_aml_operands
struct
{
acpi_operand_object *source;
ACPI_OBJECT_INTEGER *index;
ACPI_OBJECT_INTEGER *length;
acpi_object_integer *index;
acpi_object_integer *length;
acpi_operand_object *target;
} mid;
} ACPI_AML_OPERANDS;
} acpi_aml_operands;
#endif
drivers/acpi/include/actables.h
View file @ 82015ca1
/******************************************************************************
*
* Name: actables.h - ACPI table management
* $Revision: 43 $
*
*****************************************************************************/
......@@ -55,7 +54,7 @@ acpi_tb_build_common_facs (
u32
acpi_tb_get_table_count (
RSDP_DESCRIPTOR *RSDP,
rsdp_descriptor *RSDP,
acpi_table_header *RSDT);
/*
......@@ -64,23 +63,23 @@ acpi_tb_get_table_count (
acpi_status
acpi_tb_get_table (
ACPI_POINTER *address,
acpi_pointer *address,
acpi_table_desc *table_info);
acpi_status
acpi_tb_get_table_header (
ACPI_POINTER *address,
acpi_pointer *address,
acpi_table_header *return_header);
acpi_status
acpi_tb_get_table_body (
ACPI_POINTER *address,
acpi_pointer *address,
acpi_table_header *header,
acpi_table_desc *table_info);
acpi_status
acpi_tb_get_this_table (
ACPI_POINTER *address,
acpi_pointer *address,
acpi_table_header *header,
acpi_table_desc *table_info);
......@@ -97,11 +96,11 @@ acpi_tb_get_table_ptr (
acpi_status
acpi_tb_verify_rsdp (
ACPI_POINTER *address);
acpi_pointer *address);
void
acpi_tb_get_rsdt_address (
ACPI_POINTER *out_address);
acpi_pointer *out_address);
acpi_status
acpi_tb_validate_rsdt (
......@@ -113,12 +112,12 @@ acpi_tb_get_required_tables (
acpi_status
acpi_tb_get_primary_table (
ACPI_POINTER *address,
acpi_pointer *address,
acpi_table_desc *table_info);
acpi_status
acpi_tb_get_secondary_table (
ACPI_POINTER *address,
acpi_pointer *address,
acpi_string signature,
acpi_table_desc *table_info);
......
drivers/acpi/include/actbl.h
View file @ 82015ca1
/******************************************************************************
*
* Name: actbl.h - Table data structures defined in ACPI specification
* $Revision: 54 $
*
*****************************************************************************/
......@@ -86,7 +85,7 @@ typedef struct /* Root System Descriptor Pointer */
u8 extended_checksum; /* Checksum of entire table */
char reserved [3]; /* Reserved field must be 0 */
} RSDP_DESCRIPTOR;
} rsdp_descriptor;
typedef struct /* ACPI common table header */
......
drivers/acpi/include/actbl1.h
View file @ 82015ca1
/******************************************************************************
*
* Name: actbl1.h - ACPI 1.0 tables
* $Revision: 22 $
*
*****************************************************************************/
......
drivers/acpi/include/actbl2.h
View file @ 82015ca1
/******************************************************************************
*
* Name: actbl2.h - ACPI Specification Revision 2.0 Tables
* $Revision: 29 $
*
*****************************************************************************/
......
drivers/acpi/include/actbl71.h
View file @ 82015ca1
......@@ -3,7 +3,6 @@
* Name: actbl71.h - IA-64 Extensions to the ACPI Spec Rev. 0.71
* This file includes tables specific to this
* specification revision.
* $Revision: 12 $
*
*****************************************************************************/
......
drivers/acpi/include/actypes.h
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/include/acutils.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
* $Revision: 150 $
*
*****************************************************************************/
......@@ -28,7 +27,7 @@
typedef
acpi_status (*ACPI_PKG_CALLBACK) (
acpi_status (*acpi_pkg_callback) (
u8 object_type,
acpi_operand_object *source_object,
acpi_generic_state *state,
......@@ -39,14 +38,14 @@ acpi_status
acpi_ut_walk_package_tree (
acpi_operand_object *source_object,
void *target_object,
ACPI_PKG_CALLBACK walk_callback,
acpi_pkg_callback walk_callback,
void *context);
typedef struct acpi_pkg_info
{
u8 *free_space;
ACPI_SIZE length;
acpi_size length;
u32 object_space;
u32 num_packages;
} acpi_pkg_info;
......@@ -138,7 +137,7 @@ acpi_ut_allocate_owner_id (
#ifndef ACPI_USE_SYSTEM_CLIBRARY
ACPI_SIZE
acpi_size
acpi_ut_strlen (
const char *string);
......@@ -151,13 +150,13 @@ char *
acpi_ut_strncpy (
char *dst_string,
const char *src_string,
ACPI_SIZE count);
acpi_size count);
int
acpi_ut_strncmp (
const char *string1,
const char *string2,
ACPI_SIZE count);
acpi_size count);
int
acpi_ut_strcmp (
......@@ -173,7 +172,7 @@ char *
acpi_ut_strncat (
char *dst_string,
const char *src_string,
ACPI_SIZE count);
acpi_size count);
u32
acpi_ut_strtoul (
......@@ -190,13 +189,13 @@ void *
acpi_ut_memcpy (
void *dest,
const void *src,
ACPI_SIZE count);
acpi_size count);
void *
acpi_ut_memset (
void *dest,
NATIVE_UINT value,
ACPI_SIZE count);
acpi_native_uint value,
acpi_size count);
int
acpi_ut_to_upper (
......@@ -495,19 +494,19 @@ acpi_ut_mutex_terminate (
acpi_status
acpi_ut_create_mutex (
ACPI_MUTEX_HANDLE mutex_id);
acpi_mutex_handle mutex_id);
acpi_status
acpi_ut_delete_mutex (
ACPI_MUTEX_HANDLE mutex_id);
acpi_mutex_handle mutex_id);
acpi_status
acpi_ut_acquire_mutex (
ACPI_MUTEX_HANDLE mutex_id);
acpi_mutex_handle mutex_id);
acpi_status
acpi_ut_release_mutex (
ACPI_MUTEX_HANDLE mutex_id);
acpi_mutex_handle mutex_id);
/*
......@@ -540,7 +539,7 @@ acpi_ut_valid_internal_object (
acpi_operand_object *
acpi_ut_create_buffer_object (
ACPI_SIZE buffer_size);
acpi_size buffer_size);
/*
......@@ -562,17 +561,17 @@ acpi_ut_remove_reference (
acpi_status
acpi_ut_get_simple_object_size (
acpi_operand_object *obj,
ACPI_SIZE *obj_length);
acpi_size *obj_length);
acpi_status
acpi_ut_get_package_object_size (
acpi_operand_object *obj,
ACPI_SIZE *obj_length);
acpi_size *obj_length);
acpi_status
acpi_ut_get_object_size(
acpi_operand_object *obj,
ACPI_SIZE *obj_length);
acpi_size *obj_length);
acpi_status
acpi_ut_get_element_length (
......@@ -600,7 +599,7 @@ acpi_generic_state *
acpi_ut_create_generic_state (
void);
ACPI_THREAD_STATE *
acpi_thread_state *
acpi_ut_create_thread_state (
void);
......@@ -736,21 +735,21 @@ acpi_ut_validate_buffer (
acpi_status
acpi_ut_initialize_buffer (
acpi_buffer *buffer,
ACPI_SIZE required_length);
acpi_size required_length);
/* Memory allocation functions */
void *
acpi_ut_allocate (
ACPI_SIZE size,
acpi_size size,
u32 component,
char *module,
u32 line);
void *
acpi_ut_callocate (
ACPI_SIZE size,
acpi_size size,
u32 component,
char *module,
u32 line);
......@@ -760,14 +759,14 @@ acpi_ut_callocate (
void *
acpi_ut_allocate_and_track (
ACPI_SIZE size,
acpi_size size,
u32 component,
char *module,
u32 line);
void *
acpi_ut_callocate_and_track (
ACPI_SIZE size,
acpi_size size,
u32 component,
char *module,
u32 line);
......@@ -788,7 +787,7 @@ acpi_status
acpi_ut_track_allocation (
u32 list_id,
acpi_debug_mem_block *address,
ACPI_SIZE size,
acpi_size size,
u8 alloc_type,
u32 component,
char *module,
......
drivers/acpi/include/amlcode.h
View file @ 82015ca1
......@@ -3,7 +3,6 @@
* Name: amlcode.h - Definitions for AML, as included in "definition blocks"
* Declarations and definitions contained herein are derived
* directly from the ACPI specification.
* $Revision: 71 $
*
*****************************************************************************/
......
drivers/acpi/include/amlresrc.h
View file @ 82015ca1
......@@ -2,7 +2,6 @@
/******************************************************************************
*
* Module Name: amlresrc.h - AML resource descriptors
* $Revision: 22 $
*
*****************************************************************************/
......@@ -76,7 +75,7 @@ typedef struct asl_resource_node
void *buffer;
struct asl_resource_node *next;
} ASL_RESOURCE_NODE;
} asl_resource_node;
/*
......@@ -93,7 +92,7 @@ typedef struct asl_irq_format_desc
u16 irq_mask;
u8 flags;
} ASL_IRQ_FORMAT_DESC;
} asl_irq_format_desc;
typedef struct asl_irq_noflags_desc
......@@ -101,7 +100,7 @@ typedef struct asl_irq_noflags_desc
u8 descriptor_type;
u16 irq_mask;
} ASL_IRQ_NOFLAGS_DESC;
} asl_irq_noflags_desc;
typedef struct asl_dma_format_desc
......@@ -110,7 +109,7 @@ typedef struct asl_dma_format_desc
u8 dma_channel_mask;
u8 flags;
} ASL_DMA_FORMAT_DESC;
} asl_dma_format_desc;
typedef struct asl_start_dependent_desc
......@@ -118,21 +117,21 @@ typedef struct asl_start_dependent_desc
u8 descriptor_type;
u8 flags;
} ASL_START_DEPENDENT_DESC;
} asl_start_dependent_desc;
typedef struct asl_start_dependent_noprio_desc
{
u8 descriptor_type;
} ASL_START_DEPENDENT_NOPRIO_DESC;
} asl_start_dependent_noprio_desc;
typedef struct asl_end_dependent_desc
{
u8 descriptor_type;
} ASL_END_DEPENDENT_DESC;
} asl_end_dependent_desc;
typedef struct asl_io_port_desc
......@@ -144,7 +143,7 @@ typedef struct asl_io_port_desc
u8 alignment;
u8 length;
} ASL_IO_PORT_DESC;
} asl_io_port_desc;
typedef struct asl_fixed_io_port_desc
......@@ -153,7 +152,7 @@ typedef struct asl_fixed_io_port_desc
u16 base_address;
u8 length;
} ASL_FIXED_IO_PORT_DESC;
} asl_fixed_io_port_desc;
typedef struct asl_small_vendor_desc
......@@ -161,7 +160,7 @@ typedef struct asl_small_vendor_desc
u8 descriptor_type;
u8 vendor_defined[7];
} ASL_SMALL_VENDOR_DESC;
} asl_small_vendor_desc;
typedef struct asl_end_tag_desc
......@@ -169,7 +168,7 @@ typedef struct asl_end_tag_desc
u8 descriptor_type;
u8 checksum;
} ASL_END_TAG_DESC;
} asl_end_tag_desc;
/* LARGE descriptors */
......@@ -184,7 +183,7 @@ typedef struct asl_memory_24_desc
u16 alignment;
u16 range_length;
} ASL_MEMORY_24_DESC;
} asl_memory_24_desc;
typedef struct asl_large_vendor_desc
......@@ -193,7 +192,7 @@ typedef struct asl_large_vendor_desc
u16 length;
u8 vendor_defined[1];
} ASL_LARGE_VENDOR_DESC;
} asl_large_vendor_desc;
typedef struct asl_memory_32_desc
......@@ -206,7 +205,7 @@ typedef struct asl_memory_32_desc
u32 alignment;
u32 range_length;
} ASL_MEMORY_32_DESC;
} asl_memory_32_desc;
typedef struct asl_fixed_memory_32_desc
......@@ -217,7 +216,7 @@ typedef struct asl_fixed_memory_32_desc
u32 base_address;
u32 range_length;
} ASL_FIXED_MEMORY_32_DESC;
} asl_fixed_memory_32_desc;
typedef struct asl_qword_address_desc
......@@ -234,7 +233,7 @@ typedef struct asl_qword_address_desc
u64 address_length;
u8 optional_fields[2];
} ASL_QWORD_ADDRESS_DESC;
} asl_qword_address_desc;
typedef struct asl_dword_address_desc
......@@ -251,7 +250,7 @@ typedef struct asl_dword_address_desc
u32 address_length;
u8 optional_fields[2];
} ASL_DWORD_ADDRESS_DESC;
} asl_dword_address_desc;
typedef struct asl_word_address_desc
......@@ -268,7 +267,7 @@ typedef struct asl_word_address_desc
u16 address_length;
u8 optional_fields[2];
} ASL_WORD_ADDRESS_DESC;
} asl_word_address_desc;
typedef struct asl_extended_xrupt_desc
......@@ -280,7 +279,7 @@ typedef struct asl_extended_xrupt_desc
u32 interrupt_number[1];
/* Res_source_index, Res_source optional fields follow */
} ASL_EXTENDED_XRUPT_DESC;
} asl_extended_xrupt_desc;
typedef struct asl_general_register_desc
......@@ -293,7 +292,7 @@ typedef struct asl_general_register_desc
u8 reserved;
u64 address;
} ASL_GENERAL_REGISTER_DESC;
} asl_general_register_desc;
/* restore default alignment */
......@@ -303,29 +302,29 @@ typedef struct asl_general_register_desc
typedef union asl_resource_desc
{
ASL_IRQ_FORMAT_DESC irq;
ASL_DMA_FORMAT_DESC dma;
ASL_START_DEPENDENT_DESC std;
ASL_END_DEPENDENT_DESC end;
ASL_IO_PORT_DESC iop;
ASL_FIXED_IO_PORT_DESC fio;
ASL_SMALL_VENDOR_DESC smv;
ASL_END_TAG_DESC et;
ASL_MEMORY_24_DESC M24;
ASL_LARGE_VENDOR_DESC lgv;
ASL_MEMORY_32_DESC M32;
ASL_FIXED_MEMORY_32_DESC F32;
ASL_QWORD_ADDRESS_DESC qas;
ASL_DWORD_ADDRESS_DESC das;
ASL_WORD_ADDRESS_DESC was;
ASL_EXTENDED_XRUPT_DESC exx;
ASL_GENERAL_REGISTER_DESC grg;
asl_irq_format_desc irq;
asl_dma_format_desc dma;
asl_start_dependent_desc std;
asl_end_dependent_desc end;
asl_io_port_desc iop;
asl_fixed_io_port_desc fio;
asl_small_vendor_desc smv;
asl_end_tag_desc et;
asl_memory_24_desc M24;
asl_large_vendor_desc lgv;
asl_memory_32_desc M32;
asl_fixed_memory_32_desc F32;
asl_qword_address_desc qas;
asl_dword_address_desc das;
asl_word_address_desc was;
asl_extended_xrupt_desc exx;
asl_general_register_desc grg;
u32 U32_item;
u16 U16_item;
u8 U8item;
} ASL_RESOURCE_DESC;
} asl_resource_desc;
#endif
......
drivers/acpi/include/platform/acenv.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acenv.h - Generation environment specific items
* $Revision: 101 $
*
*****************************************************************************/
......@@ -206,16 +205,16 @@
#define ACPI_STRSTR(s1,s2) strstr((s1), (s2))
#define ACPI_STRUPR(s) (void) acpi_ut_strupr ((s))
#define ACPI_STRLEN(s) (ACPI_SIZE) strlen((s))
#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_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_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_STRNCAT(d,s,n) strncat((d), (s), (acpi_size)(n))
#define ACPI_STRTOUL(d,s,n) strtoul((d), (s), (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 toupper
#define ACPI_TOLOWER tolower
......@@ -252,8 +251,8 @@ typedef char *va_list;
* Storage alignment properties
*/
#define _AUPBND (sizeof (NATIVE_INT) - 1)
#define _ADNBND (sizeof (NATIVE_INT) - 1)
#define _AUPBND (sizeof (acpi_native_int) - 1)
#define _ADNBND (sizeof (acpi_native_int) - 1)
/*
* Variable argument list macro definitions
......@@ -269,16 +268,16 @@ typedef char *va_list;
#define ACPI_STRSTR(s1,s2) acpi_ut_strstr ((s1), (s2))
#define ACPI_STRUPR(s) (void) acpi_ut_strupr ((s))
#define ACPI_STRLEN(s) (ACPI_SIZE) acpi_ut_strlen ((s))
#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_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_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_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_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 acpi_ut_to_upper
#define ACPI_TOLOWER acpi_ut_to_lower
......
drivers/acpi/include/platform/acgcc.h
View file @ 82015ca1
/******************************************************************************
*
* Name: acgcc.h - GCC specific defines, etc.
* $Revision: 24 $
*
*****************************************************************************/
......
drivers/acpi/include/platform/aclinux.h
View file @ 82015ca1
/******************************************************************************
*
* Name: aclinux.h - OS specific defines, etc.
* $Revision: 29 $
*
*****************************************************************************/
......
drivers/acpi/namespace/nsaccess.c
View file @ 82015ca1
/*******************************************************************************
*
* Module Name: nsaccess - Top-level functions for accessing ACPI namespace
* $Revision: 167 $
*
******************************************************************************/
......
drivers/acpi/namespace/nsalloc.c
View file @ 82015ca1
/*******************************************************************************
*
* Module Name: nsalloc - Namespace allocation and deletion utilities
* $Revision: 78 $
*
******************************************************************************/
......
drivers/acpi/namespace/nsdump.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: nsdump - table dumping routines for debug
* $Revision: 150 $
*
*****************************************************************************/
......
drivers/acpi/namespace/nsdumpdv.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: nsdump - table dumping routines for debug
* $Revision: 4 $
*
*****************************************************************************/
......
drivers/acpi/namespace/nseval.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: nseval - Object evaluation interfaces -- includes control
* method lookup and execution.
* $Revision: 120 $
*
******************************************************************************/
......
drivers/acpi/namespace/nsinit.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: nsinit - namespace initialization
* $Revision: 54 $
*
*****************************************************************************/
......
drivers/acpi/namespace/nsload.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: nsload - namespace loading/expanding/contracting procedures
* $Revision: 61 $
*
*****************************************************************************/
......@@ -26,7 +25,6 @@
#include "acpi.h"
#include "acnamesp.h"
#include "acparser.h"
#include "acdispat.h"
......
drivers/acpi/namespace/nsnames.c
View file @ 82015ca1
/*******************************************************************************
*
* Module Name: nsnames - Name manipulation and search
* $Revision: 81 $
*
******************************************************************************/
......@@ -51,10 +50,10 @@
void
acpi_ns_build_external_path (
acpi_namespace_node *node,
ACPI_SIZE size,
acpi_size size,
char *name_buffer)
{
ACPI_SIZE index;
acpi_size index;
acpi_namespace_node *parent_node;
......@@ -123,7 +122,7 @@ acpi_ns_get_external_pathname (
acpi_namespace_node *node)
{
char *name_buffer;
ACPI_SIZE size;
acpi_size size;
ACPI_FUNCTION_TRACE_PTR ("Ns_get_external_pathname", node);
......@@ -161,11 +160,11 @@ acpi_ns_get_external_pathname (
*
******************************************************************************/
ACPI_SIZE
acpi_size
acpi_ns_get_pathname_length (
acpi_namespace_node *node)
{
ACPI_SIZE size;
acpi_size size;
acpi_namespace_node *next_node;
......@@ -209,7 +208,7 @@ acpi_ns_handle_to_pathname (
{
acpi_status status;
acpi_namespace_node *node;
ACPI_SIZE required_size;
acpi_size required_size;
ACPI_FUNCTION_TRACE_PTR ("Ns_handle_to_pathname", target_handle);
......
drivers/acpi/namespace/nsobject.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: nsobject - Utilities for objects attached to namespace
* table entries
* $Revision: 86 $
*
******************************************************************************/
......@@ -309,7 +308,7 @@ acpi_ns_get_secondary_object (
acpi_status
acpi_ns_attach_data (
acpi_namespace_node *node,
ACPI_OBJECT_HANDLER handler,
acpi_object_handler handler,
void *data)
{
acpi_operand_object *prev_obj_desc;
......@@ -371,7 +370,7 @@ acpi_ns_attach_data (
acpi_status
acpi_ns_detach_data (
acpi_namespace_node *node,
ACPI_OBJECT_HANDLER handler)
acpi_object_handler handler)
{
acpi_operand_object *obj_desc;
acpi_operand_object *prev_obj_desc;
......@@ -419,7 +418,7 @@ acpi_ns_detach_data (
acpi_status
acpi_ns_get_attached_data (
acpi_namespace_node *node,
ACPI_OBJECT_HANDLER handler,
acpi_object_handler handler,
void **data)
{
acpi_operand_object *obj_desc;
......
drivers/acpi/namespace/nsparse.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: nsparse - namespace interface to AML parser
* $Revision: 2 $
*
*****************************************************************************/
......
drivers/acpi/namespace/nssearch.c
View file @ 82015ca1
/*******************************************************************************
*
* Module Name: nssearch - Namespace search
* $Revision: 94 $
*
******************************************************************************/
......
drivers/acpi/namespace/nsutils.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: nsutils - Utilities for accessing ACPI namespace, accessing
* parents and siblings and Scope manipulation
* $Revision: 120 $
*
*****************************************************************************/
......@@ -355,7 +354,7 @@ acpi_ns_build_internal_name (
char *internal_name = info->internal_name;
char *external_name = info->next_external_char;
char *result = NULL;
NATIVE_UINT i;
acpi_native_uint i;
ACPI_FUNCTION_TRACE ("Ns_build_internal_name");
......@@ -396,12 +395,12 @@ acpi_ns_build_internal_name (
}
else if (num_segments == 2) {
internal_name[i] = AML_DUAL_NAME_PREFIX;
result = &internal_name[i+1];
result = &internal_name[(acpi_native_uint) (i+1)];
}
else {
internal_name[i] = AML_MULTI_NAME_PREFIX_OP;
internal_name[i+1] = (char) num_segments;
result = &internal_name[i+2];
internal_name[(acpi_native_uint) (i+1)] = (char) num_segments;
result = &internal_name[(acpi_native_uint) (i+2)];
}
}
......@@ -535,12 +534,12 @@ acpi_ns_externalize_name (
u32 *converted_name_length,
char **converted_name)
{
NATIVE_UINT_MIN32 prefix_length = 0;
NATIVE_UINT_MIN32 names_index = 0;
NATIVE_UINT_MIN32 num_segments = 0;
NATIVE_UINT_MIN32 i = 0;
NATIVE_UINT_MIN32 j = 0;
NATIVE_UINT_MIN32 required_length;
acpi_native_uint names_index = 0;
acpi_native_uint num_segments = 0;
acpi_native_uint required_length;
acpi_native_uint prefix_length = 0;
acpi_native_uint i = 0;
acpi_native_uint j = 0;
ACPI_FUNCTION_TRACE ("Ns_externalize_name");
......@@ -591,7 +590,7 @@ acpi_ns_externalize_name (
/* <count> 4-byte names */
names_index = prefix_length + 2;
num_segments = (u32) (u8) internal_name[prefix_length + 1];
num_segments = (u32) (u8) internal_name[(acpi_native_uint) (prefix_length + 1)];
break;
case AML_DUAL_NAME_PREFIX:
......
drivers/acpi/namespace/nswalk.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: nswalk - Functions for walking the ACPI namespace
* $Revision: 33 $
*
*****************************************************************************/
......
drivers/acpi/namespace/nsxfeval.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: nsxfeval - Public interfaces to the ACPI subsystem
* ACPI Object evaluation interfaces
* $Revision: 6 $
*
******************************************************************************/
......@@ -156,7 +155,7 @@ acpi_evaluate_object (
acpi_status status;
acpi_operand_object **internal_params = NULL;
acpi_operand_object *internal_return_obj = NULL;
ACPI_SIZE buffer_space_needed;
acpi_size buffer_space_needed;
u32 i;
......@@ -173,7 +172,7 @@ acpi_evaluate_object (
* Allocate a new parameter block for the internal objects
* Add 1 to count to allow for null terminated internal list
*/
internal_params = ACPI_MEM_CALLOCATE (((ACPI_SIZE) external_params->count + 1) *
internal_params = ACPI_MEM_CALLOCATE (((acpi_size) external_params->count + 1) *
sizeof (void *));
if (!internal_params) {
return_ACPI_STATUS (AE_NO_MEMORY);
......@@ -583,7 +582,7 @@ acpi_get_devices (
acpi_status
acpi_attach_data (
acpi_handle obj_handle,
ACPI_OBJECT_HANDLER handler,
acpi_object_handler handler,
void *data)
{
acpi_namespace_node *node;
......@@ -635,7 +634,7 @@ acpi_attach_data (
acpi_status
acpi_detach_data (
acpi_handle obj_handle,
ACPI_OBJECT_HANDLER handler)
acpi_object_handler handler)
{
acpi_namespace_node *node;
acpi_status status;
......@@ -686,7 +685,7 @@ acpi_detach_data (
acpi_status
acpi_get_data (
acpi_handle obj_handle,
ACPI_OBJECT_HANDLER handler,
acpi_object_handler handler,
void **data)
{
acpi_namespace_node *node;
......
drivers/acpi/namespace/nsxfname.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: nsxfname - Public interfaces to the ACPI subsystem
* ACPI Namespace oriented interfaces
* $Revision: 93 $
*
*****************************************************************************/
......
drivers/acpi/namespace/nsxfobj.c
View file @ 82015ca1
......@@ -2,7 +2,6 @@
*
* Module Name: nsxfobj - Public interfaces to the ACPI subsystem
* ACPI Object oriented interfaces
* $Revision: 114 $
*
******************************************************************************/
......
drivers/acpi/osl.c
View file @ 82015ca1
......@@ -61,7 +61,7 @@ typedef struct
#include <linux/kdb.h>
/* stuff for debugger support */
int acpi_in_debugger = 0;
extern NATIVE_CHAR line_buf[80];
extern char line_buf[80];
#endif /*ENABLE_DEBUGGER*/
static int acpi_irq_irq = 0;
......@@ -99,7 +99,7 @@ acpi_os_terminate(void)
}
void
acpi_os_printf(const NATIVE_CHAR *fmt,...)
acpi_os_printf(const char *fmt,...)
{
va_list args;
va_start(args, fmt);
......@@ -108,7 +108,7 @@ acpi_os_printf(const NATIVE_CHAR *fmt,...)
}
void
acpi_os_vprintf(const NATIVE_CHAR *fmt, va_list args)
acpi_os_vprintf(const char *fmt, va_list args)
{
static char buffer[512];
......@@ -126,7 +126,7 @@ acpi_os_vprintf(const NATIVE_CHAR *fmt, va_list args)
}
void *
acpi_os_allocate(ACPI_SIZE size)
acpi_os_allocate(acpi_size size)
{
return kmalloc(size, GFP_KERNEL);
}
......@@ -138,7 +138,7 @@ acpi_os_free(void *ptr)
}
acpi_status
acpi_os_get_root_pointer(u32 flags, ACPI_POINTER *addr)
acpi_os_get_root_pointer(u32 flags, acpi_pointer *addr)
{
#ifdef CONFIG_ACPI_EFI
addr->pointer_type = ACPI_PHYSICAL_POINTER;
......@@ -161,7 +161,7 @@ acpi_os_get_root_pointer(u32 flags, ACPI_POINTER *addr)
}
acpi_status
acpi_os_map_memory(ACPI_PHYSICAL_ADDRESS phys, ACPI_SIZE size, void **virt)
acpi_os_map_memory(acpi_physical_address phys, acpi_size size, void **virt)
{
#ifdef CONFIG_ACPI_EFI
if (EFI_MEMORY_WB & efi_mem_attributes(phys)) {
......@@ -187,13 +187,13 @@ acpi_os_map_memory(ACPI_PHYSICAL_ADDRESS phys, ACPI_SIZE size, void **virt)
}
void
acpi_os_unmap_memory(void *virt, ACPI_SIZE size)
acpi_os_unmap_memory(void *virt, acpi_size size)
{
iounmap(virt);
}
acpi_status
acpi_os_get_physical_address(void *virt, ACPI_PHYSICAL_ADDRESS *phys)
acpi_os_get_physical_address(void *virt, acpi_physical_address *phys)
{
if(!phys || !virt)
return AE_BAD_PARAMETER;
......@@ -274,7 +274,7 @@ acpi_os_stall(u32 us)
acpi_status
acpi_os_read_port(
ACPI_IO_ADDRESS port,
acpi_io_address port,
void *value,
u32 width)
{
......@@ -303,7 +303,7 @@ acpi_os_read_port(
acpi_status
acpi_os_write_port(
ACPI_IO_ADDRESS port,
acpi_io_address port,
acpi_integer value,
u32 width)
{
......@@ -327,7 +327,7 @@ acpi_os_write_port(
acpi_status
acpi_os_read_memory(
ACPI_PHYSICAL_ADDRESS phys_addr,
acpi_physical_address phys_addr,
void *value,
u32 width)
{
......@@ -373,7 +373,7 @@ acpi_os_read_memory(
acpi_status
acpi_os_write_memory(
ACPI_PHYSICAL_ADDRESS phys_addr,
acpi_physical_address phys_addr,
acpi_integer value,
u32 width)
{
......@@ -843,7 +843,7 @@ acpi_os_signal_semaphore(
}
u32
acpi_os_get_line(NATIVE_CHAR *buffer)
acpi_os_get_line(char *buffer)
{
#ifdef ENABLE_DEBUGGER
......
drivers/acpi/parser/psargs.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: psargs - Parse AML opcode arguments
* $Revision: 67 $
*
*****************************************************************************/
......@@ -122,7 +121,7 @@ acpi_ps_get_next_package_end (
acpi_parse_state *parser_state)
{
u8 *start = parser_state->aml;
NATIVE_UINT length;
acpi_native_uint length;
ACPI_FUNCTION_TRACE ("Ps_get_next_package_end");
......@@ -130,7 +129,7 @@ acpi_ps_get_next_package_end (
/* Function below changes Parser_state->Aml */
length = (NATIVE_UINT) acpi_ps_get_next_package_length (parser_state);
length = (acpi_native_uint) acpi_ps_get_next_package_length (parser_state);
return_PTR (start + length); /* end of package */
}
......@@ -194,7 +193,7 @@ acpi_ps_get_next_namestring (
/* Multiple name segments, 4 chars each */
end += 2 + ((ACPI_SIZE) ACPI_GET8 (end + 1) * ACPI_NAME_SIZE);
end += 2 + ((acpi_size) ACPI_GET8 (end + 1) * ACPI_NAME_SIZE);
break;
default:
......
drivers/acpi/parser/psopcode.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: psopcode - Parser/Interpreter opcode information table
* $Revision: 75 $
*
*****************************************************************************/
......
drivers/acpi/parser/psparse.c
View file @ 82015ca1
/******************************************************************************
*
* Module Name: psparse - Parser top level AML parse routines
* $Revision: 138 $
*
*****************************************************************************/
......@@ -1034,8 +1033,8 @@ acpi_ps_parse_aml (
{
acpi_status status;
acpi_status terminate_status;
ACPI_THREAD_STATE *thread;
ACPI_THREAD_STATE *prev_walk_list = acpi_gbl_current_walk_list;
acpi_thread_state *thread;
acpi_thread_state *prev_walk_list = acpi_gbl_current_walk_list;
acpi_walk_state *previous_walk_state;
......
drivers/acpi/parser/psscope.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/parser/pstree.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/parser/psutils.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/parser/pswalk.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/parser/psxface.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rsaddr.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rscalc.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rscreate.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rsdump.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rsio.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rsirq.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rslist.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rsmemory.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rsmisc.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rsutils.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/resources/rsxface.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/sleep.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/tables/tbconvrt.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/tables/tbget.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/tables/tbgetall.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/tables/tbinstal.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/tables/tbrsdt.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/tables/tbutils.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/tables/tbxface.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/tables/tbxfroot.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utalloc.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utcopy.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utdebug.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utdelete.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/uteval.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utglobal.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utinit.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utmath.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utmisc.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utobject.c
View file @ 82015ca1
This diff is collapsed.
drivers/acpi/utilities/utxface.c
View file @ 82015ca1
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7