Date: Tue, 3 Oct 2006 20:39:17 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107214 for review Message-ID: <200610032039.k93KdHwf099391@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107214 Change 107214 by imp@imp_lighthouse on 2006/10/03 20:39:06 Compile nit Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#20 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#20 (text+ko) ==== @@ -340,7 +340,7 @@ WR4(sc, MCI_CMDR, cmdr); WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); return; -l } + } if (data->flags & MMC_DATA_READ) cmdr |= MCI_CMDR_TRDIR; if (data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)) @@ -363,9 +363,9 @@ if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, block_size, at91_mci_getaddr, &paddr, 0) != 0) { if (req->cmd->flags & STOP_STARTED) - req->stop->error = ERR_NO_MEMORY; + req->stop->error = MMC_ERR_NO_MEMORY; else - req->cmd->error = ERR_NO_MEMORY; + req->cmd->error = MMC_ERR_NO_MEMORY; sc->req = NULL; sc->curcmd = NULL; req->done(req); ==== //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#13 (text+ko) ==== @@ -69,6 +69,7 @@ #define MMC_ERR_FIFO 3 #define MMC_ERR_FAILED 4 #define MMC_ERR_INVALID 5 +#define MMC_ERR_NO_MEMORY 6 struct mmc_data *data; /* Data segment with cmd */ struct mmc_request *mrq; /* backpointer to request */ };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610032039.k93KdHwf099391>