acpi_status status;
acpi_native_uint i;
- ACPI_FUNCTION_TRACE(ev_install_region_handlers);
+ ACPI_FUNCTION_TRACE("ev_install_region_handlers");
status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE(status)) {
acpi_status status;
acpi_native_uint i;
- ACPI_FUNCTION_TRACE(ev_initialize_op_regions);
+ ACPI_FUNCTION_TRACE("ev_initialize_op_regions");
status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE(status)) {
* Run the _REG methods for op_regions in each default address space
*/
for (i = 0; i < ACPI_NUM_DEFAULT_SPACES; i++) {
-
/* TBD: Make sure handler is the DEFAULT handler, otherwise
* _REG will have already been run.
*/
acpi_status
acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
{
- struct acpi_evaluate_info *info;
- union acpi_operand_object *args[3];
+ struct acpi_parameter_info info;
+ union acpi_operand_object *params[3];
union acpi_operand_object *region_obj2;
acpi_status status;
- ACPI_FUNCTION_TRACE(ev_execute_reg_method);
+ ACPI_FUNCTION_TRACE("ev_execute_reg_method");
region_obj2 = acpi_ns_get_secondary_object(region_obj);
if (!region_obj2) {
return_ACPI_STATUS(AE_OK);
}
- /* Allocate and initialize the evaluation information block */
-
- info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));
- if (!info) {
- return_ACPI_STATUS(AE_NO_MEMORY);
- }
-
- info->prefix_node = region_obj2->extra.method_REG;
- info->pathname = NULL;
- info->parameters = args;
- info->parameter_type = ACPI_PARAM_ARGS;
- info->flags = ACPI_IGNORE_RETURN_VALUE;
-
/*
* The _REG method has two arguments:
*
- * Arg0 - Integer:
- * Operation region space ID Same value as region_obj->Region.space_id
- *
- * Arg1 - Integer:
- * connection status 1 for connecting the handler, 0 for disconnecting
- * the handler (Passed as a parameter)
+ * Arg0, Integer: Operation region space ID
+ * Same value as region_obj->Region.space_id
+ * Arg1, Integer: connection status
+ * 1 for connecting the handler,
+ * 0 for disconnecting the handler
+ * Passed as a parameter
*/
- args[0] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
- if (!args[0]) {
- status = AE_NO_MEMORY;
- goto cleanup1;
+ params[0] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
+ if (!params[0]) {
+ return_ACPI_STATUS(AE_NO_MEMORY);
}
- args[1] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
- if (!args[1]) {
+ params[1] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
+ if (!params[1]) {
status = AE_NO_MEMORY;
- goto cleanup2;
+ goto cleanup;
}
/* Setup the parameter objects */
- args[0]->integer.value = region_obj->region.space_id;
- args[1]->integer.value = function;
- args[2] = NULL;
+ params[0]->integer.value = region_obj->region.space_id;
+ params[1]->integer.value = function;
+ params[2] = NULL;
+
+ info.node = region_obj2->extra.method_REG;
+ info.parameters = params;
+ info.parameter_type = ACPI_PARAM_ARGS;
/* Execute the method, no return value */
ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
- (ACPI_TYPE_METHOD, info->prefix_node, NULL));
+ (ACPI_TYPE_METHOD, info.node, NULL));
+ status = acpi_ns_evaluate_by_handle(&info);
- status = acpi_ns_evaluate(info);
- acpi_ut_remove_reference(args[1]);
+ acpi_ut_remove_reference(params[1]);
- cleanup2:
- acpi_ut_remove_reference(args[0]);
+ cleanup:
+ acpi_ut_remove_reference(params[0]);
- cleanup1:
- ACPI_FREE(info);
return_ACPI_STATUS(status);
}
* Function - Read or Write operation
* Address - Where in the space to read or write
* bit_width - Field width in bits (8, 16, 32, or 64)
- * Value - Pointer to in or out value, must be
- * full 64-bit acpi_integer
+ * Value - Pointer to in or out value
*
* RETURN: Status
*
acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
u32 function,
acpi_physical_address address,
- u32 bit_width, acpi_integer * value)
+ u32 bit_width, void *value)
{
acpi_status status;
acpi_status status2;
union acpi_operand_object *region_obj2;
void *region_context = NULL;
- ACPI_FUNCTION_TRACE(ev_address_space_dispatch);
+ ACPI_FUNCTION_TRACE("ev_address_space_dispatch");
region_obj2 = acpi_ns_get_secondary_object(region_obj);
if (!region_obj2) {
*/
region_setup = handler_desc->address_space.setup;
if (!region_setup) {
-
/* No initialization routine, exit with error */
ACPI_ERROR((AE_INFO,
region_obj->region.flags |= AOPOBJ_SETUP_COMPLETE;
if (region_obj2->extra.region_context) {
-
/* The handler for this region was already installed */
- ACPI_FREE(region_context);
+ ACPI_MEM_FREE(region_context);
} else {
/*
* Save the returned context for use in all accesses to
acpi_ut_get_region_name(region_obj->region.
space_id)));
- if (!(handler_desc->address_space.handler_flags &
- ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
+ if (!
+ (handler_desc->address_space.
+ hflags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
/*
* For handlers other than the default (supplied) handlers, we must
* exit the interpreter because the handler *might* block -- we don't
space_id)));
}
- if (!(handler_desc->address_space.handler_flags &
- ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
+ if (!
+ (handler_desc->address_space.
+ hflags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
/*
* We just returned from a non-default handler, we must re-enter the
* interpreter
union acpi_operand_object *region_obj2;
acpi_status status;
- ACPI_FUNCTION_TRACE(ev_detach_region);
+ ACPI_FUNCTION_TRACE("ev_detach_region");
region_obj2 = acpi_ns_get_secondary_object(region_obj);
if (!region_obj2) {
handler_obj = region_obj->region.handler;
if (!handler_obj) {
-
/* This region has no handler, all done */
return_VOID;
last_obj_ptr = &handler_obj->address_space.region_list;
while (obj_desc) {
-
/* Is this the correct Region? */
if (obj_desc == region_obj) {
}
}
- /*
- * If the region has been activated, call the setup handler
- * with the deactivate notification
- */
- if (region_obj->region.flags & AOPOBJ_SETUP_COMPLETE) {
- region_setup = handler_obj->address_space.setup;
- status =
- region_setup(region_obj,
- ACPI_REGION_DEACTIVATE,
- handler_obj->address_space.
- context, region_context);
+ /* Call the setup handler with the deactivate notification */
- /* Init routine may fail, Just ignore errors */
+ region_setup = handler_obj->address_space.setup;
+ status =
+ region_setup(region_obj, ACPI_REGION_DEACTIVATE,
+ handler_obj->address_space.context,
+ region_context);
- if (ACPI_FAILURE(status)) {
- ACPI_EXCEPTION((AE_INFO, status,
- "from region handler - deactivate, [%s]",
- acpi_ut_get_region_name
- (region_obj->region.
- space_id)));
- }
+ /* Init routine may fail, Just ignore errors */
- region_obj->region.flags &=
- ~(AOPOBJ_SETUP_COMPLETE);
+ if (ACPI_FAILURE(status)) {
+ ACPI_EXCEPTION((AE_INFO, status,
+ "from region init, [%s]",
+ acpi_ut_get_region_name
+ (region_obj->region.space_id)));
}
+ region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
+
/*
* Remove handler reference in the region
*
- * NOTE: this doesn't mean that the region goes away, the region
- * is just inaccessible as indicated to the _REG method
+ * NOTE: this doesn't mean that the region goes away
+ * The region is just inaccessible as indicated to
+ * the _REG method
*
- * If the region is on the handler's list, this must be the
- * region's handler
+ * If the region is on the handler's list
+ * this better be the region's handler
*/
region_obj->region.handler = NULL;
acpi_ut_remove_reference(handler_obj);
u8 acpi_ns_is_locked)
{
- ACPI_FUNCTION_TRACE(ev_attach_region);
+ ACPI_FUNCTION_TRACE("ev_attach_region");
ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
"Adding Region [%4.4s] %p to address handler %p [%s]\n",
struct acpi_namespace_node *node;
acpi_status status;
- ACPI_FUNCTION_NAME(ev_install_handler);
+ ACPI_FUNCTION_NAME("ev_install_handler");
handler_obj = (union acpi_operand_object *)context;
obj_desc = acpi_ns_get_attached_object(node);
if (!obj_desc) {
-
/* No object, just exit */
return (AE_OK);
/* Devices are handled different than regions */
if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_DEVICE) {
-
/* Check if this Device already has a handler for this address space */
next_handler_obj = obj_desc->device.handler;
while (next_handler_obj) {
-
/* Found a handler, is it for the same address space? */
if (next_handler_obj->address_space.space_id ==
union acpi_operand_object *handler_obj;
acpi_status status;
acpi_object_type type;
- u8 flags = 0;
+ u16 flags = 0;
- ACPI_FUNCTION_TRACE(ev_install_space_handler);
+ ACPI_FUNCTION_TRACE("ev_install_space_handler");
/*
* This registration is valid for only the types below
/* Walk the handler list for this device */
while (handler_obj) {
-
/* Same space_id indicates a handler already installed */
if (handler_obj->address_space.space_id == space_id) {
/* Init handler obj */
handler_obj->address_space.space_id = (u8) space_id;
- handler_obj->address_space.handler_flags = flags;
+ handler_obj->address_space.hflags = flags;
handler_obj->address_space.region_list = NULL;
handler_obj->address_space.node = node;
handler_obj->address_space.handler = handler;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(ev_execute_reg_methods);
+ ACPI_FUNCTION_TRACE("ev_execute_reg_methods");
/*
* Run all _REG methods for all Operation Regions for this
*
* PARAMETERS: walk_namespace callback
*
- * DESCRIPTION: Run _REG method for region objects of the requested space_iD
+ * DESCRIPTION: Run _REg method for region objects of the requested space_iD
*
******************************************************************************/
obj_desc = acpi_ns_get_attached_object(node);
if (!obj_desc) {
-
/* No object, just exit */
return (AE_OK);
git://git.onelab.eu / linux-2.6.git / blobdiff