Module Name: src
Committed By: jmcneill
Date: Mon Aug 3 12:11:36 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
Add SDHC_FLAG_POLL_CARD_DET flag which lets the bus glue request polling
instead of standard SDHC card insert / detach events.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/sdmmc/sdhcvar.h
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/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.76 src/sys/dev/sdmmc/sdhc.c:1.77
--- src/sys/dev/sdmmc/sdhc.c:1.76 Mon Aug 3 10:08:51 2015
+++ src/sys/dev/sdmmc/sdhc.c Mon Aug 3 12:11:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.76 2015/08/03 10:08:51 jmcneill Exp $ */
+/* $NetBSD: sdhc.c,v 1.77 2015/08/03 12:11:36 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.76 2015/08/03 10:08:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.77 2015/08/03 12:11:36 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -550,6 +550,8 @@ adma_done:
}
if (ISSET(sc->sc_flags, SDHC_FLAG_SINGLE_ONLY))
saa.saa_caps |= SMC_CAPS_SINGLE_ONLY;
+ if (ISSET(sc->sc_flags, SDHC_FLAG_POLL_CARD_DET))
+ saa.saa_caps |= SMC_CAPS_POLL_CARD_DET;
hp->sdmmc = config_found(sc->sc_dev, &saa, sdhc_cfprint);
return 0;
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.22 src/sys/dev/sdmmc/sdhcvar.h:1.23
--- src/sys/dev/sdmmc/sdhcvar.h:1.22 Sun Aug 2 22:01:28 2015
+++ src/sys/dev/sdmmc/sdhcvar.h Mon Aug 3 12:11:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.22 2015/08/02 22:01:28 jmcneill Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.23 2015/08/03 12:11:36 jmcneill Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -56,6 +56,7 @@ struct sdhc_softc {
#define SDHC_FLAG_SINGLE_POWER_WRITE 0x00040000
#define SDHC_FLAG_NO_TIMEOUT 0x00080000 /* ignore timeout interrupts */
#define SDHC_FLAG_USE_ADMA2 0x00100000
+#define SDHC_FLAG_POLL_CARD_DET 0x00200000 /* polling card detect */
uint32_t sc_clkbase;
int sc_clkmsk; /* Mask for SDCLK */
