Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change some names. 

sc_txnext -> sc_txalloc
sc_txcur -> sc_txqueue
This commit is contained in:
mycroft 2004-07-22 20:25:23 +00:00
parent 9df2197095
commit 04cd0b261d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/ic/wi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wi.c,v 1.175 2004/07/22 20:23:31 mycroft Exp $ */ /* $NetBSD: wi.c,v 1.176 2004/07/22 20:25:23 mycroft Exp $ */
/* /*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@ -70,7 +70,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.175 2004/07/22 20:23:31 mycroft Exp $"); __KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.176 2004/07/22 20:25:23 mycroft Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@ -757,9 +757,9 @@ wi_init(struct ifnet *ifp)
/* Set multicast filter. */ /* Set multicast filter. */
wi_write_multi(sc); wi_write_multi(sc);
sc->sc_txalloc = 0;
sc->sc_txalloced = 0; sc->sc_txalloced = 0;
sc->sc_txcur = 0; sc->sc_txqueue = 0;
sc->sc_txnext = 0;
if (sc->sc_firmware_type != WI_SYMBOL || !wasenabled) { if (sc->sc_firmware_type != WI_SYMBOL || !wasenabled) {
sc->sc_buflen = IEEE80211_MAX_LEN + sizeof(struct wi_frame); sc->sc_buflen = IEEE80211_MAX_LEN + sizeof(struct wi_frame);
@ -959,7 +959,7 @@ wi_start(struct ifnet *ifp)
return; return;
memset(&frmhdr, 0, sizeof(frmhdr)); memset(&frmhdr, 0, sizeof(frmhdr));
cur = sc->sc_txnext; cur = sc->sc_txqueue;
for (;;) { for (;;) {
ni = ic->ic_bss; ni = ic->ic_bss;
if (sc->sc_txalloced == 0 || SLIST_EMPTY(&sc->sc_rssdfree)) { if (sc->sc_txalloced == 0 || SLIST_EMPTY(&sc->sc_rssdfree)) {
@ -1106,7 +1106,7 @@ wi_start(struct ifnet *ifp)
m_freem(m0); m_freem(m0);
sc->sc_txpending[ni->ni_txrate]++; sc->sc_txpending[ni->ni_txrate]++;
--sc->sc_txalloced; --sc->sc_txalloced;
if (sc->sc_txcur == cur) { if (sc->sc_txalloc == cur) {
if (wi_cmd(sc, WI_CMD_TX | WI_RECLAIM, fid, 0, 0)) { if (wi_cmd(sc, WI_CMD_TX | WI_RECLAIM, fid, 0, 0)) {
printf("%s: xmit failed\n", printf("%s: xmit failed\n",
sc->sc_dev.dv_xname); sc->sc_dev.dv_xname);
@ -1116,7 +1116,7 @@ wi_start(struct ifnet *ifp)
sc->sc_tx_timer = 5; sc->sc_tx_timer = 5;
ifp->if_timer = 1; ifp->if_timer = 1;
} }
sc->sc_txnext = cur = (cur + 1) % WI_NTXBUF; sc->sc_txqueue = cur = (cur + 1) % WI_NTXBUF;
SLIST_REMOVE_HEAD(&sc->sc_rssdfree, rd_next); SLIST_REMOVE_HEAD(&sc->sc_rssdfree, rd_next);
id->id_node = ni; id->id_node = ni;
continue; continue;
@ -1645,16 +1645,16 @@ wi_txalloc_intr(struct wi_softc *sc)
fid = CSR_READ_2(sc, WI_ALLOC_FID); fid = CSR_READ_2(sc, WI_ALLOC_FID);
cur = sc->sc_txcur; cur = sc->sc_txalloc;
if (sc->sc_txd[cur].d_fid != fid) { if (sc->sc_txd[cur].d_fid != fid) {
printf("%s: bad alloc %x != %x, cur %d nxt %d\n", printf("%s: bad alloc %x != %x, cur %d nxt %d\n",
sc->sc_dev.dv_xname, fid, sc->sc_txd[cur].d_fid, cur, sc->sc_dev.dv_xname, fid, sc->sc_txd[cur].d_fid, cur,
sc->sc_txnext); sc->sc_txqueue);
return; return;
} }
sc->sc_tx_timer = 0; sc->sc_tx_timer = 0;
++sc->sc_txalloced; ++sc->sc_txalloced;
sc->sc_txcur = cur = (cur + 1) % WI_NTXBUF; sc->sc_txalloc = cur = (cur + 1) % WI_NTXBUF;
if (sc->sc_txalloced >= WI_NTXBUF) if (sc->sc_txalloced >= WI_NTXBUF)
ifp->if_flags &= ~IFF_OACTIVE; ifp->if_flags &= ~IFF_OACTIVE;
else { else {

6
sys/dev/ic/wivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wivar.h,v 1.45 2004/07/22 20:23:31 mycroft Exp $ */ /* $NetBSD: wivar.h,v 1.46 2004/07/22 20:25:23 mycroft Exp $ */
/* /*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@ -126,9 +126,9 @@ struct wi_softc {
struct sc_txdesc { struct sc_txdesc {
int d_fid; int d_fid;
} sc_txd[WI_NTXBUF]; } sc_txd[WI_NTXBUF];
int sc_txalloc;
int sc_txalloced; int sc_txalloced;
int sc_txnext; int sc_txqueue;
int sc_txcur;
struct wi_rssdesc sc_rssd[WI_NTXRSS]; struct wi_rssdesc sc_rssd[WI_NTXRSS];
wi_rssdescq_t sc_rssdfree; wi_rssdescq_t sc_rssdfree;
int sc_tx_timer; int sc_tx_timer;