Module Name: src
Committed By: martin
Date: Fri Jan 2 20:24:14 UTC 2015
Modified Files:
src/sys/arch/arm/s3c2xx0 [netbsd-7]: s3c2440_sdi.c
src/sys/dev/ic [netbsd-7]: dm9000.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #365):
sys/dev/ic/dm9000.c: revision 1.5
sys/arch/arm/s3c2xx0/s3c2440_sdi.c: revision 1.3
Appease gcc 4.8 - from Greg Willatt in private email.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.12.1 src/sys/arch/arm/s3c2xx0/s3c2440_sdi.c
cvs rdiff -u -r1.4 -r1.4.22.1 src/sys/dev/ic/dm9000.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/arch/arm/s3c2xx0/s3c2440_sdi.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2440_sdi.c:1.2 src/sys/arch/arm/s3c2xx0/s3c2440_sdi.c:1.2.12.1
--- src/sys/arch/arm/s3c2xx0/s3c2440_sdi.c:1.2 Sat Oct 27 17:17:40 2012
+++ src/sys/arch/arm/s3c2xx0/s3c2440_sdi.c Fri Jan 2 20:24:14 2015
@@ -384,7 +384,9 @@ sssdi_exec_command(sdmmc_chipset_handle_
struct sssdi_softc *sc = (struct sssdi_softc*)sch;
uint32_t cmd_control;
int status = 0;
+#ifdef SSSDI_DEBUG
uint32_t data_status;
+#endif
int transfer = SSSDI_TRANSFER_NONE;
dmac_xfer_t xfer;
@@ -566,8 +568,8 @@ sssdi_exec_command(sdmmc_chipset_handle_
DPRINTF(("Remaining Block Number : %d\n",
SDIDATCNT_BLK_NUM_CNT(status)));
- data_status = bus_space_read_4(sc->iot, sc->ioh, SDI_DAT_STA);
#ifdef SSSDI_DEBUG
+ data_status = bus_space_read_4(sc->iot, sc->ioh, SDI_DAT_STA);
printf("SDI Data Status Register Before xfer: 0x%X\n", data_status);
#endif
if (transfer == SSSDI_TRANSFER_READ) {
@@ -646,7 +648,6 @@ sssdi_exec_command(sdmmc_chipset_handle_
void sssdi_perform_pio_read(struct sssdi_softc *sc, struct sdmmc_command *cmd)
{
- uint32_t status;
uint32_t fifo_status;
int count;
uint32_t written;
@@ -657,7 +658,7 @@ void sssdi_perform_pio_read(struct sssdi
while (written < cmd->c_datalen ) {
/* Wait until the FIFO is full or has the final data.
In the latter case it might not get filled. */
- status = sssdi_wait_intr(sc, SDI_FIFO_RX_FULL | SDI_FIFO_RX_LAST, 1000);
+ sssdi_wait_intr(sc, SDI_FIFO_RX_FULL | SDI_FIFO_RX_LAST, 1000);
fifo_status = bus_space_read_4(sc->iot, sc->ioh, SDI_DAT_FSTA);
count = SDIDATFSTA_FFCNT(fifo_status);
Index: src/sys/dev/ic/dm9000.c
diff -u src/sys/dev/ic/dm9000.c:1.4 src/sys/dev/ic/dm9000.c:1.4.22.1
--- src/sys/dev/ic/dm9000.c:1.4 Sat Jan 28 08:29:55 2012
+++ src/sys/dev/ic/dm9000.c Fri Jan 2 20:24:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000.c,v 1.4 2012/01/28 08:29:55 nisimura Exp $ */
+/* $NetBSD: dm9000.c,v 1.4.22.1 2015/01/02 20:24:14 martin Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -762,7 +762,6 @@ dme_mediastatus(struct ifnet *ifp, struc
void
dme_transmit(struct dme_softc *sc)
{
- uint8_t status;
TX_DPRINTF(("dme_transmit: PRE: txready: %d, txbusy: %d\n",
sc->txready, sc->txbusy));
@@ -771,7 +770,7 @@ dme_transmit(struct dme_softc *sc)
dme_write(sc, DM9000_TXPLH, (sc->txready_length >> 8) & 0xff );
/* Request to send the packet */
- status = dme_read(sc, DM9000_ISR);
+ dme_read(sc, DM9000_ISR);
dme_write(sc, DM9000_TCR, DM9000_TCR_TXREQ);
