patch-2.4.22 linux-2.4.22/drivers/acpi/executer/exsystem.c
Next file: linux-2.4.22/drivers/acpi/executer/exutils.c
Previous file: linux-2.4.22/drivers/acpi/executer/exstorob.c
Back to the patch index
Back to the overall index
- Lines: 402
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/executer/exsystem.c
- Orig date:
2001-09-23 09:42:32.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/executer/exsystem.c linux-2.4.22/drivers/acpi/executer/exsystem.c
@@ -2,42 +2,58 @@
/******************************************************************************
*
* Module Name: exsystem - Interface to OS services
- * $Revision: 67 $
*
*****************************************************************************/
/*
- * Copyright (C) 2000, 2001 R. Byron Moore
+ * Copyright (C) 2000 - 2003, R. Byron Moore
+ * All rights reserved.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
*/
-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi/acpi.h>
+#include <acpi/acinterp.h>
+#include <acpi/acevents.h>
#define _COMPONENT ACPI_EXECUTER
- MODULE_NAME ("exsystem")
+ ACPI_MODULE_NAME ("exsystem")
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_wait_semaphore
+ * FUNCTION: acpi_ex_system_wait_semaphore
*
* PARAMETERS: Semaphore - OSD semaphore to wait on
* Timeout - Max time to wait
@@ -52,13 +68,14 @@
acpi_status
acpi_ex_system_wait_semaphore (
- acpi_handle semaphore,
- u32 timeout)
+ acpi_handle semaphore,
+ u16 timeout)
{
- acpi_status status;
+ acpi_status status;
+ acpi_status status2;
- FUNCTION_TRACE ("Ex_system_wait_semaphore");
+ ACPI_FUNCTION_TRACE ("ex_system_wait_semaphore");
status = acpi_os_wait_semaphore (semaphore, 1, 0);
@@ -78,11 +95,11 @@
/* Reacquire the interpreter */
- status = acpi_ex_enter_interpreter ();
- if (ACPI_SUCCESS (status)) {
- /* Restore the timeout exception */
+ status2 = acpi_ex_enter_interpreter ();
+ if (ACPI_FAILURE (status2)) {
+ /* Report fatal error, could not acquire interpreter */
- status = AE_TIME;
+ return_ACPI_STATUS (status2);
}
}
@@ -92,21 +109,24 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_do_stall
+ * FUNCTION: acpi_ex_system_do_stall
*
- * PARAMETERS: How_long - The amount of time to stall
+ * PARAMETERS: how_long - The amount of time to stall
*
- * RETURN: None
+ * RETURN: Status
*
* DESCRIPTION: Suspend running thread for specified amount of time.
*
******************************************************************************/
-void
+acpi_status
acpi_ex_system_do_stall (
- u32 how_long)
+ u32 how_long)
{
- FUNCTION_ENTRY ();
+ acpi_status status = AE_OK;
+
+
+ ACPI_FUNCTION_ENTRY ();
if (how_long > 1000) /* 1 millisecond */ {
@@ -114,24 +134,26 @@
acpi_ex_exit_interpreter ();
- acpi_os_stall (how_long);
+ acpi_os_sleep (0, (how_long / 1000) + 1);
/* And now we must get the interpreter again */
- acpi_ex_enter_interpreter ();
+ status = acpi_ex_enter_interpreter ();
}
else {
- acpi_os_sleep (0, (how_long / 1000) + 1);
+ acpi_os_stall (how_long);
}
+
+ return (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_do_suspend
+ * FUNCTION: acpi_ex_system_do_suspend
*
- * PARAMETERS: How_long - The amount of time to suspend
+ * PARAMETERS: how_long - The amount of time to suspend
*
* RETURN: None
*
@@ -139,12 +161,14 @@
*
******************************************************************************/
-void
+acpi_status
acpi_ex_system_do_suspend (
- u32 how_long)
+ u32 how_long)
{
+ acpi_status status;
- FUNCTION_ENTRY ();
+
+ ACPI_FUNCTION_ENTRY ();
/* Since this thread will sleep, we must release the interpreter */
@@ -156,34 +180,35 @@
/* And now we must get the interpreter again */
- acpi_ex_enter_interpreter ();
+ status = acpi_ex_enter_interpreter ();
+ return (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_acquire_mutex
+ * FUNCTION: acpi_ex_system_acquire_mutex
*
- * PARAMETERS: *Time_desc - The 'time to delay' object descriptor
- * *Obj_desc - The object descriptor for this op
+ * PARAMETERS: *time_desc - The 'time to delay' object descriptor
+ * *obj_desc - The object descriptor for this op
*
* RETURN: Status
*
* DESCRIPTION: Provides an access point to perform synchronization operations
* within the AML. This function will cause a lock to be generated
- * for the Mutex pointed to by Obj_desc.
+ * for the Mutex pointed to by obj_desc.
*
******************************************************************************/
acpi_status
acpi_ex_system_acquire_mutex (
- acpi_operand_object *time_desc,
- acpi_operand_object *obj_desc)
+ union acpi_operand_object *time_desc,
+ union acpi_operand_object *obj_desc)
{
- acpi_status status = AE_OK;
+ acpi_status status = AE_OK;
- FUNCTION_TRACE_PTR ("Ex_system_acquire_mutex", obj_desc);
+ ACPI_FUNCTION_TRACE_PTR ("ex_system_acquire_mutex", obj_desc);
if (!obj_desc) {
@@ -194,21 +219,21 @@
* Support for the _GL_ Mutex object -- go get the global lock
*/
if (obj_desc->mutex.semaphore == acpi_gbl_global_lock_semaphore) {
- status = acpi_ev_acquire_global_lock ();
+ status = acpi_ev_acquire_global_lock ((u16) time_desc->integer.value);
return_ACPI_STATUS (status);
}
status = acpi_ex_system_wait_semaphore (obj_desc->mutex.semaphore,
- (u32) time_desc->integer.value);
+ (u16) time_desc->integer.value);
return_ACPI_STATUS (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_release_mutex
+ * FUNCTION: acpi_ex_system_release_mutex
*
- * PARAMETERS: *Obj_desc - The object descriptor for this op
+ * PARAMETERS: *obj_desc - The object descriptor for this op
*
* RETURN: Status
*
@@ -221,12 +246,12 @@
acpi_status
acpi_ex_system_release_mutex (
- acpi_operand_object *obj_desc)
+ union acpi_operand_object *obj_desc)
{
- acpi_status status = AE_OK;
+ acpi_status status = AE_OK;
- FUNCTION_TRACE ("Ex_system_release_mutex");
+ ACPI_FUNCTION_TRACE ("ex_system_release_mutex");
if (!obj_desc) {
@@ -237,8 +262,8 @@
* Support for the _GL_ Mutex object -- release the global lock
*/
if (obj_desc->mutex.semaphore == acpi_gbl_global_lock_semaphore) {
- acpi_ev_release_global_lock ();
- return_ACPI_STATUS (AE_OK);
+ status = acpi_ev_release_global_lock ();
+ return_ACPI_STATUS (status);
}
status = acpi_os_signal_semaphore (obj_desc->mutex.semaphore, 1);
@@ -248,9 +273,9 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_signal_event
+ * FUNCTION: acpi_ex_system_signal_event
*
- * PARAMETERS: *Obj_desc - The object descriptor for this op
+ * PARAMETERS: *obj_desc - The object descriptor for this op
*
* RETURN: AE_OK
*
@@ -261,12 +286,12 @@
acpi_status
acpi_ex_system_signal_event (
- acpi_operand_object *obj_desc)
+ union acpi_operand_object *obj_desc)
{
- acpi_status status = AE_OK;
+ acpi_status status = AE_OK;
- FUNCTION_TRACE ("Ex_system_signal_event");
+ ACPI_FUNCTION_TRACE ("ex_system_signal_event");
if (obj_desc) {
@@ -279,10 +304,10 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_wait_event
+ * FUNCTION: acpi_ex_system_wait_event
*
- * PARAMETERS: *Time_desc - The 'time to delay' object descriptor
- * *Obj_desc - The object descriptor for this op
+ * PARAMETERS: *time_desc - The 'time to delay' object descriptor
+ * *obj_desc - The object descriptor for this op
*
* RETURN: Status
*
@@ -294,30 +319,29 @@
acpi_status
acpi_ex_system_wait_event (
- acpi_operand_object *time_desc,
- acpi_operand_object *obj_desc)
+ union acpi_operand_object *time_desc,
+ union acpi_operand_object *obj_desc)
{
- acpi_status status = AE_OK;
+ acpi_status status = AE_OK;
- FUNCTION_TRACE ("Ex_system_wait_event");
+ ACPI_FUNCTION_TRACE ("ex_system_wait_event");
if (obj_desc) {
status = acpi_ex_system_wait_semaphore (obj_desc->event.semaphore,
- (u32) time_desc->integer.value);
+ (u16) time_desc->integer.value);
}
-
return_ACPI_STATUS (status);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_ex_system_reset_event
+ * FUNCTION: acpi_ex_system_reset_event
*
- * PARAMETERS: *Obj_desc - The object descriptor for this op
+ * PARAMETERS: *obj_desc - The object descriptor for this op
*
* RETURN: Status
*
@@ -327,13 +351,13 @@
acpi_status
acpi_ex_system_reset_event (
- acpi_operand_object *obj_desc)
+ union acpi_operand_object *obj_desc)
{
- acpi_status status = AE_OK;
- void *temp_semaphore;
+ acpi_status status = AE_OK;
+ void *temp_semaphore;
- FUNCTION_ENTRY ();
+ ACPI_FUNCTION_ENTRY ();
/*
@@ -342,7 +366,7 @@
*/
status = acpi_os_create_semaphore (ACPI_NO_UNIT_LIMIT, 0, &temp_semaphore);
if (ACPI_SUCCESS (status)) {
- acpi_os_delete_semaphore (obj_desc->event.semaphore);
+ (void) acpi_os_delete_semaphore (obj_desc->event.semaphore);
obj_desc->event.semaphore = temp_semaphore;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)