diff options
author | njl <njl@FreeBSD.org> | 2003-12-09 02:48:38 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2003-12-09 02:48:38 +0000 |
commit | d8881cd64b4e763a8a4c2f511ef73968dc62a744 (patch) | |
tree | 6e9526e0b1f8d8f3629aa58a2339d9e19ba2d43a /sys/contrib/dev/acpica/tbget.c | |
parent | d6cef33bc61ee26e623277c4064e87bd2ac4fd79 (diff) | |
download | FreeBSD-src-d8881cd64b4e763a8a4c2f511ef73968dc62a744.zip FreeBSD-src-d8881cd64b4e763a8a4c2f511ef73968dc62a744.tar.gz |
Unchanged files that are off the vendor branch.
Diffstat (limited to 'sys/contrib/dev/acpica/tbget.c')
-rw-r--r-- | sys/contrib/dev/acpica/tbget.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/contrib/dev/acpica/tbget.c b/sys/contrib/dev/acpica/tbget.c index 01fac0e..0850f5f 100644 --- a/sys/contrib/dev/acpica/tbget.c +++ b/sys/contrib/dev/acpica/tbget.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: tbget - ACPI Table get* routines - * $Revision: 84 $ + * $Revision: 87 $ * *****************************************************************************/ @@ -222,12 +222,11 @@ AcpiTbGetTableHeader ( /* Create a logical address for the physical pointer*/ Status = AcpiOsMapMemory (Address->Pointer.Physical, sizeof (ACPI_TABLE_HEADER), - (void **) &Header); + (void *) &Header); if (ACPI_FAILURE (Status)) { ACPI_REPORT_ERROR (("Could not map memory at %8.8X%8.8X for length %X\n", - ACPI_HIDWORD (Address->Pointer.Physical), - ACPI_LODWORD (Address->Pointer.Physical), + ACPI_FORMAT_UINT64 (Address->Pointer.Physical), sizeof (ACPI_TABLE_HEADER))); return_ACPI_STATUS (Status); } @@ -446,13 +445,12 @@ AcpiTbGetThisTable ( * into our address space. */ Status = AcpiOsMapMemory (Address->Pointer.Physical, (ACPI_SIZE) Header->Length, - (void **) &FullTable); + (void *) &FullTable); if (ACPI_FAILURE (Status)) { ACPI_REPORT_ERROR (("Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X\n", Header->Signature, - ACPI_HIDWORD (Address->Pointer.Physical), - ACPI_LODWORD (Address->Pointer.Physical), Header->Length)); + ACPI_FORMAT_UINT64 (Address->Pointer.Physical), Header->Length)); return (Status); } @@ -496,8 +494,7 @@ AcpiTbGetThisTable ( ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Found table [%4.4s] at %8.8X%8.8X, mapped/copied to %p\n", FullTable->Signature, - ACPI_HIDWORD (Address->Pointer.Physical), - ACPI_LODWORD (Address->Pointer.Physical), FullTable)); + ACPI_FORMAT_UINT64 (Address->Pointer.Physical), FullTable)); return_ACPI_STATUS (Status); } @@ -549,6 +546,7 @@ AcpiTbGetTablePtr ( { /* Get the first */ + *TablePtrLoc = NULL; if (AcpiGbl_TableLists[TableType].Next) { *TablePtrLoc = AcpiGbl_TableLists[TableType].Next->Pointer; |