Module Name:    src
Committed By:   matt
Date:           Sat Feb 15 03:33:40 UTC 2014

Modified Files:
        src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_sdhc.c
        src/sys/dev/sdmmc [matt-nb5-mips64]: sdhc.c sdhcvar.h

Log Message:
HAS_CGM -> HAVE_CGM (like current)
Add 32BIT_ACCESS


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/rmi/rmixl_sdhc.c
cvs rdiff -u -r1.7.2.5 -r1.7.2.6 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.4.2.4 -r1.4.2.5 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/arch/mips/rmi/rmixl_sdhc.c
diff -u src/sys/arch/mips/rmi/rmixl_sdhc.c:1.1.2.1 src/sys/arch/mips/rmi/rmixl_sdhc.c:1.1.2.2
--- src/sys/arch/mips/rmi/rmixl_sdhc.c:1.1.2.1	Sat Dec 24 01:57:54 2011
+++ src/sys/arch/mips/rmi/rmixl_sdhc.c	Sat Feb 15 03:33:40 2014
@@ -29,7 +29,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(1, "$NetBSD: rmixl_sdhc.c,v 1.1.2.1 2011/12/24 01:57:54 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rmixl_sdhc.c,v 1.1.2.2 2014/02/15 03:33:40 matt Exp $");
 
 #include <sys/device.h>
 #include <sys/bus.h>
@@ -86,7 +86,7 @@ sdhc_xlsdio_attach(device_t parent, devi
 	KASSERT(psc->sc_slots[xa->xa_slot] == NULL);
 	psc->sc_slots[xa->xa_slot] = sc;
 
-	sc->sc_flags = SDHC_FLAG_HAS_CGM;
+	sc->sc_flags = SDHC_FLAG_HAVE_CGM;
 	sc->sc_dev = self;
 	sc->sc_dmat = xa->xa_dmat;
 	sc->sc_host = malloc(1 * sizeof(sc->sc_host[0]),

Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.7.2.5 src/sys/dev/sdmmc/sdhc.c:1.7.2.6
--- src/sys/dev/sdmmc/sdhc.c:1.7.2.5	Tue Nov  5 18:35:35 2013
+++ src/sys/dev/sdmmc/sdhc.c	Sat Feb 15 03:33:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc.c,v 1.7.2.5 2013/11/05 18:35:35 matt Exp $	*/
+/*	$NetBSD: sdhc.c,v 1.7.2.6 2014/02/15 03:33:40 matt 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.7.2.5 2013/11/05 18:35:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.7.2.6 2014/02/15 03:33:40 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -290,7 +290,7 @@ sdhc_host_found(struct sdhc_softc *sc, b
 	    hp->maxblklen > 1 ? "s" : ""));
 
 #if 0
-	if (sc->sc_flags & SDHC_FLAG_HAS_CGM) {
+	if (sc->sc_flags & SDHC_FLAG_HAVE_CGM) {
 		uint16_t clk = HREAD2(hp, SDHC_CLOCK_CTL);
 		clk |= SDHC_SDCLK_CGM;
 		HWRITE2(hp, SDHC_CLOCK_CTL, clk);
@@ -312,7 +312,7 @@ sdhc_host_found(struct sdhc_softc *sc, b
 	saa.saa_sct = &sdhc_functions;
 	saa.saa_sch = hp;
 	saa.saa_dmat = hp->dmat;
-	if (sc->sc_flags & SDHC_FLAG_HAS_CGM) {
+	if (sc->sc_flags & SDHC_FLAG_HAVE_CGM) {
 		saa.saa_clkmin = hp->clkbase / 2046;
 	} else {
 		saa.saa_clkmin = hp->clkbase / 256;
@@ -573,7 +573,7 @@ sdhc_clock_divisor(struct sdhc_host *hp,
 {
 	int div;
 
-	if (hp->sc->sc_flags & SDHC_FLAG_HAS_CGM) {
+	if (hp->sc->sc_flags & SDHC_FLAG_HAVE_CGM) {
 		for (div = hp->clkbase / freq; div <= 0x3ff; div++) {
 			if ((hp->clkbase / div) <= freq) {
 				*divp = SDHC_SDCLK_CGM

Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.4.2.4 src/sys/dev/sdmmc/sdhcvar.h:1.4.2.5
--- src/sys/dev/sdmmc/sdhcvar.h:1.4.2.4	Tue Dec 27 17:12:48 2011
+++ src/sys/dev/sdmmc/sdhcvar.h	Sat Feb 15 03:33:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhcvar.h,v 1.4.2.4 2011/12/27 17:12:48 matt Exp $	*/
+/*	$NetBSD: sdhcvar.h,v 1.4.2.5 2014/02/15 03:33:40 matt Exp $	*/
 /*	$OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $	*/
 
 /*
@@ -39,7 +39,8 @@ struct sdhc_softc {
 #define	SDHC_FLAG_FORCE_DMA	0x0002
 #define	SDHC_FLAG_NO_PWR0	0x0004
 #define	SDHC_FLAG_HAVE_DVS	0x0008
-#define	SDHC_FLAG_HAS_CGM	0x0010
+#define	SDHC_FLAG_HAVE_CGM	0x0010
+#define	SDHC_FLAG_32BIT_ACCESS	0x0020
 	uint32_t		sc_clkbase;
 };
 

Reply via email to