d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style cleanups, M_ZERO instead of bzero.

Browse Source
This commit is contained in:
njl 2004-04-14 03:45:20 +00:00
parent 7e03a67713
commit 6ad9bc9a77
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,6 @@
* 6.3 : Scheduling services * 6.3 : Scheduling services
*/ */
#include "acpi.h"
#include "opt_acpi.h" #include "opt_acpi.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -45,8 +43,7 @@
#include <sys/taskqueue.h> #include <sys/taskqueue.h>
#include <machine/clock.h> #include <machine/clock.h>
#include <sys/bus.h> #include "acpi.h"
#include <dev/acpica/acpivar.h> #include <dev/acpica/acpivar.h>
#define _COMPONENT ACPI_OS_SERVICES #define _COMPONENT ACPI_OS_SERVICES
@ -151,11 +148,13 @@ acpi_task_thread_init(void)
} }
return (err); return (err);
} }
#endif #endif /* ACPI_USE_THREADS */
#endif #endif /* __FreeBSD_version >= 500000 */
/* This function is called in interrupt context. */
ACPI_STATUS ACPI_STATUS
AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function, void *Context) AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function,
void *Context)
{ {
struct acpi_task *at; struct acpi_task *at;
int pri; int pri;
@ -163,12 +162,11 @@ AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function, void *
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
if (Function == NULL) if (Function == NULL)
return_ACPI_STATUS(AE_BAD_PARAMETER); return_ACPI_STATUS (AE_BAD_PARAMETER);
at = malloc(sizeof(*at), M_ACPITASK, M_NOWAIT); /* Interrupt Context */ at = malloc(sizeof(*at), M_ACPITASK, M_NOWAIT | M_ZERO);
if (at == NULL) if (at == NULL)
return_ACPI_STATUS(AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
bzero(at, sizeof(*at));
at->at_function = Function; at->at_function = Function;
at->at_context = Context; at->at_context = Context;
@ -187,16 +185,17 @@ AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function, void *
break; break;
default: default:
free(at, M_ACPITASK); free(at, M_ACPITASK);
return_ACPI_STATUS(AE_BAD_PARAMETER); return_ACPI_STATUS (AE_BAD_PARAMETER);
} }
TASK_INIT(&at->at_task, pri, AcpiOsExecuteQueue, at); TASK_INIT(&at->at_task, pri, AcpiOsExecuteQueue, at);
#if __FreeBSD_version < 500000 #if __FreeBSD_version >= 500000
taskqueue_enqueue(taskqueue_swi, (struct task *)at);
#else
taskqueue_enqueue(taskqueue_acpi, (struct task *)at); taskqueue_enqueue(taskqueue_acpi, (struct task *)at);
#else
taskqueue_enqueue(taskqueue_swi, (struct task *)at);
#endif #endif
return_ACPI_STATUS(AE_OK);
return_ACPI_STATUS (AE_OK);
} }
static void static void
@ -238,10 +237,6 @@ AcpiOsExecuteQueue(void *arg, int pending)
return_VOID; return_VOID;
} }
/*
* We don't have any sleep granularity better than hz, so
* make do with that.
*/
void void
AcpiOsSleep(UINT32 Seconds, UINT32 Milliseconds) AcpiOsSleep(UINT32 Seconds, UINT32 Milliseconds)
{ {
@ -277,7 +272,8 @@ UINT32
AcpiOsGetThreadId(void) AcpiOsGetThreadId(void)
{ {
struct proc *p; struct proc *p;
/* XXX do not add FUNCTION_TRACE here, results in recursive call */
/* XXX do not add ACPI_FUNCTION_TRACE here, results in recursive call. */
p = curproc; p = curproc;
#if __FreeBSD_version < 500000 #if __FreeBSD_version < 500000
@ -285,5 +281,7 @@ AcpiOsGetThreadId(void)
p = &proc0; p = &proc0;
#endif #endif
KASSERT(p != NULL, ("%s: curproc is NULL!", __func__)); KASSERT(p != NULL, ("%s: curproc is NULL!", __func__));
return(p->p_pid + 1); /* can't return 0 */
/* Returning 0 is not allowed. */
return (p->p_pid + 1);
} }