patch-2.4.22 linux-2.4.22/drivers/acpi/resources/rsmisc.c
Next file: linux-2.4.22/drivers/acpi/resources/rsutils.c
Previous file: linux-2.4.22/drivers/acpi/resources/rsmemory.c
Back to the patch index
Back to the overall index
- Lines: 653
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/acpi/resources/rsmisc.c
- Orig date:
2001-09-23 09:42:32.000000000 -0700
diff -urN linux-2.4.21/drivers/acpi/resources/rsmisc.c linux-2.4.22/drivers/acpi/resources/rsmisc.c
@@ -1,70 +1,87 @@
/*******************************************************************************
*
* Module Name: rsmisc - Miscellaneous resource descriptors
- * $Revision: 16 $
*
******************************************************************************/
/*
- * 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 "acresrc.h"
+#include <acpi/acpi.h>
+#include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES
- MODULE_NAME ("rsmisc")
+ ACPI_MODULE_NAME ("rsmisc")
/*******************************************************************************
*
- * FUNCTION: Acpi_rs_end_tag_resource
+ * FUNCTION: acpi_rs_end_tag_resource
*
- * PARAMETERS: Byte_stream_buffer - Pointer to the resource input byte
+ * PARAMETERS: byte_stream_buffer - Pointer to the resource input byte
* stream
- * Bytes_consumed - u32 pointer that is filled with
- * the number of bytes consumed from
- * the Byte_stream_buffer
- * Output_buffer - Pointer to the user's return buffer
- * Structure_size - u32 pointer that is filled with
- * the number of bytes in the filled
- * in structure
+ * bytes_consumed - Pointer to where the number of bytes
+ * consumed the byte_stream_buffer is
+ * returned
+ * output_buffer - Pointer to the return data buffer
+ * structure_size - Pointer to where the number of bytes
+ * in the return data struct is returned
*
* RETURN: Status
*
* DESCRIPTION: Take the resource byte stream and fill out the appropriate
- * structure pointed to by the Output_buffer. Return the
+ * structure pointed to by the output_buffer. Return the
* number of bytes consumed from the byte stream.
*
******************************************************************************/
acpi_status
acpi_rs_end_tag_resource (
- u8 *byte_stream_buffer,
- u32 *bytes_consumed,
- u8 **output_buffer,
- u32 *structure_size)
+ u8 *byte_stream_buffer,
+ acpi_size *bytes_consumed,
+ u8 **output_buffer,
+ acpi_size *structure_size)
{
- acpi_resource *output_struct = (acpi_resource *) *output_buffer;
- u32 struct_size = ACPI_RESOURCE_LENGTH;
+ struct acpi_resource *output_struct = (void *) *output_buffer;
+ acpi_size struct_size = ACPI_RESOURCE_LENGTH;
- FUNCTION_TRACE ("Rs_end_tag_resource");
+ ACPI_FUNCTION_TRACE ("rs_end_tag_resource");
/*
@@ -92,13 +109,12 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_rs_end_tag_stream
+ * FUNCTION: acpi_rs_end_tag_stream
*
- * PARAMETERS: Linked_list - Pointer to the resource linked list
- * Output_buffer - Pointer to the user's return buffer
- * Bytes_consumed - u32 pointer that is filled with
- * the number of bytes of the
- * Output_buffer used
+ * PARAMETERS: linked_list - Pointer to the resource linked list
+ * output_buffer - Pointer to the user's return buffer
+ * bytes_consumed - Pointer to where the number of bytes
+ * used in the output_buffer is returned
*
* RETURN: Status
*
@@ -109,15 +125,15 @@
acpi_status
acpi_rs_end_tag_stream (
- acpi_resource *linked_list,
- u8 **output_buffer,
- u32 *bytes_consumed)
+ struct acpi_resource *linked_list,
+ u8 **output_buffer,
+ acpi_size *bytes_consumed)
{
- u8 *buffer = *output_buffer;
- u8 temp8 = 0;
+ u8 *buffer = *output_buffer;
+ u8 temp8 = 0;
- FUNCTION_TRACE ("Rs_end_tag_stream");
+ ACPI_FUNCTION_TRACE ("rs_end_tag_stream");
/*
@@ -138,49 +154,48 @@
/*
* Return the number of bytes consumed in this operation
*/
- *bytes_consumed = POINTER_DIFF (buffer, *output_buffer);
+ *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
return_ACPI_STATUS (AE_OK);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_rs_vendor_resource
+ * FUNCTION: acpi_rs_vendor_resource
*
- * PARAMETERS: Byte_stream_buffer - Pointer to the resource input byte
+ * PARAMETERS: byte_stream_buffer - Pointer to the resource input byte
* stream
- * Bytes_consumed - u32 pointer that is filled with
- * the number of bytes consumed from
- * the Byte_stream_buffer
- * Output_buffer - Pointer to the user's return buffer
- * Structure_size - u32 pointer that is filled with
- * the number of bytes in the filled
- * in structure
+ * bytes_consumed - Pointer to where the number of bytes
+ * consumed the byte_stream_buffer is
+ * returned
+ * output_buffer - Pointer to the return data buffer
+ * structure_size - Pointer to where the number of bytes
+ * in the return data struct is returned
*
* RETURN: Status
*
* DESCRIPTION: Take the resource byte stream and fill out the appropriate
- * structure pointed to by the Output_buffer. Return the
+ * structure pointed to by the output_buffer. Return the
* number of bytes consumed from the byte stream.
*
******************************************************************************/
acpi_status
acpi_rs_vendor_resource (
- u8 *byte_stream_buffer,
- u32 *bytes_consumed,
- u8 **output_buffer,
- u32 *structure_size)
+ u8 *byte_stream_buffer,
+ acpi_size *bytes_consumed,
+ u8 **output_buffer,
+ acpi_size *structure_size)
{
- u8 *buffer = byte_stream_buffer;
- acpi_resource *output_struct = (acpi_resource *) *output_buffer;
- u16 temp16 = 0;
- u8 temp8 = 0;
- u8 index;
- u32 struct_size = SIZEOF_RESOURCE (acpi_resource_vendor);
+ u8 *buffer = byte_stream_buffer;
+ struct acpi_resource *output_struct = (void *) *output_buffer;
+ u16 temp16 = 0;
+ u8 temp8 = 0;
+ u8 index;
+ acpi_size struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_vendor);
- FUNCTION_TRACE ("Rs_vendor_resource");
+ ACPI_FUNCTION_TRACE ("rs_vendor_resource");
/*
@@ -190,34 +205,31 @@
if (temp8 & 0x80) {
/*
- * Large Item
- * Point to the length field
+ * Large Item, point to the length field
*/
buffer += 1;
/* Dereference */
- MOVE_UNALIGNED16_TO_16 (&temp16, buffer);
+ ACPI_MOVE_16_TO_16 (&temp16, buffer);
/* Calculate bytes consumed */
- *bytes_consumed = temp16 + 3;
+ *bytes_consumed = (acpi_size) temp16 + 3;
/* Point to the first vendor byte */
buffer += 2;
}
-
else {
/*
- * Small Item
- * Dereference the size
+ * Small Item, dereference the size
*/
temp16 = (u8)(*buffer & 0x07);
/* Calculate bytes consumed */
- *bytes_consumed = temp16 + 1;
+ *bytes_consumed = (acpi_size) temp16 + 1;
/* Point to the first vendor byte */
@@ -233,16 +245,16 @@
}
/*
- * In order for the Struct_size to fall on a 32-bit boundary,
+ * In order for the struct_size to fall on a 32-bit boundary,
* calculate the length of the vendor string and expand the
- * Struct_size to the next 32-bit boundary.
+ * struct_size to the next 32-bit boundary.
*/
- struct_size += ROUND_UP_TO_32_bITS (temp16);
+ struct_size += ACPI_ROUND_UP_to_32_bITS (temp16);
/*
* Set the Length parameter
*/
- output_struct->length = struct_size;
+ output_struct->length = (u32) struct_size;
/*
* Return the final size of the structure
@@ -254,13 +266,12 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_rs_vendor_stream
+ * FUNCTION: acpi_rs_vendor_stream
*
- * PARAMETERS: Linked_list - Pointer to the resource linked list
- * Output_buffer - Pointer to the user's return buffer
- * Bytes_consumed - u32 pointer that is filled with
- * the number of bytes of the
- * Output_buffer used
+ * PARAMETERS: linked_list - Pointer to the resource linked list
+ * output_buffer - Pointer to the user's return buffer
+ * bytes_consumed - Pointer to where the number of bytes
+ * used in the output_buffer is returned
*
* RETURN: Status
*
@@ -271,17 +282,17 @@
acpi_status
acpi_rs_vendor_stream (
- acpi_resource *linked_list,
- u8 **output_buffer,
- u32 *bytes_consumed)
+ struct acpi_resource *linked_list,
+ u8 **output_buffer,
+ acpi_size *bytes_consumed)
{
- u8 *buffer = *output_buffer;
- u16 temp16 = 0;
- u8 temp8 = 0;
- u8 index;
+ u8 *buffer = *output_buffer;
+ u16 temp16 = 0;
+ u8 temp8 = 0;
+ u8 index;
- FUNCTION_TRACE ("Rs_vendor_stream");
+ ACPI_FUNCTION_TRACE ("rs_vendor_stream");
/*
@@ -289,25 +300,22 @@
*/
if(linked_list->data.vendor_specific.length > 7) {
/*
- * Large Item
- * Set the descriptor field and length bytes
+ * Large Item, Set the descriptor field and length bytes
*/
*buffer = 0x84;
buffer += 1;
temp16 = (u16) linked_list->data.vendor_specific.length;
- MOVE_UNALIGNED16_TO_16 (buffer, &temp16);
+ ACPI_MOVE_16_TO_16 (buffer, &temp16);
buffer += 2;
}
-
else {
/*
- * Small Item
- * Set the descriptor field
+ * Small Item, Set the descriptor field
*/
temp8 = 0x70;
- temp8 |= linked_list->data.vendor_specific.length;
+ temp8 |= (u8) linked_list->data.vendor_specific.length;
*buffer = temp8;
buffer += 1;
@@ -326,47 +334,46 @@
/*
* Return the number of bytes consumed in this operation
*/
- *bytes_consumed = POINTER_DIFF (buffer, *output_buffer);
+ *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
return_ACPI_STATUS (AE_OK);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_rs_start_dependent_functions_resource
+ * FUNCTION: acpi_rs_start_depend_fns_resource
*
- * PARAMETERS: Byte_stream_buffer - Pointer to the resource input byte
+ * PARAMETERS: byte_stream_buffer - Pointer to the resource input byte
* stream
- * Bytes_consumed - u32 pointer that is filled with
- * the number of bytes consumed from
- * the Byte_stream_buffer
- * Output_buffer - Pointer to the user's return buffer
- * Structure_size - u32 pointer that is filled with
- * the number of bytes in the filled
- * in structure
+ * bytes_consumed - Pointer to where the number of bytes
+ * consumed the byte_stream_buffer is
+ * returned
+ * output_buffer - Pointer to the return data buffer
+ * structure_size - Pointer to where the number of bytes
+ * in the return data struct is returned
*
* RETURN: Status
*
* DESCRIPTION: Take the resource byte stream and fill out the appropriate
- * structure pointed to by the Output_buffer. Return the
+ * structure pointed to by the output_buffer. Return the
* number of bytes consumed from the byte stream.
*
******************************************************************************/
acpi_status
-acpi_rs_start_dependent_functions_resource (
- u8 *byte_stream_buffer,
- u32 *bytes_consumed,
- u8 **output_buffer,
- u32 *structure_size)
+acpi_rs_start_depend_fns_resource (
+ u8 *byte_stream_buffer,
+ acpi_size *bytes_consumed,
+ u8 **output_buffer,
+ acpi_size *structure_size)
{
- u8 *buffer = byte_stream_buffer;
- acpi_resource *output_struct = (acpi_resource *) *output_buffer;
- u8 temp8 = 0;
- u32 struct_size = SIZEOF_RESOURCE (acpi_resource_start_dpf);
+ u8 *buffer = byte_stream_buffer;
+ struct acpi_resource *output_struct = (void *) *output_buffer;
+ u8 temp8 = 0;
+ acpi_size struct_size = ACPI_SIZEOF_RESOURCE (struct acpi_resource_start_dpf);
- FUNCTION_TRACE ("Rs_start_dependent_functions_resource");
+ ACPI_FUNCTION_TRACE ("rs_start_depend_fns_resource");
/*
@@ -391,7 +398,7 @@
output_struct->data.start_dpf.compatibility_priority = temp8 & 0x03;
if (3 == output_struct->data.start_dpf.compatibility_priority) {
- return_ACPI_STATUS (AE_AML_ERROR);
+ return_ACPI_STATUS (AE_AML_BAD_RESOURCE_VALUE);
}
/*
@@ -400,22 +407,21 @@
output_struct->data.start_dpf.performance_robustness = (temp8 >> 2) & 0x03;
if (3 == output_struct->data.start_dpf.performance_robustness) {
- return_ACPI_STATUS (AE_AML_ERROR);
+ return_ACPI_STATUS (AE_AML_BAD_RESOURCE_VALUE);
}
}
-
else {
output_struct->data.start_dpf.compatibility_priority =
- ACCEPTABLE_CONFIGURATION;
+ ACPI_ACCEPTABLE_CONFIGURATION;
output_struct->data.start_dpf.performance_robustness =
- ACCEPTABLE_CONFIGURATION;
+ ACPI_ACCEPTABLE_CONFIGURATION;
}
/*
* Set the Length parameter
*/
- output_struct->length = struct_size;
+ output_struct->length = (u32) struct_size;
/*
* Return the final size of the structure
@@ -427,38 +433,37 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_rs_end_dependent_functions_resource
+ * FUNCTION: acpi_rs_end_depend_fns_resource
*
- * PARAMETERS: Byte_stream_buffer - Pointer to the resource input byte
+ * PARAMETERS: byte_stream_buffer - Pointer to the resource input byte
* stream
- * Bytes_consumed - u32 pointer that is filled with
- * the number of bytes consumed from
- * the Byte_stream_buffer
- * Output_buffer - Pointer to the user's return buffer
- * Structure_size - u32 pointer that is filled with
- * the number of bytes in the filled
- * in structure
+ * bytes_consumed - Pointer to where the number of bytes
+ * consumed the byte_stream_buffer is
+ * returned
+ * output_buffer - Pointer to the return data buffer
+ * structure_size - Pointer to where the number of bytes
+ * in the return data struct is returned
*
* RETURN: Status
*
* DESCRIPTION: Take the resource byte stream and fill out the appropriate
- * structure pointed to by the Output_buffer. Return the
+ * structure pointed to by the output_buffer. Return the
* number of bytes consumed from the byte stream.
*
******************************************************************************/
acpi_status
-acpi_rs_end_dependent_functions_resource (
- u8 *byte_stream_buffer,
- u32 *bytes_consumed,
- u8 **output_buffer,
- u32 *structure_size)
+acpi_rs_end_depend_fns_resource (
+ u8 *byte_stream_buffer,
+ acpi_size *bytes_consumed,
+ u8 **output_buffer,
+ acpi_size *structure_size)
{
- acpi_resource *output_struct = (acpi_resource *) *output_buffer;
- u32 struct_size = ACPI_RESOURCE_LENGTH;
+ struct acpi_resource *output_struct = (void *) *output_buffer;
+ acpi_size struct_size = ACPI_RESOURCE_LENGTH;
- FUNCTION_TRACE ("Rs_end_dependent_functions_resource");
+ ACPI_FUNCTION_TRACE ("rs_end_depend_fns_resource");
/*
@@ -474,7 +479,7 @@
/*
* Set the Length parameter
*/
- output_struct->length = struct_size;
+ output_struct->length = (u32) struct_size;
/*
* Return the final size of the structure
@@ -486,13 +491,13 @@
/*******************************************************************************
*
- * FUNCTION: Acpi_rs_start_dependent_functions_stream
+ * FUNCTION: acpi_rs_start_depend_fns_stream
*
- * PARAMETERS: Linked_list - Pointer to the resource linked list
- * Output_buffer - Pointer to the user's return buffer
- * Bytes_consumed - u32 pointer that is filled with
+ * PARAMETERS: linked_list - Pointer to the resource linked list
+ * output_buffer - Pointer to the user's return buffer
+ * bytes_consumed - u32 pointer that is filled with
* the number of bytes of the
- * Output_buffer used
+ * output_buffer used
*
* RETURN: Status
*
@@ -502,25 +507,25 @@
******************************************************************************/
acpi_status
-acpi_rs_start_dependent_functions_stream (
- acpi_resource *linked_list,
- u8 **output_buffer,
- u32 *bytes_consumed)
+acpi_rs_start_depend_fns_stream (
+ struct acpi_resource *linked_list,
+ u8 **output_buffer,
+ acpi_size *bytes_consumed)
{
- u8 *buffer = *output_buffer;
- u8 temp8 = 0;
+ u8 *buffer = *output_buffer;
+ u8 temp8 = 0;
- FUNCTION_TRACE ("Rs_start_dependent_functions_stream");
+ ACPI_FUNCTION_TRACE ("rs_start_depend_fns_stream");
/*
* The descriptor field is set based upon whether a byte is needed
* to contain Priority data.
*/
- if (ACCEPTABLE_CONFIGURATION ==
+ if (ACPI_ACCEPTABLE_CONFIGURATION ==
linked_list->data.start_dpf.compatibility_priority &&
- ACCEPTABLE_CONFIGURATION ==
+ ACPI_ACCEPTABLE_CONFIGURATION ==
linked_list->data.start_dpf.performance_robustness) {
*buffer = 0x30;
}
@@ -544,20 +549,19 @@
/*
* Return the number of bytes consumed in this operation
*/
- *bytes_consumed = POINTER_DIFF (buffer, *output_buffer);
+ *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
return_ACPI_STATUS (AE_OK);
}
/*******************************************************************************
*
- * FUNCTION: Acpi_rs_end_dependent_functions_stream
+ * FUNCTION: acpi_rs_end_depend_fns_stream
*
- * PARAMETERS: Linked_list - Pointer to the resource linked list
- * Output_buffer - Pointer to the user's return buffer
- * Bytes_consumed - u32 pointer that is filled with
- * the number of bytes of the
- * Output_buffer used
+ * PARAMETERS: linked_list - Pointer to the resource linked list
+ * output_buffer - Pointer to the user's return buffer
+ * bytes_consumed - Pointer to where the number of bytes
+ * used in the output_buffer is returned
*
* RETURN: Status
*
@@ -567,16 +571,15 @@
******************************************************************************/
acpi_status
-acpi_rs_end_dependent_functions_stream (
- acpi_resource *linked_list,
- u8 **output_buffer,
- u32 *bytes_consumed
- )
+acpi_rs_end_depend_fns_stream (
+ struct acpi_resource *linked_list,
+ u8 **output_buffer,
+ acpi_size *bytes_consumed)
{
- u8 *buffer = *output_buffer;
+ u8 *buffer = *output_buffer;
- FUNCTION_TRACE ("Rs_end_dependent_functions_stream");
+ ACPI_FUNCTION_TRACE ("rs_end_depend_fns_stream");
/*
@@ -588,7 +591,7 @@
/*
* Return the number of bytes consumed in this operation
*/
- *bytes_consumed = POINTER_DIFF (buffer, *output_buffer);
+ *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
return_ACPI_STATUS (AE_OK);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)