diff options
author | iwasaki <iwasaki@FreeBSD.org> | 2002-07-30 19:33:39 +0000 |
---|---|---|
committer | iwasaki <iwasaki@FreeBSD.org> | 2002-07-30 19:33:39 +0000 |
commit | 3f86517f16a9cf970e93e483e90066da6eb323dd (patch) | |
tree | 2e03b6e287adc36cfd606a3f67a664bd5222e1a3 /sys/contrib/dev/acpica/tbconvrt.c | |
parent | 80fd7f7b7e25faf86d25d2c97b3a0dfbedb12552 (diff) | |
download | FreeBSD-src-3f86517f16a9cf970e93e483e90066da6eb323dd.zip FreeBSD-src-3f86517f16a9cf970e93e483e90066da6eb323dd.tar.gz |
Vendor import of the Intel ACPI CA 20020725 drop.
Diffstat (limited to 'sys/contrib/dev/acpica/tbconvrt.c')
-rw-r--r-- | sys/contrib/dev/acpica/tbconvrt.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/contrib/dev/acpica/tbconvrt.c b/sys/contrib/dev/acpica/tbconvrt.c index bc63b87..f2f2479 100644 --- a/sys/contrib/dev/acpica/tbconvrt.c +++ b/sys/contrib/dev/acpica/tbconvrt.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: tbconvrt - ACPI Table conversion utilities - * $Revision: 41 $ + * $Revision: 42 $ * *****************************************************************************/ @@ -183,8 +183,7 @@ AcpiTbGetTableCount ( ACPI_STATUS AcpiTbConvertToXsdt ( - ACPI_TABLE_DESC *TableInfo, - UINT32 *NumberOfTables) + ACPI_TABLE_DESC *TableInfo) { ACPI_SIZE TableSize; UINT32 i; @@ -194,13 +193,10 @@ AcpiTbConvertToXsdt ( ACPI_FUNCTION_ENTRY (); - /* Get the number of tables defined in the RSDT or XSDT */ - - *NumberOfTables = AcpiTbGetTableCount (AcpiGbl_RSDP, TableInfo->Pointer); - /* Compute size of the converted XSDT */ - TableSize = ((ACPI_SIZE) *NumberOfTables * sizeof (UINT64)) + sizeof (ACPI_TABLE_HEADER); + TableSize = ((ACPI_SIZE) AcpiGbl_RsdtTableCount * sizeof (UINT64)) + + sizeof (ACPI_TABLE_HEADER); /* Allocate an XSDT */ @@ -217,7 +213,7 @@ AcpiTbConvertToXsdt ( /* Copy the table pointers */ - for (i = 0; i < *NumberOfTables; i++) + for (i = 0; i < AcpiGbl_RsdtTableCount; i++) { if (AcpiGbl_RSDP->Revision < 2) { |