lkml.org 
[lkml]   [2009]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 17/22] Staging: rtxxx0: debug messages fixes
    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH] Staging: rtxxx0: debug messages fixes

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/staging/rt2860/common/ba_action.c | 7 -------
    drivers/staging/rt2860/common/mlme.c | 14 +-------------
    drivers/staging/rt2860/common/spectrum.c | 5 -----
    drivers/staging/rt2860/rt_linux.c | 5 -----
    drivers/staging/rt2860/sta/sync.c | 2 --
    drivers/staging/rt2870/common/2870_rtmp_init.c | 5 -----
    6 files changed, 1 insertion(+), 37 deletions(-)

    Index: b/drivers/staging/rt2860/common/ba_action.c
    ===================================================================
    --- a/drivers/staging/rt2860/common/ba_action.c
    +++ b/drivers/staging/rt2860/common/ba_action.c
    @@ -531,12 +531,10 @@ VOID BAOriSessionSetUp(
    pBAEntry->TimeOutValue = TimeOut;
    pBAEntry->pAdapter = pAd;

    -#ifdef RT30xx
    DBGPRINT(RT_DEBUG_TRACE,("Send AddBA to %02x:%02x:%02x:%02x:%02x:%02x Tid:%d isForced:%d Wcid:%d\n"
    ,pEntry->Addr[0],pEntry->Addr[1],pEntry->Addr[2]
    ,pEntry->Addr[3],pEntry->Addr[4],pEntry->Addr[5]
    ,TID,isForced,pEntry->Aid));
    -#endif

    if (!(pEntry->TXBAbitmap & (1<<TID)))
    {
    @@ -1078,16 +1076,11 @@ VOID BAOriSessionSetupTimeout(
    AddbaReq.Token = pBAEntry->Token;
    MlmeEnqueue(pAd, ACTION_STATE_MACHINE, MT2_MLME_ADD_BA_CATE, sizeof(MLME_ADDBA_REQ_STRUCT), (PVOID)&AddbaReq);
    RT28XX_MLME_HANDLER(pAd);
    -#ifndef RT30xx
    - DBGPRINT(RT_DEBUG_TRACE,("BA Ori Session Timeout(%d) : Send ADD BA again\n", pBAEntry->Token));
    -#endif
    -#ifdef RT30xx
    DBGPRINT(RT_DEBUG_TRACE,("BA Ori Session Timeout(%d) to %02x:%02x:%02x:%02x:%02x:%02x Tid:%d Wcid:%d\n"
    ,pBAEntry->Token
    ,pEntry->Addr[0],pEntry->Addr[1],pEntry->Addr[2]
    ,pEntry->Addr[3],pEntry->Addr[4],pEntry->Addr[5]
    ,pBAEntry->TID,pEntry->Aid));
    -#endif
    pBAEntry->Token++;
    RTMPSetTimer(&pBAEntry->ORIBATimer, ORI_BA_SESSION_TIMEOUT);
    }
    Index: b/drivers/staging/rt2860/common/mlme.c
    ===================================================================
    --- a/drivers/staging/rt2860/common/mlme.c
    +++ b/drivers/staging/rt2860/common/mlme.c
    @@ -2845,9 +2845,8 @@ VOID MlmeSetPsmBit(
    RTMP_IO_READ32(pAd, AUTO_RSP_CFG, &csr4.word);
    csr4.field.AckCtsPsmBit = (psm == PWR_SAVE)? 1:0;
    RTMP_IO_WRITE32(pAd, AUTO_RSP_CFG, csr4.word);
    -#ifndef RT30xx
    +
    DBGPRINT(RT_DEBUG_TRACE, ("MlmeSetPsmBit = %d\n", psm));
    -#endif
    }

    // IRQL = DISPATCH_LEVEL
    @@ -5842,14 +5841,7 @@ VOID AsicSwitchChannel(
    #endif

    if (index == MAX_NUM_OF_CHANNELS)
    - {
    -#ifndef RT30xx
    - DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: Cant find the Channel#%d \n", Channel));
    -#endif
    -#ifdef RT30xx
    DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: Can't find the Channel#%d \n", Channel));
    -#endif
    - }

    #ifdef RT2870
    // The RF programming sequence is difference between 3xxx and 2xxx
    @@ -5971,7 +5963,6 @@ VOID AsicSwitchChannel(
    }
    }

    -#ifndef RT30xx
    DBGPRINT(RT_DEBUG_TRACE, ("SwitchChannel#%d(RF=%d, Pwr0=%d, Pwr1=%d, %dT), N=0x%02X, K=0x%02X, R=0x%02X\n",
    Channel,
    pAd->RfIcType,
    @@ -5981,7 +5972,6 @@ VOID AsicSwitchChannel(
    FreqItems3020[index].N,
    FreqItems3020[index].K,
    FreqItems3020[index].R));
    -#endif
    }
    else
    #endif // RT2870 //
    @@ -9164,11 +9154,9 @@ VOID AsicTurnOnRFClk(
    break;
    }

    -#ifndef RT30xx
    DBGPRINT(RT_DEBUG_TRACE, ("AsicTurnOnRFClk#%d(RF=%d, ) , R2=0x%08x\n",
    Channel,
    pAd->RfIcType,
    R2));
    -#endif
    }

    Index: b/drivers/staging/rt2860/common/spectrum.c
    ===================================================================
    --- a/drivers/staging/rt2860/common/spectrum.c
    +++ b/drivers/staging/rt2860/common/spectrum.c
    @@ -1570,12 +1570,7 @@ static VOID PeerMeasureReportAction(

    if ((pMeasureReportInfo = kmalloc(sizeof(MEASURE_RPI_REPORT), GFP_ATOMIC)) == NULL)
    {
    -#ifndef RT30xx
    DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%zu).\n", __func__, sizeof(MEASURE_RPI_REPORT)));
    -#endif
    -#ifdef RT30xx
    - DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __func__, sizeof(MEASURE_RPI_REPORT)));
    -#endif
    return;
    }

    Index: b/drivers/staging/rt2860/rt_linux.c
    ===================================================================
    --- a/drivers/staging/rt2860/rt_linux.c
    +++ b/drivers/staging/rt2860/rt_linux.c
    @@ -826,12 +826,7 @@ void send_monitor_packets(

    if (pRxBlk->DataSize + sizeof(wlan_ng_prism2_header) > RX_BUFFER_AGGRESIZE)
    {
    -#ifndef RT30xx
    DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%zu)\n", __func__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header)));
    -#endif
    -#ifdef RT30xx
    - DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __func__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header)));
    -#endif
    goto err_free_sk_buff;
    }

    Index: b/drivers/staging/rt2860/sta/sync.c
    ===================================================================
    --- a/drivers/staging/rt2860/sta/sync.c
    +++ b/drivers/staging/rt2860/sta/sync.c
    @@ -1116,10 +1116,8 @@ VOID PeerBeacon(
    // Add the safeguard against the mismatch of adhoc wep status
    if (pAd->StaCfg.WepStatus != pAd->ScanTab.BssEntry[Bssidx].WepStatus)
    {
    -#ifdef RT30xx
    DBGPRINT(RT_DEBUG_TRACE, ("SYNC - Not matched wep status %d %d\n", pAd->StaCfg.WepStatus, pAd->ScanTab.BssEntry[Bssidx].WepStatus));
    DBGPRINT(RT_DEBUG_TRACE, ("bssid=%s\n", pAd->ScanTab.BssEntry[Bssidx].Bssid));
    -#endif
    return;
    }

    Index: b/drivers/staging/rt2870/common/2870_rtmp_init.c
    ===================================================================
    --- a/drivers/staging/rt2870/common/2870_rtmp_init.c
    +++ b/drivers/staging/rt2870/common/2870_rtmp_init.c
    @@ -1263,9 +1263,7 @@ static void rt2870_hcca_dma_done_tasklet
    UCHAR BulkOutPipeId = 4;
    purbb_t pUrb;

    -#ifndef RT30xx
    DBGPRINT_RAW(RT_DEBUG_ERROR, ("--->hcca_dma_done_tasklet\n"));
    -#endif

    pUrb = (purbb_t)data;
    pHTTXContext = (PHT_TX_CONTEXT)pUrb->context;
    @@ -1305,10 +1303,7 @@ static void rt2870_hcca_dma_done_tasklet
    }
    }

    -#ifndef RT30xx
    DBGPRINT_RAW(RT_DEBUG_ERROR, ("<---hcca_dma_done_tasklet\n"));
    -#endif
    - return;
    }



    \
     
     \ /
      Last update: 2009-08-16 21:41    [W:0.027 / U:210.944 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site