Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda663d3 authored by Robert Moore's avatar Robert Moore Committed by Len Brown
Browse files

[ACPI] ACPICA 20050916 



Fixed a problem within the Resource Manager where
support for the Generic Register descriptor was not fully
implemented.  This descriptor is now fully recognized,
parsed, disassembled, and displayed.

Restructured the Resource Manager code to utilize
table-driven dispatch and lookup, eliminating many of the
large switch() statements.  This reduces overall subsystem
code size and code complexity.  Affects the resource parsing
and construction, disassembly, and debug dump output.

Cleaned up and restructured the debug dump output for all
resource descriptors.  Improved readability of the output
and reduced code size.

Fixed a problem where changes to internal data structures
caused the optional ACPI_MUTEX_DEBUG code to fail
compilation if specified.

Signed-off-by: default avatarRobert Moore <Robert.Moore@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent efb0372b

drivers/acpi/resources/rsaddr.c

+45 −54
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ acpi_rs_address16_resource(u8 * byte_stream_buffer, 
	}



	*bytes_consumed = temp16 + 3;

	output_struct->id = ACPI_RSTYPE_ADDRESS16;

	output_struct->type = ACPI_RSTYPE_ADDRESS16;



	/* Get the Resource Type (Byte3) */
@@ -400,7 +400,7 @@ acpi_rs_address16_resource(u8 * byte_stream_buffer, 
 *

 * FUNCTION:    acpi_rs_address16_stream

 *

 * PARAMETERS:  linked_list             - Pointer to the resource linked list

 * PARAMETERS:  Resource                - 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
@@ -413,7 +413,7 @@ acpi_rs_address16_resource(u8 * byte_stream_buffer, 
 ******************************************************************************/



acpi_status

acpi_rs_address16_stream(struct acpi_resource *linked_list,

acpi_rs_address16_stream(struct acpi_resource *resource,

			 u8 ** output_buffer, acpi_size * bytes_consumed)

{

	u8 *buffer = *output_buffer;
@@ -434,59 +434,56 @@ acpi_rs_address16_stream(struct acpi_resource *linked_list, 


	/* Set the Resource Type (Memory, Io, bus_number) */



	*buffer = (u8) (linked_list->data.address16.resource_type & 0x03);

	*buffer = (u8) (resource->data.address16.resource_type & 0x03);

	buffer += 1;



	/* Set the general flags */



	*buffer = acpi_rs_encode_general_flags(&linked_list->data);

	*buffer = acpi_rs_encode_general_flags(&resource->data);

	buffer += 1;



	/* Set the type specific flags */



	*buffer = acpi_rs_encode_specific_flags(&linked_list->data);

	*buffer = acpi_rs_encode_specific_flags(&resource->data);

	buffer += 1;



	/* Set the address space granularity */



	ACPI_MOVE_32_TO_16(buffer, &linked_list->data.address16.granularity);

	ACPI_MOVE_32_TO_16(buffer, &resource->data.address16.granularity);

	buffer += 2;



	/* Set the address range minimum */



	ACPI_MOVE_32_TO_16(buffer,

			   &linked_list->data.address16.min_address_range);

	ACPI_MOVE_32_TO_16(buffer, &resource->data.address16.min_address_range);

	buffer += 2;



	/* Set the address range maximum */



	ACPI_MOVE_32_TO_16(buffer,

			   &linked_list->data.address16.max_address_range);

	ACPI_MOVE_32_TO_16(buffer, &resource->data.address16.max_address_range);

	buffer += 2;



	/* Set the address translation offset */



	ACPI_MOVE_32_TO_16(buffer,

			   &linked_list->data.address16.

			   &resource->data.address16.

			   address_translation_offset);

	buffer += 2;



	/* Set the address length */



	ACPI_MOVE_32_TO_16(buffer, &linked_list->data.address16.address_length);

	ACPI_MOVE_32_TO_16(buffer, &resource->data.address16.address_length);

	buffer += 2;



	/* Resource Source Index and Resource Source are optional */



	if (linked_list->data.address16.resource_source.string_length) {

		*buffer =

		    (u8) linked_list->data.address16.resource_source.index;

	if (resource->data.address16.resource_source.string_length) {

		*buffer = (u8) resource->data.address16.resource_source.index;

		buffer += 1;



		/* Copy the resource_source string */



		ACPI_STRCPY((char *)buffer,

			    linked_list->data.address16.resource_source.

			    resource->data.address16.resource_source.

			    string_ptr);



		/*
@@ -495,7 +492,7 @@ acpi_rs_address16_stream(struct acpi_resource *linked_list, 
		 */

		buffer +=

		    (acpi_size) (ACPI_STRLEN

				 (linked_list->data.address16.resource_source.

				 (resource->data.address16.resource_source.

				  string_ptr) + 1);

	}
@@ -562,7 +559,7 @@ acpi_rs_address32_resource(u8 * byte_stream_buffer, 
	}



	*bytes_consumed = temp16 + 3;

	output_struct->id = ACPI_RSTYPE_ADDRESS32;

	output_struct->type = ACPI_RSTYPE_ADDRESS32;



	/* Get the Resource Type (Byte3) */
@@ -690,7 +687,7 @@ acpi_rs_address32_resource(u8 * byte_stream_buffer, 
 *

 * FUNCTION:    acpi_rs_address32_stream

 *

 * PARAMETERS:  linked_list             - Pointer to the resource linked list

 * PARAMETERS:  Resource                - 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
@@ -703,7 +700,7 @@ acpi_rs_address32_resource(u8 * byte_stream_buffer, 
 ******************************************************************************/



acpi_status

acpi_rs_address32_stream(struct acpi_resource *linked_list,

acpi_rs_address32_stream(struct acpi_resource *resource,

			 u8 ** output_buffer, acpi_size * bytes_consumed)

{

	u8 *buffer;
@@ -725,59 +722,56 @@ acpi_rs_address32_stream(struct acpi_resource *linked_list, 


	/* Set the Resource Type (Memory, Io, bus_number) */



	*buffer = (u8) (linked_list->data.address32.resource_type & 0x03);

	*buffer = (u8) (resource->data.address32.resource_type & 0x03);

	buffer += 1;



	/* Set the general flags */



	*buffer = acpi_rs_encode_general_flags(&linked_list->data);

	*buffer = acpi_rs_encode_general_flags(&resource->data);

	buffer += 1;



	/* Set the type specific flags */



	*buffer = acpi_rs_encode_specific_flags(&linked_list->data);

	*buffer = acpi_rs_encode_specific_flags(&resource->data);

	buffer += 1;



	/* Set the address space granularity */



	ACPI_MOVE_32_TO_32(buffer, &linked_list->data.address32.granularity);

	ACPI_MOVE_32_TO_32(buffer, &resource->data.address32.granularity);

	buffer += 4;



	/* Set the address range minimum */



	ACPI_MOVE_32_TO_32(buffer,

			   &linked_list->data.address32.min_address_range);

	ACPI_MOVE_32_TO_32(buffer, &resource->data.address32.min_address_range);

	buffer += 4;



	/* Set the address range maximum */



	ACPI_MOVE_32_TO_32(buffer,

			   &linked_list->data.address32.max_address_range);

	ACPI_MOVE_32_TO_32(buffer, &resource->data.address32.max_address_range);

	buffer += 4;



	/* Set the address translation offset */



	ACPI_MOVE_32_TO_32(buffer,

			   &linked_list->data.address32.

			   &resource->data.address32.

			   address_translation_offset);

	buffer += 4;



	/* Set the address length */



	ACPI_MOVE_32_TO_32(buffer, &linked_list->data.address32.address_length);

	ACPI_MOVE_32_TO_32(buffer, &resource->data.address32.address_length);

	buffer += 4;



	/* Resource Source Index and Resource Source are optional */



	if (linked_list->data.address32.resource_source.string_length) {

		*buffer =

		    (u8) linked_list->data.address32.resource_source.index;

	if (resource->data.address32.resource_source.string_length) {

		*buffer = (u8) resource->data.address32.resource_source.index;

		buffer += 1;



		/* Copy the resource_source string */



		ACPI_STRCPY((char *)buffer,

			    linked_list->data.address32.resource_source.

			    resource->data.address32.resource_source.

			    string_ptr);



		/*
@@ -786,7 +780,7 @@ acpi_rs_address32_stream(struct acpi_resource *linked_list, 
		 */

		buffer +=

		    (acpi_size) (ACPI_STRLEN

				 (linked_list->data.address32.resource_source.

				 (resource->data.address32.resource_source.

				  string_ptr) + 1);

	}
@@ -856,7 +850,7 @@ acpi_rs_address64_resource(u8 * byte_stream_buffer, 
	}



	*bytes_consumed = temp16 + 3;

	output_struct->id = ACPI_RSTYPE_ADDRESS64;

	output_struct->type = ACPI_RSTYPE_ADDRESS64;



	/* Get the Resource Type (Byte3) */
@@ -1005,7 +999,7 @@ acpi_rs_address64_resource(u8 * byte_stream_buffer, 
 *

 * FUNCTION:    acpi_rs_address64_stream

 *

 * PARAMETERS:  linked_list             - Pointer to the resource linked list

 * PARAMETERS:  Resource                - 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
@@ -1018,7 +1012,7 @@ acpi_rs_address64_resource(u8 * byte_stream_buffer, 
 ******************************************************************************/



acpi_status

acpi_rs_address64_stream(struct acpi_resource *linked_list,

acpi_rs_address64_stream(struct acpi_resource *resource,

			 u8 ** output_buffer, acpi_size * bytes_consumed)

{

	u8 *buffer;
@@ -1040,59 +1034,56 @@ acpi_rs_address64_stream(struct acpi_resource *linked_list, 


	/* Set the Resource Type (Memory, Io, bus_number) */



	*buffer = (u8) (linked_list->data.address64.resource_type & 0x03);

	*buffer = (u8) (resource->data.address64.resource_type & 0x03);

	buffer += 1;



	/* Set the general flags */



	*buffer = acpi_rs_encode_general_flags(&linked_list->data);

	*buffer = acpi_rs_encode_general_flags(&resource->data);

	buffer += 1;



	/* Set the type specific flags */



	*buffer = acpi_rs_encode_specific_flags(&linked_list->data);

	*buffer = acpi_rs_encode_specific_flags(&resource->data);

	buffer += 1;



	/* Set the address space granularity */



	ACPI_MOVE_64_TO_64(buffer, &linked_list->data.address64.granularity);

	ACPI_MOVE_64_TO_64(buffer, &resource->data.address64.granularity);

	buffer += 8;



	/* Set the address range minimum */



	ACPI_MOVE_64_TO_64(buffer,

			   &linked_list->data.address64.min_address_range);

	ACPI_MOVE_64_TO_64(buffer, &resource->data.address64.min_address_range);

	buffer += 8;



	/* Set the address range maximum */



	ACPI_MOVE_64_TO_64(buffer,

			   &linked_list->data.address64.max_address_range);

	ACPI_MOVE_64_TO_64(buffer, &resource->data.address64.max_address_range);

	buffer += 8;



	/* Set the address translation offset */



	ACPI_MOVE_64_TO_64(buffer,

			   &linked_list->data.address64.

			   &resource->data.address64.

			   address_translation_offset);

	buffer += 8;



	/* Set the address length */



	ACPI_MOVE_64_TO_64(buffer, &linked_list->data.address64.address_length);

	ACPI_MOVE_64_TO_64(buffer, &resource->data.address64.address_length);

	buffer += 8;



	/* Resource Source Index and Resource Source are optional */



	if (linked_list->data.address64.resource_source.string_length) {

		*buffer =

		    (u8) linked_list->data.address64.resource_source.index;

	if (resource->data.address64.resource_source.string_length) {

		*buffer = (u8) resource->data.address64.resource_source.index;

		buffer += 1;



		/* Copy the resource_source string */



		ACPI_STRCPY((char *)buffer,

			    linked_list->data.address64.resource_source.

			    resource->data.address64.resource_source.

			    string_ptr);



		/*
@@ -1101,7 +1092,7 @@ acpi_rs_address64_stream(struct acpi_resource *linked_list, 
		 */

		buffer +=

		    (acpi_size) (ACPI_STRLEN

				 (linked_list->data.address64.resource_source.

				 (resource->data.address64.resource_source.

				  string_ptr) + 1);

	}

drivers/acpi/resources/rscalc.c

+477 −508

File changed.

Preview size limit exceeded, changes collapsed.

drivers/acpi/resources/rsdump.c

+612 −672

File changed.

Preview size limit exceeded, changes collapsed.

drivers/acpi/resources/rsio.c

+27 −29
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ acpi_rs_io_resource(u8 * byte_stream_buffer, 


	*bytes_consumed = 8;



	output_struct->id = ACPI_RSTYPE_IO;

	output_struct->type = ACPI_RSTYPE_IO;



	/* Check Decode */
@@ -170,7 +170,7 @@ acpi_rs_fixed_io_resource(u8 * byte_stream_buffer, 


	*bytes_consumed = 4;



	output_struct->id = ACPI_RSTYPE_FIXED_IO;

	output_struct->type = ACPI_RSTYPE_FIXED_IO;



	/* Check Range Base Address */
@@ -200,7 +200,7 @@ acpi_rs_fixed_io_resource(u8 * byte_stream_buffer, 
 *

 * FUNCTION:    acpi_rs_io_stream

 *

 * PARAMETERS:  linked_list             - Pointer to the resource linked list

 * PARAMETERS:  Resource                - 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
@@ -213,7 +213,7 @@ acpi_rs_fixed_io_resource(u8 * byte_stream_buffer, 
 ******************************************************************************/



acpi_status

acpi_rs_io_stream(struct acpi_resource *linked_list,

acpi_rs_io_stream(struct acpi_resource *resource,

		  u8 ** output_buffer, acpi_size * bytes_consumed)

{

	u8 *buffer = *output_buffer;
@@ -222,42 +222,42 @@ acpi_rs_io_stream(struct acpi_resource *linked_list, 


	ACPI_FUNCTION_TRACE("rs_io_stream");



	/* The descriptor field is static */

	/* The Descriptor Type field is static */



	*buffer = 0x47;

	*buffer = ACPI_RDESC_TYPE_IO_PORT | 0x07;

	buffer += 1;



	/* Io Information Byte */



	temp8 = (u8) (linked_list->data.io.io_decode & 0x01);

	temp8 = (u8) (resource->data.io.io_decode & 0x01);



	*buffer = temp8;

	buffer += 1;



	/* Set the Range minimum base address */



	temp16 = (u16) linked_list->data.io.min_base_address;

	temp16 = (u16) resource->data.io.min_base_address;



	ACPI_MOVE_16_TO_16(buffer, &temp16);

	buffer += 2;



	/* Set the Range maximum base address */



	temp16 = (u16) linked_list->data.io.max_base_address;

	temp16 = (u16) resource->data.io.max_base_address;



	ACPI_MOVE_16_TO_16(buffer, &temp16);

	buffer += 2;



	/* Set the base alignment */



	temp8 = (u8) linked_list->data.io.alignment;

	temp8 = (u8) resource->data.io.alignment;



	*buffer = temp8;

	buffer += 1;



	/* Set the range length */



	temp8 = (u8) linked_list->data.io.range_length;

	temp8 = (u8) resource->data.io.range_length;



	*buffer = temp8;

	buffer += 1;
@@ -272,7 +272,7 @@ acpi_rs_io_stream(struct acpi_resource *linked_list, 
 *

 * FUNCTION:    acpi_rs_fixed_io_stream

 *

 * PARAMETERS:  linked_list             - Pointer to the resource linked list

 * PARAMETERS:  Resource                - 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
@@ -285,7 +285,7 @@ acpi_rs_io_stream(struct acpi_resource *linked_list, 
 ******************************************************************************/



acpi_status

acpi_rs_fixed_io_stream(struct acpi_resource *linked_list,

acpi_rs_fixed_io_stream(struct acpi_resource *resource,

			u8 ** output_buffer, acpi_size * bytes_consumed)

{

	u8 *buffer = *output_buffer;
@@ -294,22 +294,21 @@ acpi_rs_fixed_io_stream(struct acpi_resource *linked_list, 


	ACPI_FUNCTION_TRACE("rs_fixed_io_stream");



	/* The descriptor field is static */



	*buffer = 0x4B;

	/* The Descriptor Type field is static */



	*buffer = ACPI_RDESC_TYPE_FIXED_IO_PORT | 0x03;

	buffer += 1;



	/* Set the Range base address */



	temp16 = (u16) linked_list->data.fixed_io.base_address;

	temp16 = (u16) resource->data.fixed_io.base_address;



	ACPI_MOVE_16_TO_16(buffer, &temp16);

	buffer += 2;



	/* Set the range length */



	temp8 = (u8) linked_list->data.fixed_io.range_length;

	temp8 = (u8) resource->data.fixed_io.range_length;



	*buffer = temp8;

	buffer += 1;
@@ -358,7 +357,7 @@ acpi_rs_dma_resource(u8 * byte_stream_buffer, 
	/* The number of bytes consumed are Constant */



	*bytes_consumed = 3;

	output_struct->id = ACPI_RSTYPE_DMA;

	output_struct->type = ACPI_RSTYPE_DMA;



	/* Point to the 8-bits of Byte 1 */
@@ -420,7 +419,7 @@ acpi_rs_dma_resource(u8 * byte_stream_buffer, 
 *

 * FUNCTION:    acpi_rs_dma_stream

 *

 * PARAMETERS:  linked_list             - Pointer to the resource linked list

 * PARAMETERS:  Resource                - 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
@@ -433,7 +432,7 @@ acpi_rs_dma_resource(u8 * byte_stream_buffer, 
 ******************************************************************************/



acpi_status

acpi_rs_dma_stream(struct acpi_resource *linked_list,

acpi_rs_dma_stream(struct acpi_resource *resource,

		   u8 ** output_buffer, acpi_size * bytes_consumed)

{

	u8 *buffer = *output_buffer;
@@ -443,17 +442,16 @@ acpi_rs_dma_stream(struct acpi_resource *linked_list, 


	ACPI_FUNCTION_TRACE("rs_dma_stream");



	/* The descriptor field is static */

	/* The Descriptor Type field is static */



	*buffer = 0x2A;

	*buffer = ACPI_RDESC_TYPE_DMA_FORMAT | 0x02;

	buffer += 1;

	temp8 = 0;



	/* Loop through all of the Channels and set the mask bits */



	for (index = 0;

	     index < linked_list->data.dma.number_of_channels; index++) {

		temp16 = (u16) linked_list->data.dma.channels[index];

	for (index = 0; index < resource->data.dma.number_of_channels; index++) {

		temp16 = (u16) resource->data.dma.channels[index];

		temp8 |= 0x1 << temp16;

	}
@@ -462,9 +460,9 @@ acpi_rs_dma_stream(struct acpi_resource *linked_list, 


	/* Set the DMA Info */



	temp8 = (u8) ((linked_list->data.dma.type & 0x03) << 5);

	temp8 |= ((linked_list->data.dma.bus_master & 0x01) << 2);

	temp8 |= (linked_list->data.dma.transfer & 0x03);

	temp8 = (u8) ((resource->data.dma.type & 0x03) << 5);

	temp8 |= ((resource->data.dma.bus_master & 0x01) << 2);

	temp8 |= (resource->data.dma.transfer & 0x03);



	*buffer = temp8;

	buffer += 1;

drivers/acpi/resources/rsirq.c

+28 −29
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ acpi_rs_irq_resource(u8 * byte_stream_buffer, 
	 */

	temp8 = *buffer;

	*bytes_consumed = (temp8 & 0x03) + 1;

	output_struct->id = ACPI_RSTYPE_IRQ;

	output_struct->type = ACPI_RSTYPE_IRQ;



	/* Point to the 16-bits of Bytes 1 and 2 */
@@ -177,7 +177,7 @@ acpi_rs_irq_resource(u8 * byte_stream_buffer, 
 *

 * FUNCTION:    acpi_rs_irq_stream

 *

 * PARAMETERS:  linked_list             - Pointer to the resource linked list

 * PARAMETERS:  Resource                - 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
@@ -190,7 +190,7 @@ acpi_rs_irq_resource(u8 * byte_stream_buffer, 
 ******************************************************************************/



acpi_status

acpi_rs_irq_stream(struct acpi_resource *linked_list,

acpi_rs_irq_stream(struct acpi_resource *resource,

		   u8 ** output_buffer, acpi_size * bytes_consumed)

{

	u8 *buffer = *output_buffer;
@@ -205,13 +205,13 @@ acpi_rs_irq_stream(struct acpi_resource *linked_list, 
	 * The descriptor field is set based upon whether a third byte is

	 * needed to contain the IRQ Information.

	 */

	if (ACPI_EDGE_SENSITIVE == linked_list->data.irq.edge_level &&

	    ACPI_ACTIVE_HIGH == linked_list->data.irq.active_high_low &&

	    ACPI_EXCLUSIVE == linked_list->data.irq.shared_exclusive) {

		*buffer = 0x22;

	if (ACPI_EDGE_SENSITIVE == resource->data.irq.edge_level &&

	    ACPI_ACTIVE_HIGH == resource->data.irq.active_high_low &&

	    ACPI_EXCLUSIVE == resource->data.irq.shared_exclusive) {

		*buffer = ACPI_RDESC_TYPE_IRQ_FORMAT | 0x02;

		IRqinfo_byte_needed = FALSE;

	} else {

		*buffer = 0x23;

		*buffer = ACPI_RDESC_TYPE_IRQ_FORMAT | 0x03;

		IRqinfo_byte_needed = TRUE;

	}
@@ -221,8 +221,8 @@ acpi_rs_irq_stream(struct acpi_resource *linked_list, 
	/* Loop through all of the interrupts and set the mask bits */



	for (index = 0;

	     index < linked_list->data.irq.number_of_interrupts; index++) {

		temp8 = (u8) linked_list->data.irq.interrupts[index];

	     index < resource->data.irq.number_of_interrupts; index++) {

		temp8 = (u8) resource->data.irq.interrupts[index];

		temp16 |= 0x1 << temp8;

	}
@@ -233,11 +233,11 @@ acpi_rs_irq_stream(struct acpi_resource *linked_list, 


	if (IRqinfo_byte_needed) {

		temp8 = 0;

		temp8 = (u8) ((linked_list->data.irq.shared_exclusive &

		temp8 = (u8) ((resource->data.irq.shared_exclusive &

			       0x01) << 4);



		if (ACPI_LEVEL_SENSITIVE == linked_list->data.irq.edge_level &&

		    ACPI_ACTIVE_LOW == linked_list->data.irq.active_high_low) {

		if (ACPI_LEVEL_SENSITIVE == resource->data.irq.edge_level &&

		    ACPI_ACTIVE_LOW == resource->data.irq.active_high_low) {

			temp8 |= 0x08;

		} else {

			temp8 |= 0x01;
@@ -302,7 +302,7 @@ acpi_rs_extended_irq_resource(u8 * byte_stream_buffer, 
	}



	*bytes_consumed = temp16 + 3;

	output_struct->id = ACPI_RSTYPE_EXT_IRQ;

	output_struct->type = ACPI_RSTYPE_EXT_IRQ;



	/* Point to the Byte3 */
@@ -441,7 +441,7 @@ acpi_rs_extended_irq_resource(u8 * byte_stream_buffer, 
 *

 * FUNCTION:    acpi_rs_extended_irq_stream

 *

 * PARAMETERS:  linked_list             - Pointer to the resource linked list

 * PARAMETERS:  Resource                - 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
@@ -454,7 +454,7 @@ acpi_rs_extended_irq_resource(u8 * byte_stream_buffer, 
 ******************************************************************************/



acpi_status

acpi_rs_extended_irq_stream(struct acpi_resource *linked_list,

acpi_rs_extended_irq_stream(struct acpi_resource *resource,

			    u8 ** output_buffer, acpi_size * bytes_consumed)

{

	u8 *buffer = *output_buffer;
@@ -476,9 +476,8 @@ acpi_rs_extended_irq_stream(struct acpi_resource *linked_list, 


	/* Set the Interrupt vector flags */



	temp8 = (u8) (linked_list->data.extended_irq.producer_consumer & 0x01);

	temp8 |=

	    ((linked_list->data.extended_irq.shared_exclusive & 0x01) << 3);

	temp8 = (u8) (resource->data.extended_irq.producer_consumer & 0x01);

	temp8 |= ((resource->data.extended_irq.shared_exclusive & 0x01) << 3);



	/*

	 * Set the Interrupt Mode
@@ -489,44 +488,44 @@ acpi_rs_extended_irq_stream(struct acpi_resource *linked_list, 
	 *

	 * - Edge/Level are defined opposite in the table vs the headers

	 */

	if (ACPI_EDGE_SENSITIVE == linked_list->data.extended_irq.edge_level) {

	if (ACPI_EDGE_SENSITIVE == resource->data.extended_irq.edge_level) {

		temp8 |= 0x2;

	}



	/* Set the Interrupt Polarity */



	temp8 |= ((linked_list->data.extended_irq.active_high_low & 0x1) << 2);

	temp8 |= ((resource->data.extended_irq.active_high_low & 0x1) << 2);



	*buffer = temp8;

	buffer += 1;



	/* Set the Interrupt table length */



	temp8 = (u8) linked_list->data.extended_irq.number_of_interrupts;

	temp8 = (u8) resource->data.extended_irq.number_of_interrupts;



	*buffer = temp8;

	buffer += 1;



	for (index = 0;

	     index < linked_list->data.extended_irq.number_of_interrupts;

	     index < resource->data.extended_irq.number_of_interrupts;

	     index++) {

		ACPI_MOVE_32_TO_32(buffer,

				   &linked_list->data.extended_irq.

				   &resource->data.extended_irq.

				   interrupts[index]);

		buffer += 4;

	}



	/* Resource Source Index and Resource Source are optional */



	if (0 != linked_list->data.extended_irq.resource_source.string_length) {

	if (0 != resource->data.extended_irq.resource_source.string_length) {

		*buffer =

		    (u8) linked_list->data.extended_irq.resource_source.index;

		    (u8) resource->data.extended_irq.resource_source.index;

		buffer += 1;



		/* Copy the string */



		ACPI_STRCPY((char *)buffer,

			    linked_list->data.extended_irq.resource_source.

			    resource->data.extended_irq.resource_source.

			    string_ptr);



		/*
@@ -535,8 +534,8 @@ acpi_rs_extended_irq_stream(struct acpi_resource *linked_list, 
		 */

		buffer +=

		    (acpi_size) (ACPI_STRLEN

				 (linked_list->data.extended_irq.

				  resource_source.string_ptr) + 1);

				 (resource->data.extended_irq.resource_source.

				  string_ptr) + 1);

	}



	/* Return the number of bytes consumed in this operation */