Date: Wed, 11 Jan 2017 00:02:51 +0000 (UTC) From: "Conrad E. Meyer" <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r311906 - in head/sys/contrib/dev/acpica: components/namespace components/tables include Message-ID: <201701110002.v0B02pBP056938@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Wed Jan 11 00:02:51 2017 New Revision: 311906 URL: https://svnweb.freebsd.org/changeset/base/311906 Log: Revert r311843, r311667 As jkim@ points out, it isn't needed. Modified: head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c head/sys/contrib/dev/acpica/components/tables/tbxface.c head/sys/contrib/dev/acpica/include/acpixf.h Modified: head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c ============================================================================== --- head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c Tue Jan 10 22:13:44 2017 (r311905) +++ head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c Wed Jan 11 00:02:51 2017 (r311906) @@ -1022,25 +1022,23 @@ ACPI_EXPORT_SYMBOL (AcpiDetachData) /******************************************************************************* * - * FUNCTION: AcpiGetDataFull + * FUNCTION: AcpiGetData * * PARAMETERS: ObjHandle - Namespace node - * Handle - Handler used in call to attach_data + * Handler - Handler used in call to AttachData * Data - Where the data is returned - * Callback - function to execute before returning * * RETURN: Status * - * DESCRIPTION: Retrieve data that was previously attached to a namespace node - * and execute a callback before returning. + * DESCRIPTION: Retrieve data that was previously attached to a namespace node. * ******************************************************************************/ + ACPI_STATUS -AcpiGetDataFull ( +AcpiGetData ( ACPI_HANDLE ObjHandle, ACPI_OBJECT_HANDLER Handler, - void **Data, - void (*Callback)(void *)) + void **Data) { ACPI_NAMESPACE_NODE *Node; ACPI_STATUS Status; @@ -1071,34 +1069,10 @@ AcpiGetDataFull ( } Status = AcpiNsGetAttachedData (Node, Handler, Data); - if (ACPI_SUCCESS(Status) && Callback) { - Callback(*Data); - } + UnlockAndExit: (void) AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); return (Status); } -ACPI_EXPORT_SYMBOL (AcpiGetDataFull) -/******************************************************************************* - * - * FUNCTION: AcpiGetData - * - * PARAMETERS: ObjHandle - Namespace node - * Handler - Handler used in call to AttachData - * Data - Where the data is returned - * - * RETURN: Status - * - * DESCRIPTION: Retrieve data that was previously attached to a namespace node. - * - ******************************************************************************/ -ACPI_STATUS -AcpiGetData ( - ACPI_HANDLE ObjHandle, - ACPI_OBJECT_HANDLER Handler, - void **Data) -{ - return (AcpiGetDataFull(ObjHandle, Handler, Data, NULL)); -} ACPI_EXPORT_SYMBOL (AcpiGetData) Modified: head/sys/contrib/dev/acpica/components/tables/tbxface.c ============================================================================== --- head/sys/contrib/dev/acpica/components/tables/tbxface.c Tue Jan 10 22:13:44 2017 (r311905) +++ head/sys/contrib/dev/acpica/components/tables/tbxface.c Wed Jan 11 00:02:51 2017 (r311906) @@ -314,12 +314,11 @@ ACPI_EXPORT_SYMBOL (AcpiGetTableHeader) /******************************************************************************* * - * FUNCTION: AcpiGetTableWithSize + * FUNCTION: AcpiGetTable * * PARAMETERS: Signature - ACPI signature of needed table * Instance - Which instance (for SSDTs) * OutTable - Where the pointer to the table is returned - * TblSize - Size of the table * * RETURN: Status and pointer to the requested table * @@ -334,11 +333,10 @@ ACPI_EXPORT_SYMBOL (AcpiGetTableHeader) ******************************************************************************/ ACPI_STATUS -AcpiGetTableWithSize ( +AcpiGetTable ( char *Signature, UINT32 Instance, - ACPI_TABLE_HEADER **OutTable, - ACPI_SIZE *TblSize) + ACPI_TABLE_HEADER **OutTable) { UINT32 i; UINT32 j; @@ -386,7 +384,7 @@ AcpiGetTableWithSize ( return (Status); } -ACPI_EXPORT_SYMBOL (AcpiGetTableWithSize) +ACPI_EXPORT_SYMBOL (AcpiGetTable) /******************************************************************************* @@ -436,36 +434,8 @@ AcpiPutTable ( (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); return_VOID; } -ACPI_EXPORT_SYMBOL (AcpiPutTable) - - -/******************************************************************************* - * - * FUNCTION: AcpiGetTable - * - * PARAMETERS: Signature - ACPI signature of needed table - * Instance - Which instance (for SSDTs) - * OutTable - Where the pointer to the table is returned - * - * RETURN: Status and pointer to the requested table - * - * DESCRIPTION: Finds and verifies an ACPI table. Table must be in the - * RSDT/XSDT. - * - ******************************************************************************/ - -ACPI_STATUS -AcpiGetTable ( - char *Signature, - UINT32 Instance, - ACPI_TABLE_HEADER **OutTable) -{ - ACPI_SIZE Size; - - return (AcpiGetTableWithSize(Signature, Instance, OutTable, &Size)); -} -ACPI_EXPORT_SYMBOL (AcpiGetTable) +ACPI_EXPORT_SYMBOL (AcpiPutTable) /******************************************************************************* Modified: head/sys/contrib/dev/acpica/include/acpixf.h ============================================================================== --- head/sys/contrib/dev/acpica/include/acpixf.h Tue Jan 10 22:13:44 2017 (r311905) +++ head/sys/contrib/dev/acpica/include/acpixf.h Wed Jan 11 00:02:51 2017 (r311906) @@ -586,14 +586,6 @@ AcpiGetTableHeader ( ACPI_EXTERNAL_RETURN_STATUS ( ACPI_STATUS -AcpiGetTableWithSize ( - ACPI_STRING Signature, - UINT32 Instance, - ACPI_TABLE_HEADER **OutTable, - ACPI_SIZE *TblSize)) - -ACPI_EXTERNAL_RETURN_STATUS ( -ACPI_STATUS AcpiGetTable ( ACPI_STRING Signature, UINT32 Instance, @@ -680,14 +672,6 @@ AcpiGetData ( ACPI_EXTERNAL_RETURN_STATUS ( ACPI_STATUS -AcpiGetDataFull ( - ACPI_HANDLE Object, - ACPI_OBJECT_HANDLER Handler, - void **Data, - void (*Callback)(void *))) - -ACPI_EXTERNAL_RETURN_STATUS ( -ACPI_STATUS AcpiDebugTrace ( const char *Name, UINT32 DebugLevel,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701110002.v0B02pBP056938>