ocf: update to version 20120127

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32672 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 15 insertions, 15 deletions

diff --git a/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c b/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c
index eabac5ad93..f533475997 100644
--- a/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c
+++ b/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c
@@ -123,7 +123,7 @@ void     ethEjpModeSet(int port, int mode)
         mvEthEjpModeSet(pHndl, mode);
     }
 }
-#endif /* (MV_ETH_VERSION >= 4) */
+#endif /* (MV_ETH_VERSION >= 4) */

 
 void    ethBpduRxQ(int port, int bpduQueue)
 {
@@ -189,10 +189,10 @@ void    ethTxPolicyRegs(int port)
 
     mvOsPrintf("\n\t TX policy Port #%d configuration registers\n", port);
 
-    mvOsPrintf("ETH_TX_QUEUE_COMMAND_REG            : 0x%X = 0x%08x\n", 
-                ETH_TX_QUEUE_COMMAND_REG(port), 
-                MV_REG_READ( ETH_TX_QUEUE_COMMAND_REG(port) ) );    
-    
+    mvOsPrintf("ETH_TX_QUEUE_COMMAND_REG            : 0x%X = 0x%08x\n", 

+                ETH_TX_QUEUE_COMMAND_REG(port), 

+                MV_REG_READ( ETH_TX_QUEUE_COMMAND_REG(port) ) );    

+    

     mvOsPrintf("ETH_TX_FIXED_PRIO_CFG_REG           : 0x%X = 0x%08x\n", 
                 ETH_TX_FIXED_PRIO_CFG_REG(port), 
                 MV_REG_READ( ETH_TX_FIXED_PRIO_CFG_REG(port) ) );
@@ -211,8 +211,8 @@ void    ethTxPolicyRegs(int port)
 
     mvOsPrintf("ETH_TX_TOKEN_BUCKET_COUNT_REG       : 0x%X = 0x%08x\n", 
                 ETH_TX_TOKEN_BUCKET_COUNT_REG(port), 
-                MV_REG_READ( ETH_TX_TOKEN_BUCKET_COUNT_REG(port) ) );
-
+                MV_REG_READ( ETH_TX_TOKEN_BUCKET_COUNT_REG(port) ) );

+

     for(queue=0; queue<MV_ETH_MAX_TXQ; queue++)
     {
         mvOsPrintf("\n\t TX policy Port #%d, Queue #%d configuration registers\n", port, queue);
@@ -228,7 +228,7 @@ void    ethTxPolicyRegs(int port)
         mvOsPrintf("ETH_TXQ_ARBITER_CFG_REG             : 0x%X = 0x%08x\n", 
                 ETH_TXQ_ARBITER_CFG_REG(port, queue), 
                 MV_REG_READ( ETH_TXQ_ARBITER_CFG_REG(port, queue) ) );
-    }
+    }

     mvOsPrintf("\n");
 }
 
@@ -633,11 +633,11 @@ void    mvEthPortShow(void* pHndl)
     mvOsPrintf("RxCoal = %d usec, TxCoal = %d usec\n", 
                 rxCoal, txCoal);
 
-    mvOsPrintf("rxDefQ=%d, arpQ=%d, bpduQ=%d, tcpQ=%d, udpQ=%d\n\n",
-                pPortCtrl->portConfig.rxDefQ, pPortCtrl->portConfig.rxArpQ, 
-                pPortCtrl->portConfig.rxBpduQ, 
-                pPortCtrl->portConfig.rxTcpQ, pPortCtrl->portConfig.rxUdpQ); 
-
+    mvOsPrintf("rxDefQ=%d, arpQ=%d, bpduQ=%d, tcpQ=%d, udpQ=%d\n\n",

+                pPortCtrl->portConfig.rxDefQ, pPortCtrl->portConfig.rxArpQ, 

+                pPortCtrl->portConfig.rxBpduQ, 

+                pPortCtrl->portConfig.rxTcpQ, pPortCtrl->portConfig.rxUdpQ); 

+

     /* Print all RX and TX queues */
     for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
     {
@@ -692,7 +692,7 @@ void    mvEthQueuesShow(void* pHndl, int rxQueue, int txQueue, int mode)
                     mvOsPrintf("%3d. desc=%08x (%08x), cmd=%08x, data=%4d, buf=%4d, buf=%08x, pkt=%lx, os=%lx\n", 
                                 i, (MV_U32)pRxDescr, (MV_U32)ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pRxDescr), 
                                 pRxDescr->cmdSts, pRxDescr->byteCnt, (MV_U32)pRxDescr->bufSize, 
-                                (unsigned int)pRxDescr->bufPtr, (MV_ULONG)pRxDescr->returnInfo,
+                                (unsigned int)pRxDescr->bufPtr, (MV_ULONG)pRxDescr->returnInfo,

                                 ((MV_PKT_INFO*)pRxDescr->returnInfo)->osInfo);
 
                     ETH_DESCR_INV(pPortCtrl, pRxDescr);
@@ -733,7 +733,7 @@ void    mvEthQueuesShow(void* pHndl, int rxQueue, int txQueue, int mode)
                     mvOsPrintf("%3d. desc=%08x (%08x), cmd=%08x, data=%4d, buf=%08x, pkt=%lx, os=%lx\n", 
                                 i, (MV_U32)pTxDescr, (MV_U32)ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pTxDescr), 
                                 pTxDescr->cmdSts, pTxDescr->byteCnt, 
-                                (MV_U32)pTxDescr->bufPtr, (MV_ULONG)pTxDescr->returnInfo,
+                                (MV_U32)pTxDescr->bufPtr, (MV_ULONG)pTxDescr->returnInfo,

                                 pTxDescr->returnInfo ? (((MV_PKT_INFO*)pTxDescr->returnInfo)->osInfo) : 0x0);
 
                     ETH_DESCR_INV(pPortCtrl, pTxDescr);