summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Stuehler <uwe@cvs.openbsd.org>2006-05-28 18:45:24 +0000
committerUwe Stuehler <uwe@cvs.openbsd.org>2006-05-28 18:45:24 +0000
commit6c3a3119902ab4d8b8ee50c346f7595059b22fe8 (patch)
treea9aa9eebccf68aa20af4c737ca344850f86dc7ff
parent3d25fd3d1b673395cdf62d545d323c99b3cd4b80 (diff)
don't #undef SDMMC_DEBUG
-rw-r--r--sys/dev/sdmmc/sdhc.c4
-rw-r--r--sys/dev/sdmmc/sdmmc.c4
-rw-r--r--sys/dev/sdmmc/sdmmc_io.c4
-rw-r--r--sys/dev/sdmmc/sdmmc_mem.c8
-rw-r--r--sys/dev/sdmmc/sdmmc_scsi.c4
5 files changed, 7 insertions, 17 deletions
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c
index ea800debd1a..8d9a95a7dcf 100644
--- a/sys/dev/sdmmc/sdhc.c
+++ b/sys/dev/sdmmc/sdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdhc.c,v 1.1 2006/05/28 17:21:14 uwe Exp $ */
+/* $OpenBSD: sdhc.c,v 1.2 2006/05/28 18:45:23 uwe Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -35,8 +35,6 @@
#include <dev/sdmmc/sdmmcreg.h>
#include <dev/sdmmc/sdmmcvar.h>
-#undef SDHC_DEBUG
-
#define SDHC_COMMAND_TIMEOUT (hz*2) /* 2 seconds */
#define SDHC_DATA_TIMEOUT (hz*2) /* 2 seconds */
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c
index 5caa81e624c..7bafe907fa5 100644
--- a/sys/dev/sdmmc/sdmmc.c
+++ b/sys/dev/sdmmc/sdmmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc.c,v 1.1 2006/05/28 17:21:14 uwe Exp $ */
+/* $OpenBSD: sdmmc.c,v 1.2 2006/05/28 18:45:23 uwe Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -40,8 +40,6 @@
#include <dev/sdmmc/sdmmcreg.h>
#include <dev/sdmmc/sdmmcvar.h>
-#undef SDMMC_DEBUG
-
int sdmmc_match(struct device *, void *, void *);
void sdmmc_attach(struct device *, struct device *, void *);
diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c
index 3adad9bfdaf..f739b210721 100644
--- a/sys/dev/sdmmc/sdmmc_io.c
+++ b/sys/dev/sdmmc/sdmmc_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_io.c,v 1.1 2006/05/28 17:21:14 uwe Exp $ */
+/* $OpenBSD: sdmmc_io.c,v 1.2 2006/05/28 18:45:23 uwe Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -25,8 +25,6 @@
#include <dev/sdmmc/sdmmcreg.h>
#include <dev/sdmmc/sdmmcvar.h>
-#undef SDMMC_DEBUG
-
#ifdef SDMMC_DEBUG
#define DPRINTF(s) printf s
#else
diff --git a/sys/dev/sdmmc/sdmmc_mem.c b/sys/dev/sdmmc/sdmmc_mem.c
index c10e6018566..0399b9e016d 100644
--- a/sys/dev/sdmmc/sdmmc_mem.c
+++ b/sys/dev/sdmmc/sdmmc_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_mem.c,v 1.1 2006/05/28 17:21:14 uwe Exp $ */
+/* $OpenBSD: sdmmc_mem.c,v 1.2 2006/05/28 18:45:23 uwe Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -25,7 +25,8 @@
#include <dev/sdmmc/sdmmcreg.h>
#include <dev/sdmmc/sdmmcvar.h>
-#undef SDMMC_DEBUG
+int sdmmc_mem_send_op_cond(struct sdmmc_softc *, u_int32_t, u_int32_t *);
+int sdmmc_mem_set_blocklen(struct sdmmc_softc *, struct sdmmc_card *);
#ifdef SDMMC_DEBUG
#define DPRINTF(s) printf s
@@ -33,9 +34,6 @@
#define DPRINTF(s) /**/
#endif
-int sdmmc_mem_send_op_cond(struct sdmmc_softc *, u_int32_t, u_int32_t *);
-int sdmmc_mem_set_blocklen(struct sdmmc_softc *, struct sdmmc_card *);
-
/*
* Initialize SD/MMC memory cards and memory in SDIO "combo" cards.
*/
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index e32f27bb52b..5f75c07e5e7 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_scsi.c,v 1.1 2006/05/28 17:21:14 uwe Exp $ */
+/* $OpenBSD: sdmmc_scsi.c,v 1.2 2006/05/28 18:45:23 uwe Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -30,8 +30,6 @@
#include <dev/sdmmc/sdmmc_scsi.h>
#include <dev/sdmmc/sdmmcvar.h>
-#undef SDMMC_DEBUG
-
#define SDMMC_SCSIID_HOST 0x00
#define SDMMC_SCSIID_MAX 0x0f