d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix more resource parsing problems. The previous commit was imcomplete.

Browse Source 
- Fix a typo in rsmisc.c and a style change for consistency.

This patch will also appear in future ACPI-CA release.

Submitted by:	Robert Moore <robert dot moore at intel dot com>
Tested by:	ru
This commit is contained in:
Jung-uk Kim 2005-11-04 21:29:41 +00:00
parent ce60eb2a14
commit e9bfb92a8e
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/contrib/dev/acpica/rscalc.c
View File

@ -487,8 +487,7 @@ AcpiRsGetListLength (
* Get the number of bits set in the IRQ word * Get the number of bits set in the IRQ word
*/ */
ACPI_MOVE_16_TO_16 (&Temp16, Buffer); ACPI_MOVE_16_TO_16 (&Temp16, Buffer);
ExtraStructBytes = (AcpiRsCountSetBits (Temp16) * ExtraStructBytes = AcpiRsCountSetBits (Temp16);
sizeof (UINT32));
break; break;
@ -497,9 +496,7 @@ AcpiRsGetListLength (
* DMA Resource: * DMA Resource:
* Get the number of bits set in the DMA channels byte * Get the number of bits set in the DMA channels byte
*/ */
ACPI_MOVE_16_TO_16 (&Temp16, Buffer); ExtraStructBytes = AcpiRsCountSetBits (*Buffer);
ExtraStructBytes = (AcpiRsCountSetBits (Temp16) *
sizeof (UINT32));
break; break;
@ -596,7 +593,7 @@ AcpiRsGetListLength (
/* Update the required buffer size for the internal descriptor structs */ /* Update the required buffer size for the internal descriptor structs */
Temp16 = (UINT16) (ResourceInfo->MinimumInternalStructLength + ExtraStructBytes); Temp16 = (UINT16) (ResourceInfo->MinimumInternalStructLength + ExtraStructBytes);
BufferSize += (UINT32) ACPI_ALIGN_RESOURCE_SIZE (Temp16); BufferSize += (UINT32) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp16);
/* /*
* Update byte count and point to the next resource within the stream * Update byte count and point to the next resource within the stream

4
sys/contrib/dev/acpica/rsmisc.c
View File

@ -329,7 +329,7 @@ AcpiRsConvertAmlToResource (
ItemCount = AcpiRsDecodeBitmask (*((UINT8 *) Source), Destination); ItemCount = AcpiRsDecodeBitmask (*((UINT8 *) Source), Destination);
if (ItemCount) if (ItemCount)
{ {
Resource->Length += Resource->Length + (ItemCount - 1); Resource->Length += (ItemCount - 1);
} }
Target = ((char *) Resource) + Info->Value; Target = ((char *) Resource) + Info->Value;
@ -346,7 +346,7 @@ AcpiRsConvertAmlToResource (
ItemCount = AcpiRsDecodeBitmask (Temp16, Destination); ItemCount = AcpiRsDecodeBitmask (Temp16, Destination);
if (ItemCount) if (ItemCount)
{ {
Resource->Length = Resource->Length + (ItemCount - 1); Resource->Length += (ItemCount - 1);
} }
Target = ((char *) Resource) + Info->Value; Target = ((char *) Resource) + Info->Value;