Module Name: src
Committed By: jruoho
Date: Sat Aug 7 09:55:59 UTC 2010
Modified Files:
src/sys/arch/i386/conf: ALL
src/sys/dev/acpi: fdc_acpi.c
Log Message:
Remove the last ACPI driver -specific #ifdef, ACPI_FDC_DEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/acpi/fdc_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.263 src/sys/arch/i386/conf/ALL:1.264
--- src/sys/arch/i386/conf/ALL:1.263 Sat Aug 7 09:53:25 2010
+++ src/sys/arch/i386/conf/ALL Sat Aug 7 09:55:59 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.263 2010/08/07 09:53:25 jruoho Exp $
+# $NetBSD: ALL,v 1.264 2010/08/07 09:55:59 jruoho Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.263 $"
+#ident "ALL-$Revision: 1.264 $"
maxusers 64 # estimated number of users
@@ -1790,7 +1790,6 @@
options ACPI_DEBUG
options ACPI_DEBUG_ALLOC
options ACPI_MUTEX_DEBUG
-options ACPI_FDC_DEBUG
options ADB_DEBUG
options ADM1030_DEBUG
options ADT7467_DEBUG
Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.40 src/sys/dev/acpi/fdc_acpi.c:1.41
--- src/sys/dev/acpi/fdc_acpi.c:1.40 Wed Apr 14 19:27:28 2010
+++ src/sys/dev/acpi/fdc_acpi.c Sat Aug 7 09:55:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.40 2010/04/14 19:27:28 jruoho Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.41 2010/08/07 09:55:59 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.40 2010/04/14 19:27:28 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.41 2010/08/07 09:55:59 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -206,10 +206,8 @@
* XXX if there is no _FDE control method, attempt to
* probe without pnp
*/
-#ifdef ACPI_FDC_DEBUG
aprint_debug_dev(sc->sc_dev,
"unable to enumerate, attempting normal probe\n");
-#endif
}
fdcattach(sc);
@@ -229,11 +227,10 @@
int i, drives = -1;
rv = acpi_eval_struct(asc->sc_node->ad_handle, "_FDE", &abuf);
+
if (ACPI_FAILURE(rv)) {
-#ifdef ACPI_FDC_DEBUG
aprint_normal_dev(sc->sc_dev, "failed to evaluate _FDE: %s\n",
AcpiFormatException(rv));
-#endif
return drives;
}
fde = abuf.Pointer;
@@ -258,10 +255,8 @@
drives = 0;
for (i = 0; i < 4; i++) {
if (p[i]) drives |= (1 << i);
-#ifdef ACPI_FDC_DEBUG
aprint_normal_dev(sc->sc_dev, "drive %d %sattached\n", i,
p[i] ? "" : "not ");
-#endif
}
/*
@@ -293,11 +288,9 @@
continue;
rv = acpi_eval_struct(asc->sc_node->ad_handle, "_FDI", &abuf);
if (ACPI_FAILURE(rv)) {
-#ifdef ACPI_FDC_DEBUG
aprint_normal_dev(sc->sc_dev,
"failed to evaluate _FDI: %s on drive %d\n",
AcpiFormatException(rv), i);
-#endif
/* XXX if _FDI fails, assume 1.44MB floppy */
sc->sc_knownfds[i] = &fdc_acpi_fdtypes[0];
continue;
@@ -342,10 +335,8 @@
case ACPI_FDC_DISKETTE_720K:
return &fdc_acpi_fdtypes[4];
default:
-#ifdef ACPI_FDC_DEBUG
aprint_normal("%s: drive %d: unknown device type 0x%x\n",
fdc, drive, type);
-#endif
return NULL;
}
}
