Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ic remove in %s\n", __func__ debugging
details: https://anonhg.NetBSD.org/src/rev/c0845c83147a
branches: trunk
changeset: 344952:c0845c83147a
user: christos <christos%NetBSD.org@localhost>
date: Fri Apr 29 02:27:06 2016 +0000
description:
remove in %s\n", __func__ debugging
diffstat:
sys/dev/ic/rt2860.c | 82 ++--------------------------------------------------
1 files changed, 4 insertions(+), 78 deletions(-)
diffs (truncated from 623 to 300 lines):
diff -r 5b4d87c0dd0c -r c0845c83147a sys/dev/ic/rt2860.c
--- a/sys/dev/ic/rt2860.c Fri Apr 29 02:17:25 2016 +0000
+++ b/sys/dev/ic/rt2860.c Fri Apr 29 02:27:06 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860.c,v 1.3 2016/04/28 12:24:51 christos Exp $ */
+/* $NetBSD: rt2860.c,v 1.4 2016/04/29 02:27:06 christos Exp $ */
/* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.3 2016/04/28 12:24:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.4 2016/04/29 02:27:06 christos Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -204,13 +204,11 @@
int qid, ntries, error;
uint32_t tmp;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
sc->amrr.amrr_min_success_threshold = 1;
sc->amrr.amrr_max_success_threshold = 15;
/* wait for NIC to initialize */
for (ntries = 0; ntries < 100; ntries++) {
- aprint_normal_dev(sc->sc_dev, "reading ASIC\n");
tmp = RAL_READ(sc, RT2860_ASIC_VER_ID);
if (tmp != 0 && tmp != 0xffffffff)
break;
@@ -230,12 +228,12 @@
id == PCI_PRODUCT_AWT_RT2890))
sc->sc_flags |= RT2860_ADVANCED_PS;
- aprint_normal_dev(sc->sc_dev, "reading eeprom\n");
/* retrieve RF rev. no and various other things from EEPROM */
rt2860_read_eeprom(sc);
aprint_normal_dev(sc->sc_dev, "802.11 address %s\n",
ether_sprintf(ic->ic_myaddr));
- aprint_normal_dev(sc->sc_dev, "MAC/BBP RT%X (rev 0x%04X), RF %s (MIMO %dT%dR)\n",
+ aprint_normal_dev(sc->sc_dev, "MAC/BBP RT%X (rev 0x%04X), "
+ "RF %s (MIMO %dT%dR)\n",
sc->mac_ver, sc->mac_rev, rt2860_get_rf(sc->rf_rev),
sc->ntxchains, sc->nrxchains);
@@ -281,7 +279,6 @@
firmware_handle_t fh;
int error;
- aprint_normal("in %s\n", __func__);
if ((error = firmware_open(dname, iname, &fh)) != 0)
return (error);
*sizep = firmware_get_size(fh);
@@ -304,7 +301,6 @@
struct ifnet *ifp = &sc->sc_if;
int i, error;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
error = firmware_load("ral", "ral-rt2860", &sc->ucode, &sc->ucsize);
if (error != 0) {
aprint_error_dev(sc->sc_dev,
@@ -407,7 +403,6 @@
struct ifnet *ifp = &sc->sc_if;
int qid;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
ieee80211_ifdetach(&sc->sc_ic); /* free all nodes */
if_detach(ifp);
@@ -428,7 +423,6 @@
struct rt2860_softc *sc = xsc;
struct ifnet *ifp = &sc->sc_if;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
if (ifp->if_flags & IFF_RUNNING)
rt2860_stop(ifp, 1);
}
@@ -439,7 +433,6 @@
struct rt2860_softc *sc = xsc;
struct ifnet *ifp = &sc->sc_if;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
if (ifp->if_flags & IFF_UP)
rt2860_init(ifp);
}
@@ -449,7 +442,6 @@
{
int nsegs, size, error;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
size = RT2860_TX_RING_COUNT * sizeof (struct rt2860_txd);
error = bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
@@ -498,7 +490,6 @@
struct rt2860_tx_data *data;
int i;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
for (i = 0; i < RT2860_TX_RING_COUNT; i++) {
if ((data = ring->data[i]) == NULL)
continue; /* nothing mapped in this slot */
@@ -524,7 +515,6 @@
struct rt2860_tx_data *data;
int i;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
if (ring->txd != NULL) {
bus_dmamap_sync(sc->sc_dmat, ring->map, 0,
ring->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
@@ -559,7 +549,6 @@
bus_addr_t paddr;
int i, nsegs, size, error;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
size = RT2860_TX_POOL_COUNT * RT2860_TXWI_DMASZ;
/* init data_pool early in case of failure.. */
@@ -627,7 +616,6 @@
static void
rt2860_free_tx_pool(struct rt2860_softc *sc)
{
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
if (sc->txwi_vaddr != NULL) {
bus_dmamap_sync(sc->sc_dmat, sc->txwi_map, 0,
sc->txwi_map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
@@ -652,7 +640,6 @@
{
int i, nsegs, size, error;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
size = RT2860_RX_RING_COUNT * sizeof (struct rt2860_rxd);
error = bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
@@ -741,7 +728,6 @@
{
int i;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
for (i = 0; i < RT2860_RX_RING_COUNT; i++)
ring->rxd[i].sdl0 &= ~htole16(RT2860_RX_DDONE);
@@ -756,7 +742,6 @@
{
int i;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
if (ring->rxd != NULL) {
bus_dmamap_sync(sc->sc_dmat, ring->map, 0,
ring->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
@@ -785,7 +770,6 @@
static struct ieee80211_node *
rt2860_node_alloc(struct ieee80211_node_table *nt)
{
- aprint_normal("in %s\n", __func__);
struct rt2860_node *rn =
malloc(sizeof (struct rt2860_node), M_DEVBUF, M_NOWAIT | M_ZERO);
return (rn) ? &rn->ni : NULL;
@@ -799,7 +783,6 @@
uint8_t rate, ridx;
int error;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
error = ieee80211_media_change(ifp);
if (error != ENETRESET)
return error;
@@ -827,7 +810,6 @@
struct rt2860_softc *sc = arg;
uint8_t wcid = ((struct rt2860_node *)ni)->wcid;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
ieee80211_amrr_choose(&sc->amrr, ni, &sc->amn[wcid]);
}
@@ -836,7 +818,6 @@
{
struct ieee80211com *ic = &sc->sc_ic;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
#ifndef IEEE80211_STA_ONLY
/*
* In IBSS or HostAP modes (when the hardware sends beacons), the
@@ -875,7 +856,6 @@
uint8_t rate, wcid = 0;
int ridx, i, j;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
if (isnew && ni->ni_associd != 0) {
/* only interested in true associations */
wcid = rn->wcid = IEEE80211_AID(ni->ni_associd);
@@ -921,7 +901,6 @@
rt2860_ampdu_rx_start(struct ieee80211com *ic, struct ieee80211_node *ni,
uint8_t tid)
{
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
struct rt2860_softc *sc = ic->ic_softc;
uint8_t wcid = ((struct rt2860_node *)ni)->wcid;
uint32_t tmp;
@@ -937,7 +916,6 @@
rt2860_ampdu_rx_stop(struct ieee80211com *ic, struct ieee80211_node *ni,
uint8_t tid)
{
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
struct rt2860_softc *sc = ic->ic_softc;
uint8_t wcid = ((struct rt2860_node *)ni)->wcid;
uint32_t tmp;
@@ -956,7 +934,6 @@
enum ieee80211_state ostate;
uint32_t tmp;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
ostate = ic->ic_state;
if (ostate == IEEE80211_S_RUN) {
@@ -1076,7 +1053,6 @@
uint16_t val;
int n;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
/* clock C once before the first command */
RT2860_EEPROM_CTL(sc, 0);
@@ -1127,7 +1103,6 @@
static __inline uint16_t
rt2860_srom_read(struct rt2860_softc *sc, uint8_t addr)
{
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
/* either eFUSE ROM or EEPROM */
return sc->sc_srom_read(sc, addr);
}
@@ -1137,7 +1112,6 @@
{
uint32_t tmp;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
/* DMA finds data coherent event when checking the DDONE bit */
DPRINTF(("Tx/Rx Coherent interrupt\n"));
@@ -1158,7 +1132,6 @@
uint32_t stat;
uint8_t wcid, mcs, pid;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
/* drain Tx status FIFO (maxsize = 16) */
while ((stat = RAL_READ(sc, RT2860_TX_STAT_FIFO)) & RT2860_TXQ_VLD) {
DPRINTFN(4, ("tx stat 0x%08x\n", stat));
@@ -1197,7 +1170,6 @@
struct rt2860_tx_ring *ring = &sc->txq[qid];
uint32_t hw;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
rt2860_drain_stats_fifo(sc);
hw = RAL_READ(sc, RT2860_TX_DTX_IDX(qid));
@@ -1236,7 +1208,6 @@
{
uint8_t rxchain = 0;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
if (sc->nrxchains > 1) {
if (rxwi->rssi[1] > rxwi->rssi[rxchain])
rxchain = 1;
@@ -1261,7 +1232,6 @@
struct rt2860_rx_radiotap_header *tap;
uint16_t phy;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
hw = RAL_READ(sc, RT2860_FS_DRX_IDX) & 0xfff;
while (sc->rxq.cur != hw) {
struct rt2860_rx_data *data = &sc->rxq.data[sc->rxq.cur];
@@ -1424,7 +1394,6 @@
{
struct ieee80211com *ic = &sc->sc_ic;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
#ifndef IEEE80211_STA_ONLY
if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
/* one less beacon until next DTIM */
@@ -1455,7 +1424,6 @@
{
struct ieee80211com *ic = &sc->sc_ic;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
DPRINTFN(2, ("GP timeout state=%d\n", ic->ic_state));
if (ic->ic_state == IEEE80211_S_SCAN)
@@ -1534,7 +1502,6 @@
uint8_t type, qsel, mcs, pid, tid, qid;
int nsegs, hasqos, ridx, ctl_ridx;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
/* the data pool contains at least one element, pick the first */
data = SLIST_FIRST(&sc->data_pool);
@@ -1733,7 +1700,6 @@
struct ieee80211_node *ni;
struct mbuf *m;
- aprint_normal_dev(sc->sc_dev, "in %s\n", __func__);
Home |
Main Index |
Thread Index |
Old Index