diff options
| author | peter <peter@FreeBSD.org> | 2002-05-19 06:16:47 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-05-19 06:16:47 +0000 |
| commit | 51f5a10d664b0c1071343604072be6bdf74f0c4b (patch) | |
| tree | 6aaebdc5575387d09472ad06a2f793adb7364261 /sys/dev/acpica/Osd | |
| parent | 6aa1f5995a41d59decabc943b093d0a1e5771d00 (diff) | |
| download | FreeBSD-src-51f5a10d664b0c1071343604072be6bdf74f0c4b.zip FreeBSD-src-51f5a10d664b0c1071343604072be6bdf74f0c4b.tar.gz | |
Brutally deal with __func__ being 'const char *' on gcc-3.1.
Diffstat (limited to 'sys/dev/acpica/Osd')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdInterrupt.c | 4 | ||||
| -rw-r--r-- | sys/dev/acpica/Osd/OsdSchedule.c | 8 | ||||
| -rw-r--r-- | sys/dev/acpica/Osd/OsdSynch.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/acpica/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c index 4cad507..927d8d9 100644 --- a/sys/dev/acpica/Osd/OsdInterrupt.c +++ b/sys/dev/acpica/Osd/OsdInterrupt.c @@ -55,7 +55,7 @@ AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine { struct acpi_softc *sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__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; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if ((InterruptNumber < 0) || (InterruptNumber > 255)) return_ACPI_STATUS(AE_BAD_PARAMETER); diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c index 82bcdd0..d8aca62 100644 --- a/sys/dev/acpica/Osd/OsdSchedule.c +++ b/sys/dev/acpica/Osd/OsdSchedule.c @@ -164,7 +164,7 @@ AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function, void * struct acpi_task *at; int pri; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__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; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); at = (struct acpi_task *)arg; atq = NULL; @@ -248,7 +248,7 @@ AcpiOsSleep (UINT32 Seconds, UINT32 Milliseconds) int timo; static int dummy; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); timo = (Seconds * hz) + Milliseconds * hz / 1000; if (timo == 0) @@ -260,7 +260,7 @@ AcpiOsSleep (UINT32 Seconds, UINT32 Milliseconds) void AcpiOsStall (UINT32 Microseconds) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); DELAY(Microseconds); return_VOID; diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c index 2cd0daf..0103d67 100644 --- a/sys/dev/acpica/Osd/OsdSynch.c +++ b/sys/dev/acpica/Osd/OsdSynch.c @@ -74,7 +74,7 @@ AcpiOsCreateSemaphore(UINT32 MaxUnits, UINT32 InitialUnits, ACPI_HANDLE *OutHand #ifndef ACPI_NO_SEMAPHORES struct acpi_semaphore *as; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__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; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__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; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__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; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (as == NULL) return_ACPI_STATUS(AE_BAD_PARAMETER); |
