--- a/kernel/eka/drivers/resmanus/d_resmanus.cpp Fri Aug 06 16:34:38 2010 +0100
+++ b/kernel/eka/drivers/resmanus/d_resmanus.cpp Thu Aug 12 11:55:14 2010 +0100
@@ -482,8 +482,7 @@
{
__ASSERT_ALWAYS(m.Ptr2() != NULL, RESMANUS_FAULT());
#ifdef _DUMP_TRACKERS
- if((r=DumpTracker(iSetStateTracker))!=KErrNone)
- break;
+ DumpTracker(iSetStateTracker);
#endif
r = GetAndInitTrackingBuffer(iSetStateTracker, trackBuf, (TUint)m.Ptr1(), pS);
if( r != KErrNone)
@@ -500,8 +499,7 @@
__ASSERT_ALWAYS(m.Ptr2() != NULL, RESMANUS_FAULT());
umemget32(&(parms[0]), m.Ptr2(), 3*sizeof(TInt));
#ifdef _DUMP_TRACKERS
- if((r=DumpTracker(iGetStateTracker))!=KErrNone)
- break;
+ DumpTracker(iGetStateTracker);
#endif
r = GetStateBuffer(iGetStateTracker, trackBuf, (TUint)m.Ptr1(), (TInt*)parms[1], (TInt*)parms[2], callBack, pS);
if(r != KErrNone)
@@ -1269,10 +1267,8 @@
if((r==KErrNone) && (stateRes[2]>0))
r=InitTrackingControl(iListenableTracker,ENotify,stateRes[2]);
#ifdef _DUMP_TRACKERS
- if((r=DumpTracker(iGetStateTracker))!=KErrNone)
- break;
- if((r=DumpTracker(iSetStateTracker))!=KErrNone)
- break;
+ DumpTracker(iGetStateTracker);
+ DumpTracker(iSetStateTracker);
#endif
}
break;
@@ -2014,14 +2010,16 @@
return r;
}
-
#ifdef _DUMP_TRACKERS
-TInt DChannelResManUs::DumpTracker(TTrackingControl* aTracker)
+void DChannelResManUs::DumpTracker(TTrackingControl* aTracker)
{
Kern::Printf("\nDChannelResManUs::DumpTracker");
Kern::Printf("Tracker at 0x%x\n",aTracker);
- if(NULL==aTracker)
- return KErrGeneral;
+ if(!aTracker)
+ {
+ Kern::Printf("Nothing to dump..");
+ return;
+ }
Kern::Printf("iType=%d",aTracker->iType);
switch(aTracker->iType)
{
@@ -2043,14 +2041,14 @@
buf=aTracker->iFreeQue->First();
while(buf!=aTracker->iFreeQue->Last())
{
- Kern::Printf("iFreeQue buffer at 0x%x\n",buf);
+ Kern::Printf("iFreeQue first buffer at 0x%x\n",buf);
TAny* intermediatePtr = (TAny*)buf;
if((aTracker->iType == EGetState)||(aTracker->iType == ESetState))
{
- TTrackStateBuf* tempBuf =(TTrackStateBuf*)intermediatePtr;
- Kern::Printf("buffer control block at 0x%x\n",tempBuf->iCtrlBlock);
+ TTrackSetStateBuf* tempBuf =(TTrackSetStateBuf*)intermediatePtr;
+ Kern::Printf("buffer control block at 0x%x\n",(TInt)&tempBuf->iCtrlBlock);
}
- buf= buf->iNext;
+ buf = buf->iNext;
};
}
Kern::Printf("iBusyQue at 0x%x\n",aTracker->iBusyQue);
@@ -2063,14 +2061,12 @@
TAny* intermediatePtr = (TAny*)buf;
if((aTracker->iType == EGetState)||(aTracker->iType == ESetState))
{
- TTrackStateBuf* tempBuf =(TTrackStateBuf*)intermediatePtr;
- Kern::Printf("buffer control block at 0x%x\n",tempBuf->iCtrlBlock);
+ TTrackSetStateBuf* tempBuf =(TTrackSetStateBuf*)intermediatePtr;
+ Kern::Printf("buffer control block at 0x%x\n", (TInt)&tempBuf->iCtrlBlock);
}
buf= buf->iNext;
};
}
-
- return KErrNone;
}
#endif