Module Name: src
Committed By: christos
Date: Sun Mar 23 02:53:12 UTC 2014
Modified Files:
src/sys/dev/pci: iwic_bchan.c iwic_dchan.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/iwic_bchan.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/iwic_dchan.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/dev/pci/iwic_bchan.c
diff -u src/sys/dev/pci/iwic_bchan.c:1.8 src/sys/dev/pci/iwic_bchan.c:1.9
--- src/sys/dev/pci/iwic_bchan.c:1.8 Sat Oct 27 13:18:34 2012
+++ src/sys/dev/pci/iwic_bchan.c Sat Mar 22 22:53:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_bchan.c,v 1.8 2012/10/27 17:18:34 chs Exp $ */
+/* $NetBSD: iwic_bchan.c,v 1.9 2014/03/23 02:53:12 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -38,7 +38,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.8 2012/10/27 17:18:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.9 2014/03/23 02:53:12 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -78,7 +78,6 @@ iwic_bchan_xirq(struct iwic_softc *sc, i
int irq_stat;
struct iwic_bchan *chan;
int cmd = 0;
- int activity = 0;
chan = &sc->sc_bchan[chan_no];
@@ -176,8 +175,6 @@ iwic_bchan_xirq(struct iwic_softc *sc, i
(*chan->l4_driver->bch_rx_data_ready)(chan->l4_driver_softc);
- activity = ACT_RX;
-
/* mark buffer ptr as unused */
chan->in_mbuf = NULL;
@@ -252,8 +249,7 @@ iwic_bchan_xirq(struct iwic_softc *sc, i
/* silence detection */
- if(!(isdn_bchan_silence(chan->in_mbuf->m_data, chan->in_mbuf->m_len)))
- activity = ACT_RX;
+ isdn_bchan_silence(chan->in_mbuf->m_data, chan->in_mbuf->m_len);
#if defined (__FreeBSD__) && __FreeBSD__ > 4
(void) IF_HANDOFF(&chan->rx_queue, chan->in_mbuf, NULL);
@@ -311,7 +307,6 @@ iwic_bchan_xirq(struct iwic_softc *sc, i
{
/* transmit fifo empty, new data can be written to fifo */
- int activity1 = -1;
int len;
int nextlen;
@@ -344,12 +339,7 @@ iwic_bchan_xirq(struct iwic_softc *sc, i
if(chan->bprot == BPROT_NONE)
{
- if(!(isdn_bchan_silence(chan->out_mbuf_cur->m_data, chan->out_mbuf_cur->m_len)))
- activity1 = ACT_TX;
- }
- else
- {
- activity1 = ACT_TX;
+ isdn_bchan_silence(chan->out_mbuf_cur->m_data, chan->out_mbuf_cur->m_len);
}
}
}
Index: src/sys/dev/pci/iwic_dchan.c
diff -u src/sys/dev/pci/iwic_dchan.c:1.7 src/sys/dev/pci/iwic_dchan.c:1.8
--- src/sys/dev/pci/iwic_dchan.c:1.7 Sat Oct 27 13:18:34 2012
+++ src/sys/dev/pci/iwic_dchan.c Sat Mar 22 22:53:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_dchan.c,v 1.7 2012/10/27 17:18:34 chs Exp $ */
+/* $NetBSD: iwic_dchan.c,v 1.8 2014/03/23 02:53:12 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.7 2012/10/27 17:18:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.8 2014/03/23 02:53:12 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -352,11 +352,9 @@ dchan_receive(struct iwic_softc *sc, int
else
{
int hi, lo;
- int total_frame_len;
lo = IWIC_READ(sc, D_RBCL);
hi = IWIC_READ(sc, D_RBCH);
- total_frame_len = D_RBC(hi, lo);
lo = lo & 0x3f;
if (lo == 0)
