Fix buggaboos that prevented ACPI_DEBUG from working.
authorMatthew Dillon <dillon@dragonflybsd.org>
Mon, 2 Aug 2004 18:41:50 +0000 (18:41 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Mon, 2 Aug 2004 18:41:50 +0000 (18:41 +0000)
sys/dev/acpica5/Makefile
sys/dev/acpica5/acpi.c
sys/dev/acpica5/acpi_pci_link.c

index 443f313..acc3145 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.3 2004/01/08 16:38:32 njl Exp $
-# $DragonFly: src/sys/dev/acpica5/Makefile,v 1.4 2004/07/05 00:07:35 dillon Exp $
+# $DragonFly: src/sys/dev/acpica5/Makefile,v 1.5 2004/08/02 18:41:50 dillon Exp $
 
 .include "Makefile.inc"
 
@@ -17,6 +17,8 @@
        ${.CURDIR}/../../${SYSACPICA}/resources                 \
        ${.CURDIR}/../../${SYSACPICA}/tables                    \
        ${.CURDIR}/../../${SYSACPICA}/utilities                 \
+       ${.CURDIR}/../../${SYSACPICA}/debugger                  \
+       ${.CURDIR}/../../${SYSACPICA}/disassembler              \
        ${.CURDIR}/../../${SYSACPICA}/INTERPRETER/DISPATCHER    \
        ${.CURDIR}/../../${SYSACPICA}/INTERPRETER/EXECUTER      \
        ${.CURDIR}/../../${SYSACPICA}/INTERPRETER/PARSER        \
index 73958c7..a42b098 100644 (file)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.156 2004/06/05 07:25:58 njl Exp $
- *     $DragonFly: src/sys/dev/acpica5/acpi.c,v 1.6 2004/07/05 00:07:35 dillon Exp $
+ *     $DragonFly: src/sys/dev/acpica5/acpi.c,v 1.7 2004/08/02 18:41:50 dillon Exp $
  */
 
 #include "opt_acpi.h"
@@ -2736,7 +2736,7 @@ acpi_debug_sysctl(SYSCTL_HANDLER_ARGS)
     /* If the user is setting a string, parse it. */
     if (error == 0 && req->newptr != NULL) {
        *dbg = 0;
-       setenv((char *)oidp->oid_arg1, (char *)req->newptr);
+       /* XXX setenv((char *)oidp->oid_arg1, (char *)req->newptr); */
        acpi_set_debugging(NULL);
     }
 
index d83f90b..9bd8e86 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.16 2004/06/14 18:54:14 jhb Exp $
- * $DragonFly: src/sys/dev/acpica5/acpi_pci_link.c,v 1.3 2004/07/05 00:07:35 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_pci_link.c,v 1.4 2004/08/02 18:41:50 dillon Exp $
  */
 
 #include "opt_acpi.h"
@@ -290,7 +290,7 @@ acpi_pci_link_get_current_irq(struct acpi_pci_link_entry *link, UINT8 *irq)
        ACPI_BUFFER             buf;
        ACPI_RESOURCE           *resources;
        UINT8                   number_of_interrupts;
-       UINT8                   interrupts[MAX_POSSIBLE_INTERRUPTS];;
+       UINT8                   interrupts[MAX_POSSIBLE_INTERRUPTS];
 
        ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);