Module Name: src Committed By: matt Date: Thu Jul 26 18:36:57 UTC 2012
Modified Files: src/sys/dev/sdmmc: sdmmc_mem.c Log Message: Fix a delay to a correct value. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 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/sdmmc_mem.c diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.22 src/sys/dev/sdmmc/sdmmc_mem.c:1.23 --- src/sys/dev/sdmmc/sdmmc_mem.c:1.22 Mon Jul 23 13:32:19 2012 +++ src/sys/dev/sdmmc/sdmmc_mem.c Thu Jul 26 18:36:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmc_mem.c,v 1.22 2012/07/23 13:32:19 matt Exp $ */ +/* $NetBSD: sdmmc_mem.c,v 1.23 2012/07/26 18:36:55 matt Exp $ */ /* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */ /* @@ -45,7 +45,7 @@ /* Routines for SD/MMC memory cards. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.22 2012/07/23 13:32:19 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.23 2012/07/26 18:36:55 matt Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -658,8 +658,8 @@ sdmmc_mem_sd_init(struct sdmmc_softc *sc sf->csd.tran_speed = switch_group0_functions[best_func].freq; - /* Wait 400KHz x 8 clock */ - delay(1); + /* Wait 400KHz x 8 clock (2.5us * 8 + slop) */ + delay(25); } }