Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Appease gcc 4.8 - from Greg Willatt in private email.
details: https://anonhg.NetBSD.org/src/rev/fc98ce49b265
branches: trunk
changeset: 334023:fc98ce49b265
user: skrll <skrll%NetBSD.org@localhost>
date: Wed Nov 26 22:50:22 2014 +0000
description:
Appease gcc 4.8 - from Greg Willatt in private email.
diffstat:
sys/arch/arm/s3c2xx0/s3c2440_sdi.c | 7 ++++---
sys/dev/ic/dm9000.c | 5 ++---
2 files changed, 6 insertions(+), 6 deletions(-)
diffs (66 lines):
diff -r f39b67ee757c -r fc98ce49b265 sys/arch/arm/s3c2xx0/s3c2440_sdi.c
--- a/sys/arch/arm/s3c2xx0/s3c2440_sdi.c Wed Nov 26 21:25:35 2014 +0000
+++ b/sys/arch/arm/s3c2xx0/s3c2440_sdi.c Wed Nov 26 22:50:22 2014 +0000
@@ -384,7 +384,9 @@
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 @@
DPRINTF(("Remaining Block Number : %d\n",
SDIDATCNT_BLK_NUM_CNT(status)));
+#ifdef SSSDI_DEBUG
data_status = bus_space_read_4(sc->iot, sc->ioh, SDI_DAT_STA);
-#ifdef SSSDI_DEBUG
printf("SDI Data Status Register Before xfer: 0x%X\n", data_status);
#endif
if (transfer == SSSDI_TRANSFER_READ) {
@@ -646,7 +648,6 @@
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 @@
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);
diff -r f39b67ee757c -r fc98ce49b265 sys/dev/ic/dm9000.c
--- a/sys/dev/ic/dm9000.c Wed Nov 26 21:25:35 2014 +0000
+++ b/sys/dev/ic/dm9000.c Wed Nov 26 22:50:22 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000.c,v 1.4 2012/01/28 08:29:55 nisimura Exp $ */
+/* $NetBSD: dm9000.c,v 1.5 2014/11/26 22:50:22 skrll Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -762,7 +762,6 @@
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_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);
Home |
Main Index |
Thread Index |
Old Index