Module Name: src
Committed By: martin
Date: Sun Oct 5 20:00:54 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom [netbsd-7]: bcm2835_emmc.c
src/sys/dev/sdmmc [netbsd-7]: sdhc.c sdhcvar.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #129):
sys/dev/sdmmc/sdhcvar.h: revision 1.15
sys/dev/sdmmc/sdhc.c: revision 1.51
sys/arch/arm/broadcom/bcm2835_emmc.c: revision 1.19
Pass sdhc_softc instead of sdhc_host to sc_vendor_transfer_data_dma,
since the vendor specific code has no access to it otherwise,
but can easily do device_private(sdhc_softc->sc_dev).
To generate a diff of this commit:
cvs rdiff -u -r1.9.4.1 -r1.9.4.2 src/sys/arch/arm/broadcom/bcm2835_emmc.c
cvs rdiff -u -r1.44.2.4 -r1.44.2.5 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.13.12.1 -r1.13.12.2 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/arm/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.1 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.2
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.1 Fri Oct 3 18:53:56 2014
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Sun Oct 5 20:00:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.9.4.1 2014/10/03 18:53:56 martin Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.9.4.2 2014/10/05 20:00:54 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.9.4.1 2014/10/03 18:53:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.9.4.2 2014/10/05 20:00:54 martin Exp $");
#include "bcmdmac.h"
@@ -82,7 +82,7 @@ static int bcmemmc_match(device_t, struc
static void bcmemmc_attach(device_t, device_t, void *);
static void bcmemmc_attach_i(device_t);
#if NBCMDMAC > 0
-static int bcmemmc_xfer_data_dma(struct sdhc_host *, struct sdmmc_command *);
+static int bcmemmc_xfer_data_dma(struct sdhc_softc *, struct sdmmc_command *);
static void bcmemmc_dma_done(void *);
#endif
@@ -239,9 +239,9 @@ fail:
#if NBCMDMAC > 0
static int
-bcmemmc_xfer_data_dma(struct sdhc_host *hp, struct sdmmc_command *cmd)
+bcmemmc_xfer_data_dma(struct sdhc_softc *sdhc_sc, struct sdmmc_command *cmd)
{
- struct bcmemmc_softc * const sc = *(void **)hp; /* XXX XXX XXX */
+ struct bcmemmc_softc * const sc = device_private(sdhc_sc->sc_dev);
size_t seg;
int error;
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.44.2.4 src/sys/dev/sdmmc/sdhc.c:1.44.2.5
--- src/sys/dev/sdmmc/sdhc.c:1.44.2.4 Sat Oct 4 08:20:11 2014
+++ src/sys/dev/sdmmc/sdhc.c Sun Oct 5 20:00:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.44.2.4 2014/10/04 08:20:11 martin Exp $ */
+/* $NetBSD: sdhc.c,v 1.44.2.5 2014/10/05 20:00:54 martin 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.44.2.4 2014/10/04 08:20:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.44.2.5 2014/10/05 20:00:54 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -1272,6 +1272,7 @@ sdhc_start_command(struct sdhc_host *hp,
static void
sdhc_transfer_data(struct sdhc_host *hp, struct sdmmc_command *cmd)
{
+ struct sdhc_softc *sc = hp->sc;
int error;
DPRINTF(1,("%s: data transfer: resp=%08x datalen=%u\n", HDEVNAME(hp),
@@ -1289,7 +1290,7 @@ sdhc_transfer_data(struct sdhc_host *hp,
if (cmd->c_dmamap != NULL) {
if (hp->sc->sc_vendor_transfer_data_dma != NULL) {
- error = hp->sc->sc_vendor_transfer_data_dma(hp, cmd);
+ error = hp->sc->sc_vendor_transfer_data_dma(sc, cmd);
if (error == 0 && !sdhc_wait_intr(hp,
SDHC_TRANSFER_COMPLETE, SDHC_TRANSFER_TIMEOUT)) {
error = ETIMEDOUT;
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.13.12.1 src/sys/dev/sdmmc/sdhcvar.h:1.13.12.2
--- src/sys/dev/sdmmc/sdhcvar.h:1.13.12.1 Fri Oct 3 18:53:56 2014
+++ src/sys/dev/sdmmc/sdhcvar.h Sun Oct 5 20:00:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.13.12.1 2014/10/03 18:53:56 martin Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.13.12.2 2014/10/05 20:00:54 martin Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -60,7 +60,7 @@ struct sdhc_softc {
int (*sc_vendor_write_protect)(struct sdhc_softc *);
int (*sc_vendor_card_detect)(struct sdhc_softc *);
int (*sc_vendor_bus_clock)(struct sdhc_softc *, int);
- int (*sc_vendor_transfer_data_dma)(struct sdhc_host *, struct sdmmc_command *);
+ int (*sc_vendor_transfer_data_dma)(struct sdhc_softc *, struct sdmmc_command *);
};
/* Host controller functions called by the attachment driver. */
