Module Name: src
Committed By: matt
Date: Wed Feb 1 22:34:43 UTC 2012
Modified Files:
src/sys/dev/sdmmc: files.sdmmc ld_sdmmc.c sdmmc.c sdmmc_cis.c
sdmmc_io.c sdmmc_mem.c sdmmcvar.h
Log Message:
Use "opt_sdmmc.h" for SDMMC_DEBUG, etc.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sdmmc/files.sdmmc
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/sdmmc/ld_sdmmc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/sdmmc/sdmmc.c \
src/sys/dev/sdmmc/sdmmcvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/sdmmc/sdmmc_cis.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sdmmc/sdmmc_io.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/sdmmc/sdmmc_mem.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/dev/sdmmc/files.sdmmc
diff -u src/sys/dev/sdmmc/files.sdmmc:1.2 src/sys/dev/sdmmc/files.sdmmc:1.3
--- src/sys/dev/sdmmc/files.sdmmc:1.2 Sun Jun 28 11:17:39 2009
+++ src/sys/dev/sdmmc/files.sdmmc Wed Feb 1 22:34:42 2012
@@ -1,9 +1,11 @@
-# $NetBSD: files.sdmmc,v 1.2 2009/06/28 11:17:39 hubertf Exp $
+# $NetBSD: files.sdmmc,v 1.3 2012/02/01 22:34:42 matt Exp $
# $OpenBSD: files.sdmmc,v 1.2 2006/06/01 21:53:41 uwe Exp $
#
# Config file and device description for machine-independent SD/MMC code.
# Included by ports that need it.
+defflag opt_sdmmc.h SDMMC_DEBUG SDHC_DEBUG SDMMCCISDEBUG
+
device sdmmc {}
attach sdmmc at sdmmcbus
file dev/sdmmc/sdmmc.c sdmmc
Index: src/sys/dev/sdmmc/ld_sdmmc.c
diff -u src/sys/dev/sdmmc/ld_sdmmc.c:1.8 src/sys/dev/sdmmc/ld_sdmmc.c:1.9
--- src/sys/dev/sdmmc/ld_sdmmc.c:1.8 Fri Jan 27 14:28:33 2012
+++ src/sys/dev/sdmmc/ld_sdmmc.c Wed Feb 1 22:34:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_sdmmc.c,v 1.8 2012/01/27 14:28:33 tsutsui Exp $ */
+/* $NetBSD: ld_sdmmc.c,v 1.9 2012/02/01 22:34:42 matt Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
@@ -28,9 +28,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.8 2012/01/27 14:28:33 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.9 2012/02/01 22:34:42 matt Exp $");
#include "rnd.h"
+#ifdef _KERNEL_OPT
+#include "opt_sdmmc.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/sdmmc/sdmmc.c
diff -u src/sys/dev/sdmmc/sdmmc.c:1.11 src/sys/dev/sdmmc/sdmmc.c:1.12
--- src/sys/dev/sdmmc/sdmmc.c:1.11 Thu Jan 26 02:20:12 2012
+++ src/sys/dev/sdmmc/sdmmc.c Wed Feb 1 22:34:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc.c,v 1.11 2012/01/26 02:20:12 matt Exp $ */
+/* $NetBSD: sdmmc.c,v 1.12 2012/02/01 22:34:42 matt Exp $ */
/* $OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $ */
/*
@@ -49,7 +49,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.11 2012/01/26 02:20:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.12 2012/02/01 22:34:42 matt Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_sdmmc.h"
+#endif
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/dev/sdmmc/sdmmcvar.h
diff -u src/sys/dev/sdmmc/sdmmcvar.h:1.11 src/sys/dev/sdmmc/sdmmcvar.h:1.12
--- src/sys/dev/sdmmc/sdmmcvar.h:1.11 Wed May 18 01:07:17 2011
+++ src/sys/dev/sdmmc/sdmmcvar.h Wed Feb 1 22:34:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmcvar.h,v 1.11 2011/05/18 01:07:17 dyoung Exp $ */
+/* $NetBSD: sdmmcvar.h,v 1.12 2012/02/01 22:34:43 matt Exp $ */
/* $OpenBSD: sdmmcvar.h,v 1.13 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -20,6 +20,10 @@
#ifndef _SDMMCVAR_H_
#define _SDMMCVAR_H_
+#ifdef _KERNEL_OPT
+#include "opt_sdmmc.h"
+#endif
+
#include <sys/queue.h>
#include <sys/mutex.h>
#include <sys/callout.h>
Index: src/sys/dev/sdmmc/sdmmc_cis.c
diff -u src/sys/dev/sdmmc/sdmmc_cis.c:1.3 src/sys/dev/sdmmc/sdmmc_cis.c:1.4
--- src/sys/dev/sdmmc/sdmmc_cis.c:1.3 Thu Oct 7 16:26:37 2010
+++ src/sys/dev/sdmmc/sdmmc_cis.c Wed Feb 1 22:34:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_cis.c,v 1.3 2010/10/07 16:26:37 kiyohara Exp $ */
+/* $NetBSD: sdmmc_cis.c,v 1.4 2012/02/01 22:34:43 matt Exp $ */
/* $OpenBSD: sdmmc_cis.c,v 1.1 2006/06/01 21:53:41 uwe Exp $ */
/*
@@ -20,7 +20,11 @@
/* Routines to decode the Card Information Structure of SD I/O cards */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_cis.c,v 1.3 2010/10/07 16:26:37 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_cis.c,v 1.4 2012/02/01 22:34:43 matt Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_sdmmc.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/sdmmc/sdmmc_io.c
diff -u src/sys/dev/sdmmc/sdmmc_io.c:1.6 src/sys/dev/sdmmc/sdmmc_io.c:1.7
--- src/sys/dev/sdmmc/sdmmc_io.c:1.6 Sun Feb 13 06:43:52 2011
+++ src/sys/dev/sdmmc/sdmmc_io.c Wed Feb 1 22:34:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_io.c,v 1.6 2011/02/13 06:43:52 nonaka Exp $ */
+/* $NetBSD: sdmmc_io.c,v 1.7 2012/02/01 22:34:43 matt Exp $ */
/* $OpenBSD: sdmmc_io.c,v 1.10 2007/09/17 01:33:33 krw Exp $ */
/*
@@ -20,7 +20,11 @@
/* Routines for SD I/O cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_io.c,v 1.6 2011/02/13 06:43:52 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_io.c,v 1.7 2012/02/01 22:34:43 matt Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_sdmmc.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/dev/sdmmc/sdmmc_mem.c
diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.19 src/sys/dev/sdmmc/sdmmc_mem.c:1.20
--- src/sys/dev/sdmmc/sdmmc_mem.c:1.19 Fri Jan 27 03:06:24 2012
+++ src/sys/dev/sdmmc/sdmmc_mem.c Wed Feb 1 22:34:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_mem.c,v 1.19 2012/01/27 03:06:24 matt Exp $ */
+/* $NetBSD: sdmmc_mem.c,v 1.20 2012/02/01 22:34:43 matt Exp $ */
/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -45,7 +45,11 @@
/* Routines for SD/MMC memory cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.19 2012/01/27 03:06:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.20 2012/02/01 22:34:43 matt Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_sdmmc.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
