Module Name: src Committed By: skrll Date: Fri Mar 20 17:07:17 UTC 2020
Modified Files: src/sys/dev/ic: dwc_mmc.c dwc_mmc_var.h Log Message: Remember / use sc_verid To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/dwc_mmc.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/dwc_mmc_var.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/ic/dwc_mmc.c diff -u src/sys/dev/ic/dwc_mmc.c:1.24 src/sys/dev/ic/dwc_mmc.c:1.25 --- src/sys/dev/ic/dwc_mmc.c:1.24 Fri Mar 20 06:18:45 2020 +++ src/sys/dev/ic/dwc_mmc.c Fri Mar 20 17:07:17 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_mmc.c,v 1.24 2020/03/20 06:18:45 skrll Exp $ */ +/* $NetBSD: dwc_mmc.c,v 1.25 2020/03/20 17:07:17 skrll Exp $ */ /*- * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.24 2020/03/20 06:18:45 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.25 2020/03/20 17:07:17 skrll Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -807,11 +807,11 @@ dwc_mmc_init(struct dwc_mmc_softc *sc) { uint32_t val; - if (sc->sc_fifo_reg == 0) { - val = MMC_READ(sc, DWC_MMC_VERID); - const u_int id = __SHIFTOUT(val, DWC_MMC_VERID_ID); + val = MMC_READ(sc, DWC_MMC_VERID); + sc->sc_verid = __SHIFTOUT(val, DWC_MMC_VERID_ID); - if (id < DWC_MMC_VERID_240A) + if (sc->sc_fifo_reg == 0) { + if (sc->sc_verid < DWC_MMC_VERID_240A) sc->sc_fifo_reg = 0x100; else sc->sc_fifo_reg = 0x200; Index: src/sys/dev/ic/dwc_mmc_var.h diff -u src/sys/dev/ic/dwc_mmc_var.h:1.13 src/sys/dev/ic/dwc_mmc_var.h:1.14 --- src/sys/dev/ic/dwc_mmc_var.h:1.13 Thu Jan 23 23:53:55 2020 +++ src/sys/dev/ic/dwc_mmc_var.h Fri Mar 20 17:07:17 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_mmc_var.h,v 1.13 2020/01/23 23:53:55 jmcneill Exp $ */ +/* $NetBSD: dwc_mmc_var.h,v 1.14 2020/03/20 17:07:17 skrll Exp $ */ /*- * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca> @@ -45,6 +45,7 @@ struct dwc_mmc_softc { u_int sc_clock_freq; u_int sc_bus_width; bool sc_card_inited; + u_int sc_verid; void *sc_ih; kmutex_t sc_lock;