mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Match namespace cleanup changes in ACPI CA 20020217 update.

Browse Source
This commit is contained in:
Mike Smith 2002-02-23 05:31:38 +00:00
parent dd5d65087b
commit 72e5754cfb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=91128
5 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/acpica/Osd/OsdInterrupt.c
View File

@ -41,7 +41,7 @@
#include <dev/acpica/acpivar.h>
#define _COMPONENT ACPI_OS_SERVICES
MODULE_NAME("INTERRUPT")
ACPI_MODULE_NAME("INTERRUPT")
static void InterruptWrapper(void *arg);
static OSD_HANDLER InterruptHandler;
@ -55,7 +55,7 @@ AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine
{
struct acpi_softc *sc;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
if ((sc = devclass_get_softc(devclass_find("acpi"), 0)) == NULL)
panic("can't find ACPI device to register interrupt");
@ -101,7 +101,7 @@ AcpiOsRemoveInterruptHandler (UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine
{
struct acpi_softc *sc;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
if ((InterruptNumber < 0) || (InterruptNumber > 255))
return_ACPI_STATUS(AE_BAD_PARAMETER);

10
sys/dev/acpica/Osd/OsdSchedule.c
View File

@ -52,7 +52,7 @@
#include <dev/acpica/acpivar.h>
#define _COMPONENT ACPI_OS_SERVICES
MODULE_NAME("SCHEDULE")
ACPI_MODULE_NAME("SCHEDULE")
/*
* This is a little complicated due to the fact that we need to build and then
@ -164,7 +164,7 @@ AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function, void *
struct acpi_task *at;
int pri;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
if (Function == NULL)
return_ACPI_STATUS(AE_BAD_PARAMETER);
@ -207,7 +207,7 @@ AcpiOsExecuteQueue(void *arg, int pending)
OSD_EXECUTION_CALLBACK Function;
void *Context;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
at = (struct acpi_task *)arg;
atq = NULL;
@ -248,7 +248,7 @@ AcpiOsSleep (UINT32 Seconds, UINT32 Milliseconds)
int timo;
static int dummy;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
timo = (Seconds * hz) + Milliseconds * hz / 1000;
if (timo == 0)
@ -260,7 +260,7 @@ AcpiOsSleep (UINT32 Seconds, UINT32 Milliseconds)
void
AcpiOsStall (UINT32 Microseconds)
{
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
DELAY(Microseconds);
return_VOID;

10
sys/dev/acpica/Osd/OsdSynch.c
View File

@ -41,7 +41,7 @@
#include <sys/sysctl.h>
#define _COMPONENT ACPI_OS_SERVICES
MODULE_NAME("SYNCH")
ACPI_MODULE_NAME("SYNCH")
static MALLOC_DEFINE(M_ACPISEM, "acpisem", "ACPI semaphore");
@ -74,7 +74,7 @@ AcpiOsCreateSemaphore(UINT32 MaxUnits, UINT32 InitialUnits, ACPI_HANDLE *OutHand
#ifndef ACPI_NO_SEMAPHORES
struct acpi_semaphore *as;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
if (OutHandle == NULL)
return(AE_BAD_PARAMETER);
@ -108,7 +108,7 @@ AcpiOsDeleteSemaphore (ACPI_HANDLE Handle)
#ifndef ACPI_NO_SEMAPHORES
struct acpi_semaphore *as = (struct acpi_semaphore *)Handle;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "destroyed semaphore %p\n", as));
mtx_destroy(&as->as_mtx);
@ -133,7 +133,7 @@ AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT32 Timeout)
int rv, tmo;
struct timeval timeouttv, currenttv, timelefttv;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
if (as == NULL)
return_ACPI_STATUS(AE_BAD_PARAMETER);
@ -288,7 +288,7 @@ AcpiOsSignalSemaphore(ACPI_HANDLE Handle, UINT32 Units)
#ifndef ACPI_NO_SEMAPHORES
struct acpi_semaphore *as = (struct acpi_semaphore *)Handle;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
if (as == NULL)
return_ACPI_STATUS(AE_BAD_PARAMETER);

4
sys/dev/acpica/acpi_timer.c
View File

@ -53,7 +53,7 @@
* Hooks for the ACPI CA debugging infrastructure
*/
#define _COMPONENT ACPI_SYSTEM
MODULE_NAME("TIMER")
ACPI_MODULE_NAME("TIMER")
static device_t acpi_timer_dev;
struct resource *acpi_timer_reg;
@ -116,7 +116,7 @@ acpi_timer_identify(driver_t *driver, device_t parent)
char desc[40];
int rid;
FUNCTION_TRACE(__func__);
ACPI_FUNCTION_TRACE(__func__);
if (acpi_disabled("timer"))
return_VOID;

19
sys/dev/acpica/acpica_support.c
View File

@ -27,9 +27,10 @@
*/
#include "acpi.h"
#include <machine/cpufunc.h>
#include <dev/acpica/acpica_support.h>
MODULE_NAME("support")
ACPI_MODULE_NAME("SUPPORT")
/*
* Implement support code temporary here until officially merged into
@ -59,15 +60,15 @@ AcpiEnterSleepStateS4Bios (
ACPI_OBJECT Arg;
FUNCTION_TRACE ("AcpiEnterSleepStateS4Bios");
ACPI_FUNCTION_TRACE ("AcpiEnterSleepStateS4Bios");
/* run the _PTS and _GTS methods */
MEMSET(&ArgList, 0, sizeof(ArgList));
ACPI_MEMSET(&ArgList, 0, sizeof(ArgList));
ArgList.Count = 1;
ArgList.Pointer = &Arg;
MEMSET(&Arg, 0, sizeof(Arg));
ACPI_MEMSET(&Arg, 0, sizeof(Arg));
Arg.Type = ACPI_TYPE_INTEGER;
Arg.Integer.Value = ACPI_STATE_S4;
@ -76,9 +77,9 @@ AcpiEnterSleepStateS4Bios (
/* clear wake status */
AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_LOCK, WAK_STS, 1);
AcpiHwBitRegisterWrite (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_LOCK);
disable ();
acpi_disable_irqs ();
AcpiHwDisableNonWakeupGpes();
@ -92,11 +93,11 @@ AcpiEnterSleepStateS4Bios (
AcpiOsStall(1000000);
AcpiOsWritePort (AcpiGbl_FADT->SmiCmd, AcpiGbl_FADT->S4BiosReq, 8);
}
while (!AcpiHwRegisterBitAccess (ACPI_READ, ACPI_MTX_LOCK, WAK_STS));
while (!AcpiHwBitRegisterRead (ACPI_BITREG_WAKE_STATUS, ACPI_MTX_LOCK));
AcpiHwEnableNonWakeupGpes();
enable ();
acpi_enable_irqs ();
return_ACPI_STATUS (AE_OK);
}
@ -123,7 +124,7 @@ ACPI_STATUS
AcpiSetDsdtTablePtr(
ACPI_TABLE_HEADER *TablePtr)
{
FUNCTION_TRACE ("AcpiSetDsdtTablePtr");
ACPI_FUNCTION_TRACE ("AcpiSetDsdtTablePtr");
if (!TablePtr)
{