aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/acfreebsd.h
diff options
context:
space:
mode:
authorNate Lawson <njl@FreeBSD.org>2004-02-28 20:23:30 +0000
committerNate Lawson <njl@FreeBSD.org>2004-02-28 20:23:30 +0000
commit2a2a3f2735dfec74d2659f5fc38b52b452558f86 (patch)
tree885c1ceace8766961e3a5baedf4ef67ce438b844 /sys/contrib/dev/acpica/acfreebsd.h
parentb88cf1027b33273df8d01033831414f8edff9021 (diff)
downloadsrc-2a2a3f2735dfec74d2659f5fc38b52b452558f86.tar.gz
src-2a2a3f2735dfec74d2659f5fc38b52b452558f86.zip
Vendor import of ACPICA 20040220
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=126372
Diffstat (limited to 'sys/contrib/dev/acpica/acfreebsd.h')
-rw-r--r--sys/contrib/dev/acpica/acfreebsd.h26
1 files changed, 17 insertions, 9 deletions
diff --git a/sys/contrib/dev/acpica/acfreebsd.h b/sys/contrib/dev/acpica/acfreebsd.h
index e1589820b033..9edbe390dbd1 100644
--- a/sys/contrib/dev/acpica/acfreebsd.h
+++ b/sys/contrib/dev/acpica/acfreebsd.h
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acfreebsd.h - OS specific defines, etc.
- * $Revision: 11 $
+ * $Revision: 13 $
*
*****************************************************************************/
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -118,8 +118,9 @@
#define __ACFREEBSD_H__
/*
- * XXX this is technically correct, but will cause problems with some ASL
- * which only works if the string names a Microsoft operating system.
+ * Some systems' ASL may have problems because they look for names
+ * of Microsoft operating systems. To override this, set hw.acpi.os_name
+ * to the appropriate string.
*/
#define ACPI_OS_NAME "FreeBSD"
@@ -129,21 +130,26 @@
#include <machine/acpica_machdep.h>
#ifdef _KERNEL
+#include "opt_acpi.h"
+#endif
+
+#ifdef ACPI_DEBUG
+#define ACPI_DEBUG_OUTPUT /* for backward compatibility */
+#define ACPI_DISASSEMBLER
+#endif
+
+#ifdef _KERNEL
#include <sys/ctype.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/libkern.h>
#include <machine/stdarg.h>
-#define asm __asm
-#define __cli() disable_intr()
-#define __sti() enable_intr()
-
-#ifdef ACPI_DEBUG_OUTPUT
#ifdef DEBUGGER_THREADING
#undef DEBUGGER_THREADING
#endif /* DEBUGGER_THREADING */
#define DEBUGGER_THREADING 0 /* integrated with DDB */
+#ifdef ACPI_DEBUG_OUTPUT
#include "opt_ddb.h"
#ifdef DDB
#define ACPI_DEBUGGER
@@ -154,6 +160,8 @@
/* Not building kernel code, so use libc */
#define ACPI_USE_STANDARD_HEADERS
+#define ACPI_FLUSH_CPU_CACHE()
+#include <sys/types.h>
#define __cli()
#define __sti()