From nobody Thu Dec 09 16:37:35 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9C39118D27CB; Thu, 9 Dec 2021 16:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J907g6qBQz56Rx; Thu, 9 Dec 2021 16:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B683B2095; Thu, 9 Dec 2021 16:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B9GbZdM058536; Thu, 9 Dec 2021 16:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9GbZCd058535; Thu, 9 Dec 2021 16:37:35 GMT (envelope-from git) Date: Thu, 9 Dec 2021 16:37:35 GMT Message-Id: <202112091637.1B9GbZCd058535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 81f64bc0dbf5 - main - firewire: plug set-but-not-used vars List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81f64bc0dbf588c5b20d29dbdef14e008fb7ef40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639067856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9FDWCLZRSceev9vKZ0BsFojOCovaDJ2W3+R7fDqD56s=; b=FVa6fCFDmf3dxHcRpu1p4xBJZy2qtSNSdU0bW2Co/ebnVdkcKPcPkDryZJE/YFZKXJTtCP bzZyo7C1Su618cybYTF1pvDeFkfPUdTKPlvq5VydRPXRon/Mbbo3DYlCqB+EVjOo2MpPZU yGy5AESMdlG+GnW7djtryQAiItb4vPfhKI6r3f/bahEwu5S7+W2UXYq5LcGreQI75OqRDG omaoP7u67qLaAvXx1fkgTT03DacKGZD2kM66s81oxDOAIhn7t7eNN9zKAIKOP80sEQfzFr UzgeOPAg5HMfHMCjDLE4m6lTlIOSNkaHGgKg3mw927lCJLGPdYnin5KzWr0vbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639067856; a=rsa-sha256; cv=none; b=GX6f9l/e8oxW085IBx+7lVu4kBtxk1ntIJObTU1fA/6Bh8yqO2PBZPMEdc383+MkiJodky FjTIDoZFrDvTowG69leNDJPQTetIeamNZl6VeHnqaqQe4zm844ntWx2D1wr/TuOoE9bhft jbZUWvsMCUaS2oyzzbp1Cslx4WjhK9LJXLz0xHpOiEOm9R0Q+5EpxQBqzRm/aps8ZHUFbj I4ZHgmgBZmQopCY2yYkTRJSH2+/QkyEQRqDnqvF2qqB9ESKfLWHZpCfS0RUuuWkQL+XVT4 iBwSUi0fN8xsVLvvGsMmwodetBSvZtpMkQzvfkP2xNtKh4NDrCIRNLIzQ0XbBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=81f64bc0dbf588c5b20d29dbdef14e008fb7ef40 commit 81f64bc0dbf588c5b20d29dbdef14e008fb7ef40 Author: Mateusz Guzik AuthorDate: 2021-12-09 16:36:45 +0000 Commit: Mateusz Guzik CommitDate: 2021-12-09 16:37:26 +0000 firewire: plug set-but-not-used vars Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/firewire/fwohci.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c index 634c78e6afe8..9c95bff21ccb 100644 --- a/sys/dev/firewire/fwohci.c +++ b/sys/dev/firewire/fwohci.c @@ -774,7 +774,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev) void fwohci_timeout(void *arg) { - struct fwohci_softc *sc; + struct fwohci_softc *sc __unused; sc = (struct fwohci_softc *)arg; } @@ -1504,7 +1504,6 @@ fwohci_itxbuf_enable(struct firewire_comm *fc, int dmach) { struct fwohci_softc *sc = (struct fwohci_softc *)fc; int err = 0; - unsigned short tag, ich; struct fwohci_dbch *dbch; int cycle_match, cycle_now, s, ldesc; uint32_t stat; @@ -1514,8 +1513,6 @@ fwohci_itxbuf_enable(struct firewire_comm *fc, int dmach) dbch = &sc->it[dmach]; it = &dbch->xferq; - tag = (it->flag >> 6) & 3; - ich = it->flag & 0x3f; if ((dbch->flags & FWOHCI_DBCH_INIT) == 0) { dbch->ndb = it->bnpacket * it->bnchunk; dbch->ndesc = 3; @@ -2141,7 +2138,7 @@ fwohci_tbuf_update(struct fwohci_softc *sc, int dmach) struct fwohcidb *db; struct fw_bulkxfer *chunk; struct fw_xferq *it; - uint32_t stat, count; + uint32_t stat, count __unused; int s, w=0, ldesc; it = fc->it[dmach]; @@ -2294,8 +2291,13 @@ void dump_db(struct fwohci_softc *sc, uint32_t ch) { struct fwohci_dbch *dbch; - struct fwohcidb_tr *cp = NULL, *pp, *np = NULL; - struct fwohcidb *curr = NULL, *prev, *next = NULL; + struct fwohcidb_tr *cp = NULL, *pp; + struct fwohcidb *curr = NULL; +#if 0 + struct fwohcidb *prev + struct fwohcidb *next = NULL; + struct fwohcidb_tr *np = NULL; +#endif int idb, jdb; uint32_t cmd, off; @@ -2325,22 +2327,28 @@ dump_db(struct fwohci_softc *sc, uint32_t ch) return; } pp = dbch->top; +#if 0 prev = pp->db; +#endif for (idb = 0; idb < dbch->ndb; idb++) { cp = STAILQ_NEXT(pp, link); if (cp == NULL) { curr = NULL; goto outdb; } +#if 0 np = STAILQ_NEXT(cp, link); +#endif for (jdb = 0; jdb < dbch->ndesc; jdb++) { if ((cmd & 0xfffffff0) == cp->bus_addr) { curr = cp->db; +#if 0 if (np != NULL) { next = np->db; } else { next = NULL; } +#endif goto outdb; } } @@ -2349,7 +2357,9 @@ dump_db(struct fwohci_softc *sc, uint32_t ch) curr = NULL; goto outdb; } +#if 0 prev = pp->db; +#endif } outdb: if (curr != NULL) { @@ -2489,7 +2499,10 @@ fwohci_ibr(struct firewire_comm *fc) void fwohci_txbufdb(struct fwohci_softc *sc, int dmach, struct fw_bulkxfer *bulkxfer) { - struct fwohcidb_tr *db_tr, *fdb_tr; + struct fwohcidb_tr *db_tr; +#if 0 + struct fwohcidb_tr *fdb_tr; +#endif struct fwohci_dbch *dbch; struct fwohcidb *db; struct fw_pkt *fp; @@ -2503,10 +2516,10 @@ fwohci_txbufdb(struct fwohci_softc *sc, int dmach, struct fw_bulkxfer *bulkxfer) chtag = sc->it[dmach].xferq.flag & 0xff; db_tr = (struct fwohcidb_tr *)(bulkxfer->start); +#if 0 fdb_tr = (struct fwohcidb_tr *)(bulkxfer->end); -/* device_printf(sc->fc.dev, "DB %08x %08x %08x\n", bulkxfer, db_tr->bus_addr, fdb_tr->bus_addr); -*/ +#endif for (idb = 0; idb < dbch->xferq.bnpacket; idb++) { db = db_tr->db; fp = (struct fw_pkt *)db_tr->buf; @@ -2546,11 +2559,11 @@ device_printf(sc->fc.dev, "DB %08x %08x %08x\n", bulkxfer, db_tr->bus_addr, fdb_ /* OHCI 1.1 and above */ db[0].db.desc.control |= OHCI_INTERRUPT_ALWAYS; #endif -/* +#if 0 db_tr = (struct fwohcidb_tr *)bulkxfer->start; fdb_tr = (struct fwohcidb_tr *)bulkxfer->end; device_printf(sc->fc.dev, "DB %08x %3d %08x %08x\n", bulkxfer, bulkxfer->npacket, db_tr->bus_addr, fdb_tr->bus_addr); -*/ +#endif return; } @@ -2644,8 +2657,9 @@ fwohci_arcv_swap(struct fw_pkt *fp, int len) { struct fw_pkt *fp0; uint32_t ld0; - int slen, hlen; + int hlen; #if BYTE_ORDER == BIG_ENDIAN + int slen; int i; #endif @@ -2661,14 +2675,18 @@ fwohci_arcv_swap(struct fw_pkt *fp, int len) case FWTCODE_WREQQ: case FWTCODE_RRESQ: case FWOHCITCODE_PHY: +#if BYTE_ORDER == BIG_ENDIAN slen = 12; +#endif break; case FWTCODE_RREQB: case FWTCODE_WREQB: case FWTCODE_LREQ: case FWTCODE_RRESB: case FWTCODE_LRES: +#if BYTE_ORDER == BIG_ENDIAN slen = 16; +#endif break; default: printf("Unknown tcode %d\n", fp0->mode.common.tcode);