]> err.no Git - linux-2.6/blobdiff - drivers/acpi/resources/rsmemory.c
Merge branch 'master' of /usr/src/linux-2.6
[linux-2.6] / drivers / acpi / resources / rsmemory.c
index 91d0207f01ac76dd204fa3f6efe38a1fdb272c86..daba1a1ed46db522d747241567db8685e385e497 100644 (file)
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
-        ACPI_MODULE_NAME    ("rsmemory")
-
+ACPI_MODULE_NAME("rsmemory")
 
 /*******************************************************************************
  *
  *              number of bytes consumed from the byte stream.
  *
  ******************************************************************************/
-
 acpi_status
-acpi_rs_memory24_resource (
-       u8                              *byte_stream_buffer,
-       acpi_size                       *bytes_consumed,
-       u8                              **output_buffer,
-       acpi_size                       *structure_size)
+acpi_rs_memory24_resource(u8 * byte_stream_buffer,
+                         acpi_size * bytes_consumed,
+                         u8 ** output_buffer, acpi_size * structure_size)
 {
-       u8                              *buffer = byte_stream_buffer;
-       struct acpi_resource            *output_struct = (void *) *output_buffer;
-       u16                             temp16 = 0;
-       u8                              temp8 = 0;
-       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (
-                         struct acpi_resource_mem24);
-
-
-       ACPI_FUNCTION_TRACE ("rs_memory24_resource");
+       u8 *buffer = byte_stream_buffer;
+       struct acpi_resource *output_struct = (void *)*output_buffer;
+       u16 temp16 = 0;
+       u8 temp8 = 0;
+       acpi_size struct_size =
+           ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem24);
 
+       ACPI_FUNCTION_TRACE("rs_memory24_resource");
 
        /* Point past the Descriptor to get the number of bytes consumed */
 
        buffer += 1;
 
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
        buffer += 2;
        *bytes_consumed = (acpi_size) temp16 + 3;
        output_struct->id = ACPI_RSTYPE_MEM24;
@@ -105,25 +98,25 @@ acpi_rs_memory24_resource (
 
        /* Get min_base_address (Bytes 4-5) */
 
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
        buffer += 2;
        output_struct->data.memory24.min_base_address = temp16;
 
        /* Get max_base_address (Bytes 6-7) */
 
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
        buffer += 2;
        output_struct->data.memory24.max_base_address = temp16;
 
        /* Get Alignment (Bytes 8-9) */
 
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
        buffer += 2;
        output_struct->data.memory24.alignment = temp16;
 
        /* Get range_length (Bytes 10-11) */
 
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
        output_struct->data.memory24.range_length = temp16;
 
        /* Set the Length parameter */
@@ -133,10 +126,9 @@ acpi_rs_memory24_resource (
        /* Return the final size of the structure */
 
        *structure_size = struct_size;
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_memory24_stream
@@ -154,18 +146,14 @@ acpi_rs_memory24_resource (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_memory24_stream (
-       struct acpi_resource            *linked_list,
-       u8                              **output_buffer,
-       acpi_size                       *bytes_consumed)
+acpi_rs_memory24_stream(struct acpi_resource *linked_list,
+                       u8 ** output_buffer, acpi_size * bytes_consumed)
 {
-       u8                              *buffer = *output_buffer;
-       u16                             temp16 = 0;
-       u8                              temp8 = 0;
-
-
-       ACPI_FUNCTION_TRACE ("rs_memory24_stream");
+       u8 *buffer = *output_buffer;
+       u16 temp16 = 0;
+       u8 temp8 = 0;
 
+       ACPI_FUNCTION_TRACE("rs_memory24_stream");
 
        /* The descriptor field is static */
 
@@ -175,7 +163,7 @@ acpi_rs_memory24_stream (
        /* The length field is static */
 
        temp16 = 0x09;
-       ACPI_MOVE_16_TO_16 (buffer, &temp16);
+       ACPI_MOVE_16_TO_16(buffer, &temp16);
        buffer += 2;
 
        /* Set the Information Byte */
@@ -186,31 +174,32 @@ acpi_rs_memory24_stream (
 
        /* Set the Range minimum base address */
 
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.memory24.min_base_address);
+       ACPI_MOVE_32_TO_16(buffer,
+                          &linked_list->data.memory24.min_base_address);
        buffer += 2;
 
        /* Set the Range maximum base address */
 
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.memory24.max_base_address);
+       ACPI_MOVE_32_TO_16(buffer,
+                          &linked_list->data.memory24.max_base_address);
        buffer += 2;
 
        /* Set the base alignment */
 
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.memory24.alignment);
+       ACPI_MOVE_32_TO_16(buffer, &linked_list->data.memory24.alignment);
        buffer += 2;
 
        /* Set the range length */
 
-       ACPI_MOVE_32_TO_16 (buffer, &linked_list->data.memory24.range_length);
+       ACPI_MOVE_32_TO_16(buffer, &linked_list->data.memory24.range_length);
        buffer += 2;
 
        /* Return the number of bytes consumed in this operation */
 
-       *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
-       return_ACPI_STATUS (AE_OK);
+       *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_memory32_range_resource
@@ -233,28 +222,24 @@ acpi_rs_memory24_stream (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_memory32_range_resource (
-       u8                              *byte_stream_buffer,
-       acpi_size                       *bytes_consumed,
-       u8                              **output_buffer,
-       acpi_size                       *structure_size)
+acpi_rs_memory32_range_resource(u8 * byte_stream_buffer,
+                               acpi_size * bytes_consumed,
+                               u8 ** output_buffer, acpi_size * structure_size)
 {
-       u8                              *buffer = byte_stream_buffer;
-       struct acpi_resource            *output_struct = (void *) *output_buffer;
-       u16                             temp16 = 0;
-       u8                              temp8 = 0;
-       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (
-                         struct acpi_resource_mem32);
-
-
-       ACPI_FUNCTION_TRACE ("rs_memory32_range_resource");
+       u8 *buffer = byte_stream_buffer;
+       struct acpi_resource *output_struct = (void *)*output_buffer;
+       u16 temp16 = 0;
+       u8 temp8 = 0;
+       acpi_size struct_size =
+           ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem32);
 
+       ACPI_FUNCTION_TRACE("rs_memory32_range_resource");
 
        /* Point past the Descriptor to get the number of bytes consumed */
 
        buffer += 1;
 
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
        buffer += 2;
        *bytes_consumed = (acpi_size) temp16 + 3;
 
@@ -279,22 +264,24 @@ acpi_rs_memory32_range_resource (
 
        /* Get min_base_address (Bytes 4-7) */
 
-       ACPI_MOVE_32_TO_32 (&output_struct->data.memory32.min_base_address, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.memory32.min_base_address,
+                          buffer);
        buffer += 4;
 
        /* Get max_base_address (Bytes 8-11) */
 
-       ACPI_MOVE_32_TO_32 (&output_struct->data.memory32.max_base_address, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.memory32.max_base_address,
+                          buffer);
        buffer += 4;
 
        /* Get Alignment (Bytes 12-15) */
 
-       ACPI_MOVE_32_TO_32 (&output_struct->data.memory32.alignment, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.memory32.alignment, buffer);
        buffer += 4;
 
        /* Get range_length (Bytes 16-19) */
 
-       ACPI_MOVE_32_TO_32 (&output_struct->data.memory32.range_length, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.memory32.range_length, buffer);
 
        /* Set the Length parameter */
 
@@ -303,10 +290,9 @@ acpi_rs_memory32_range_resource (
        /* Return the final size of the structure */
 
        *structure_size = struct_size;
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_fixed_memory32_resource
@@ -329,27 +315,23 @@ acpi_rs_memory32_range_resource (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_fixed_memory32_resource (
-       u8                              *byte_stream_buffer,
-       acpi_size                       *bytes_consumed,
-       u8                              **output_buffer,
-       acpi_size                       *structure_size)
+acpi_rs_fixed_memory32_resource(u8 * byte_stream_buffer,
+                               acpi_size * bytes_consumed,
+                               u8 ** output_buffer, acpi_size * structure_size)
 {
-       u8                              *buffer = byte_stream_buffer;
-       struct acpi_resource            *output_struct = (void *) *output_buffer;
-       u16                             temp16 = 0;
-       u8                              temp8 = 0;
-       acpi_size                       struct_size = ACPI_SIZEOF_RESOURCE (
-                         struct acpi_resource_fixed_mem32);
-
-
-       ACPI_FUNCTION_TRACE ("rs_fixed_memory32_resource");
+       u8 *buffer = byte_stream_buffer;
+       struct acpi_resource *output_struct = (void *)*output_buffer;
+       u16 temp16 = 0;
+       u8 temp8 = 0;
+       acpi_size struct_size =
+           ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_mem32);
 
+       ACPI_FUNCTION_TRACE("rs_fixed_memory32_resource");
 
        /* Point past the Descriptor to get the number of bytes consumed */
 
        buffer += 1;
-       ACPI_MOVE_16_TO_16 (&temp16, buffer);
+       ACPI_MOVE_16_TO_16(&temp16, buffer);
 
        buffer += 2;
        *bytes_consumed = (acpi_size) temp16 + 3;
@@ -364,13 +346,14 @@ acpi_rs_fixed_memory32_resource (
 
        /* Get range_base_address (Bytes 4-7) */
 
-       ACPI_MOVE_32_TO_32 (&output_struct->data.fixed_memory32.range_base_address,
-               buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.fixed_memory32.
+                          range_base_address, buffer);
        buffer += 4;
 
        /* Get range_length (Bytes 8-11) */
 
-       ACPI_MOVE_32_TO_32 (&output_struct->data.fixed_memory32.range_length, buffer);
+       ACPI_MOVE_32_TO_32(&output_struct->data.fixed_memory32.range_length,
+                          buffer);
 
        /* Set the Length parameter */
 
@@ -379,10 +362,9 @@ acpi_rs_fixed_memory32_resource (
        /* Return the final size of the structure */
 
        *structure_size = struct_size;
-       return_ACPI_STATUS (AE_OK);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_memory32_range_stream
@@ -400,18 +382,14 @@ acpi_rs_fixed_memory32_resource (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_memory32_range_stream (
-       struct acpi_resource            *linked_list,
-       u8                              **output_buffer,
-       acpi_size                       *bytes_consumed)
+acpi_rs_memory32_range_stream(struct acpi_resource *linked_list,
+                             u8 ** output_buffer, acpi_size * bytes_consumed)
 {
-       u8                              *buffer = *output_buffer;
-       u16                             temp16 = 0;
-       u8                              temp8 = 0;
-
-
-       ACPI_FUNCTION_TRACE ("rs_memory32_range_stream");
+       u8 *buffer = *output_buffer;
+       u16 temp16 = 0;
+       u8 temp8 = 0;
 
+       ACPI_FUNCTION_TRACE("rs_memory32_range_stream");
 
        /* The descriptor field is static */
 
@@ -422,7 +400,7 @@ acpi_rs_memory32_range_stream (
 
        temp16 = 0x11;
 
-       ACPI_MOVE_16_TO_16 (buffer, &temp16);
+       ACPI_MOVE_16_TO_16(buffer, &temp16);
        buffer += 2;
 
        /* Set the Information Byte */
@@ -433,31 +411,32 @@ acpi_rs_memory32_range_stream (
 
        /* Set the Range minimum base address */
 
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.memory32.min_base_address);
+       ACPI_MOVE_32_TO_32(buffer,
+                          &linked_list->data.memory32.min_base_address);
        buffer += 4;
 
        /* Set the Range maximum base address */
 
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.memory32.max_base_address);
+       ACPI_MOVE_32_TO_32(buffer,
+                          &linked_list->data.memory32.max_base_address);
        buffer += 4;
 
        /* Set the base alignment */
 
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.memory32.alignment);
+       ACPI_MOVE_32_TO_32(buffer, &linked_list->data.memory32.alignment);
        buffer += 4;
 
        /* Set the range length */
 
-       ACPI_MOVE_32_TO_32 (buffer, &linked_list->data.memory32.range_length);
+       ACPI_MOVE_32_TO_32(buffer, &linked_list->data.memory32.range_length);
        buffer += 4;
 
        /* Return the number of bytes consumed in this operation */
 
-       *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
-       return_ACPI_STATUS (AE_OK);
+       *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
+       return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_rs_fixed_memory32_stream
@@ -475,18 +454,14 @@ acpi_rs_memory32_range_stream (
  ******************************************************************************/
 
 acpi_status
-acpi_rs_fixed_memory32_stream (
-       struct acpi_resource            *linked_list,
-       u8                              **output_buffer,
-       acpi_size                       *bytes_consumed)
+acpi_rs_fixed_memory32_stream(struct acpi_resource *linked_list,
+                             u8 ** output_buffer, acpi_size * bytes_consumed)
 {
-       u8                              *buffer = *output_buffer;
-       u16                             temp16 = 0;
-       u8                              temp8 = 0;
-
-
-       ACPI_FUNCTION_TRACE ("rs_fixed_memory32_stream");
+       u8 *buffer = *output_buffer;
+       u16 temp16 = 0;
+       u8 temp8 = 0;
 
+       ACPI_FUNCTION_TRACE("rs_fixed_memory32_stream");
 
        /* The descriptor field is static */
 
@@ -497,30 +472,31 @@ acpi_rs_fixed_memory32_stream (
 
        temp16 = 0x09;
 
-       ACPI_MOVE_16_TO_16 (buffer, &temp16);
+       ACPI_MOVE_16_TO_16(buffer, &temp16);
        buffer += 2;
 
        /* Set the Information Byte */
 
-       temp8 = (u8) (linked_list->data.fixed_memory32.read_write_attribute & 0x01);
+       temp8 =
+           (u8) (linked_list->data.fixed_memory32.read_write_attribute & 0x01);
        *buffer = temp8;
        buffer += 1;
 
        /* Set the Range base address */
 
-       ACPI_MOVE_32_TO_32 (buffer,
-               &linked_list->data.fixed_memory32.range_base_address);
+       ACPI_MOVE_32_TO_32(buffer,
+                          &linked_list->data.fixed_memory32.
+                          range_base_address);
        buffer += 4;
 
        /* Set the range length */
 
-       ACPI_MOVE_32_TO_32 (buffer,
-               &linked_list->data.fixed_memory32.range_length);
+       ACPI_MOVE_32_TO_32(buffer,
+                          &linked_list->data.fixed_memory32.range_length);
        buffer += 4;
 
        /* Return the number of bytes consumed in this operation */
 
-       *bytes_consumed = ACPI_PTR_DIFF (buffer, *output_buffer);
-       return_ACPI_STATUS (AE_OK);
+       *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
+       return_ACPI_STATUS(AE_OK);
 }
-