[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Tue Mar 13 10:06:47 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/8e3435571ec3
changeset: 429:8e3435571ec3
user:      ray at terran.dlink.ua
date:      Tue Mar 13 12:06:53 2012 +0200
description:
Remove unused inerrupt handlers. part 2 (DONE).

diffstat:

 head/sys/dev/ral/rt2860.c    |  64 --------------------------------------------
 head/sys/dev/ral/rt2860var.h |   3 --
 2 files changed, 0 insertions(+), 67 deletions(-)

diffs (117 lines):

diff -r 3c1d901583cc -r 8e3435571ec3 head/sys/dev/ral/rt2860.c

--- a/head/sys/dev/ral/rt2860.c	Tue Mar 13 12:02:49 2012 +0200
+++ b/head/sys/dev/ral/rt2860.c	Tue Mar 13 12:06:53 2012 +0200
@@ -580,9 +580,6 @@
 static void rt2860_fifo_sta_full_intr(struct rt2860_softc *sc);
 static void rt2860_rx_intr(struct rt2860_softc *sc);
 static void rt2860_tx_intr(struct rt2860_softc *sc, int qid);
-static void rt2860_mcu_cmd_intr(struct rt2860_softc *sc);
-static void rt2860_auto_wakeup_intr(struct rt2860_softc *sc);
-static void rt2860_gp_timer_intr(struct rt2860_softc *sc);
 static void rt2860_rx_done_task(void *context, int pending);
 static void rt2860_tx_done_task(void *context, int pending);
 static void rt2860_fifo_sta_full_task(void *context, int pending);
@@ -1629,11 +1626,8 @@
 
 	tmp = RT2860_REG_INT_TX_COHERENT |
 		RT2860_REG_INT_RX_COHERENT |
-		RT2860_REG_INT_GP_TIMER |
-		RT2860_REG_INT_AUTO_WAKEUP |
 		RT2860_REG_INT_FIFO_STA_FULL |
 		RT2860_REG_INT_TXRX_COHERENT |
-		RT2860_REG_INT_MCU_CMD |
 		RT2860_REG_INT_TX_MGMT_DONE |
 		RT2860_REG_INT_TX_HCCA_DONE |
 		RT2860_REG_INT_TX_AC3_DONE |
@@ -5062,16 +5056,6 @@
 
 	if (status & RT2860_REG_INT_TX_AC0_DONE)
 		rt2860_tx_intr(sc, 0);
-
-	if (status & RT2860_REG_INT_MCU_CMD)
-		rt2860_mcu_cmd_intr(sc);
-
-	if (status & RT2860_REG_INT_AUTO_WAKEUP)
-		rt2860_auto_wakeup_intr(sc);
-
-	if (status & RT2860_REG_INT_GP_TIMER)
-		rt2860_gp_timer_intr(sc);
-
 }
 
 /*
@@ -5310,42 +5294,6 @@
 }
 
 /*
- * rt2860_mcu_cmd_intr
- */
-static void rt2860_mcu_cmd_intr(struct rt2860_softc *sc)
-{
-	RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
-		"%s: MCU command interrupt\n",
-		device_get_nameunit(sc->sc_dev));
-
-	sc->mcu_cmd_interrupts++;
-}
-
-/*
- * rt2860_auto_wakeup_intr
- */
-static void rt2860_auto_wakeup_intr(struct rt2860_softc *sc)
-{
-	RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
-		"%s: auto wakeup interrupt\n",
-		device_get_nameunit(sc->sc_dev));
-
-	sc->auto_wakeup_interrupts++;
-}
-
-/*
- * rt2860_gp_timer_intr
- */
-static void rt2860_gp_timer_intr(struct rt2860_softc *sc)
-{
-	RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
-		"%s: GP timer interrupt\n",
-		device_get_nameunit(sc->sc_dev));
-
-	sc->gp_timer_interrupts++;
-}
-
-/*
  * rt2860_rx_done_task
  */
 static void rt2860_rx_done_task(void *context, int pending)
@@ -6836,18 +6784,6 @@
 		"Tx AC0 interrupts");
 
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
-		"mcu_cmd_interrupts", CTLFLAG_RD, &sc->mcu_cmd_interrupts, 0,
-		"MCU command interrupts");
-
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
-		"auto_wakeup_interrupts", CTLFLAG_RD, &sc->auto_wakeup_interrupts, 0,
-		"auto wakeup interrupts");
-
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
-		"gp_timer_interrupts", CTLFLAG_RD, &sc->gp_timer_interrupts, 0,
-		"GP timer interrupts");
-
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
 		"tx_mgmt_desc_queued", CTLFLAG_RD, &sc->tx_ring[5].desc_queued, 0,
 		"Tx MGMT descriptors queued");
 
diff -r 3c1d901583cc -r 8e3435571ec3 head/sys/dev/ral/rt2860var.h
--- a/head/sys/dev/ral/rt2860var.h	Tue Mar 13 12:02:49 2012 +0200
+++ b/head/sys/dev/ral/rt2860var.h	Tue Mar 13 12:06:53 2012 +0200
@@ -597,9 +597,6 @@
 	unsigned long fifo_sta_full_interrupts;
 	unsigned long rx_interrupts;
 	unsigned long tx_interrupts[RT2860_SOFTC_TX_RING_COUNT];
-	unsigned long mcu_cmd_interrupts;
-	unsigned long auto_wakeup_interrupts;
-	unsigned long gp_timer_interrupts;
 
 	unsigned long tx_data_queue_full[RT2860_SOFTC_TX_RING_COUNT];
 
