MCL/sf/os/kernelhwsrv: comparison kernel/eka/drivers/usbcsc/usbcsc

equal deleted inserted replaced

-:c1f20ce4abcf
+:3e88ff8f41d5
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <e32std.h>
 #include <e32std_private.h>
 #include <d32usbcsc.h>
 #include <e32debug.h>
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "usbcsc_bilTraces.h"
-#endif
 /** @file usbcsc_bil.cpp
 	Buffer Interface Layer for USB Client Device driver stack, using shared chunks.
 	@internalTechnology
 	iNewAltSetting = 0;
 	iAltSettingSeq = 0;
 	return r;
 	}
-// empty a endpoint buffer, this is called when device state enter undefined
-TInt RDevUsbcScClient::Empty(TUint aBufferOffset)
-{
-	TUint8* base = iSharedChunk.Base();
-	SUsbcScBufferHeader* endpointHdr = (SUsbcScBufferHeader*) (aBufferOffset + base);
-	TUint localTail = endpointHdr->iBilTail;
-	TUsbcScTransferHeader* currentTransfer;
-	TInt err=KErrNone;
-	while (ETrue)
-		{
-		if (localTail == (TUint) endpointHdr->iHead)
-			{
-			err = KErrNone;
-			break;
-			}
-		currentTransfer = (TUsbcScTransferHeader*) (base + localTail);
-		localTail = currentTransfer->iNext;
-		} // end while
-	endpointHdr->iBilTail = localTail;
-	endpointHdr->iTail = localTail;
-	return err;
-}
 EXPORT_C TInt RDevUsbcScClient::FinalizeInterface(RChunk*& aChunk)
 	{
 	TInt errorOrhandle = DoControl(EControlRealizeInterface);
 	iSharedChunk.SetReturnedHandle(errorOrhandle);
 	iEndpointStatus = 0x00; //all endpoints are closed at the moment
 	iAlternateSetting = 0;
 	return aChunk->SetReturnedHandle(errorOrhandle);
-	}
-EXPORT_C void RDevUsbcScClient::ResetAltSetting()
-	{
-	if (iAlternateSetting == 0)
-		return;
-	TUsbcScChunkHeader chunkHeader(iSharedChunk);
-	TInt ep;
-	TInt noEp;
-	TUint bufOff;
-	TUsbcScHdrEndpointRecord* endpointInf = NULL;
-	// check if alternate setting contains all IN endpoints
-	noEp = chunkHeader.GetNumberOfEndpoints(iAlternateSetting);
-	// for each used buffer.
-	for (ep=1;ep<=noEp;ep++)
-		{
-		bufOff = chunkHeader.GetBuffer(iAlternateSetting,ep,endpointInf)->Offset();
-		if (endpointInf->Direction() & KUsbScHdrEpDirectionOut)
-			{
-			Empty(bufOff); // we need to remove anythng in the way, and get it ready for reading.
-			}
-		}
-	iAlternateSetting = 0;
 	}
 EXPORT_C TInt RDevUsbcScClient::OpenEndpoint(TEndpointBuffer& aEpB, TInt aEpI)
 	{
 		}
 	iEndpointStatus |= (1 << aEpI);
 #ifdef _DEBUG
 	aEpB.Dump();
-	OstTraceDef1(OST_TRACE_CATEGORY_RND, TRACE_NORMAL, RDEVUSBCSCCLIENT_OPENENDPOINT, "iEndpointStatus: %x \n",iEndpointStatus );
+	RDebug::Printf("iEndpointStatus: %x \n",iEndpointStatus);
 #endif
 	return KErrNone;
 	}
 //This drains any old data from an OUT buffer, and gets it ready for reading an ep.
 //aBufferOffset - The offset, into the chunk, that the buffer in question, may be found.
 TInt RDevUsbcScClient::Drain(TUint aBufferOffset)
 {
 	TUint8* base = iSharedChunk.Base();
 	SUsbcScBufferHeader* endpointHdr = (SUsbcScBufferHeader*) (aBufferOffset+base);
 	TUint localTail = endpointHdr->iBilTail;
 	TUsbcScTransferHeader* currentTransfer;
 	TUint16 next = (iAltSettingSeq+1)&0xFFFF;
 	TInt err=KErrNone;
-	TBool aZLP;
 	while (ETrue)
 		{
 		if (localTail == (TUint) endpointHdr->iHead)
 			{
 			break;
 			}
 		currentTransfer = (TUsbcScTransferHeader*) (base + localTail);
 		if (currentTransfer->iAltSettingSeq == next)
 			{
 			iNewAltSetting=currentTransfer->iAltSetting; // record new alt setting
-			aZLP = (currentTransfer->iFlags & KUsbcScShortPacket)!=EFalse;
-			if ((currentTransfer->iBytes==0) && (!aZLP)) // take empty packet which is for alternate setting change
-				{
-				localTail = currentTransfer->iNext;
-				}
 			break;
 			}
 		else
 			{
 			localTail = currentTransfer->iNext;
 	if ((localTail == (TUint)endpointHdr->iHead) || (currentTransfer->iAltSettingSeq != (iAltSettingSeq+1)&0xFFFF))
 		// if alternate setting has not changed
 		return KErrNotReady;
 	else
 		{
 		iNewAltSetting=currentTransfer->iAltSetting;
 		return KErrNone;
 		}
 }
 	if (iOutState)
 		return iOutState;
 	TUsbcScTransferHeader* currentTransfer;
 	TInt r;
-	TInt aBilTail;
 	do // until we have a transfer with data.
 		{
 		iEndpointHdr->iTail = iEndpointHdr->iBilTail;
 		if(iEndpointHdr->iBilTail == iEndpointHdr->iHead)  //If no new data, create request
 			{
 			r = iClient->ReadDataNotify(iBufferNum,aStatus);
 			if (r!=KErrCompletion)  // Data could arrive since we checked.
 				return r;
 			}
 		currentTransfer = (TUsbcScTransferHeader*) (iBaseAddr + iEndpointHdr->iBilTail);
-		aBilTail = iEndpointHdr->iBilTail;
 		iEndpointHdr->iBilTail = currentTransfer->iNext;
 		aZLP = (currentTransfer->iFlags & KUsbcScShortPacket)!=EFalse;
 		if(currentTransfer->iAltSettingSeq != (iClient->iAltSettingSeq))  // if alternate setting has changed
 			{
 			if (currentTransfer->iAltSettingSeq == (iClient->iAltSettingSeq+1))	   //Note- KIS ATM, if multiple alternate setting changes happen
-				{
 				iClient->iNewAltSetting = currentTransfer->iAltSetting; //before StartNextOutAlternateSetting is called,
 																	   //this variable will reflect the latest requested AlternateSetting
-				}
 			if (iEndpointNumber != KEp0Number)
 				{
-				iEndpointHdr->iBilTail = aBilTail;
 //				iOutState =  EEOF;
 				return KErrEof;
 				}
 			else if ((currentTransfer->iBytes==0) && (!aZLP))
 				{
 EXPORT_C TInt TEndpointBuffer::TakeBuffer(TAny*& aBuffer,TUint& aSize,TBool& aZLP,TRequestStatus& aStatus,TUint aLength)
 	{
 	if (iOutState)
 		return iOutState;
 	TUsbcScTransferHeader* currentTransfer;
 	TInt r;
-	TInt aBilTail;
 	do // until we have a transfer with data.
 		{
 		if(iEndpointHdr->iBilTail == iEndpointHdr->iHead)  //If no new data, create request
 			{
 			r = iClient->ReadDataNotify(iBufferNum,aStatus);
 				return r;
 				}
 			}
 		currentTransfer = (TUsbcScTransferHeader*) (iBaseAddr + iEndpointHdr->iBilTail);
-		aBilTail = iEndpointHdr->iBilTail;
 		iEndpointHdr->iBilTail = currentTransfer->iNext;
 		aZLP = (currentTransfer->iFlags & KUsbcScShortPacket)!=EFalse; // True if short packet else false
 		if(currentTransfer->iAltSettingSeq != (iClient->iAltSettingSeq))  // if alternate setting has changed
 			{
 			if (currentTransfer->iAltSettingSeq == (iClient->iAltSettingSeq+1))	   //Note- KIS ATM, if multiple alternate setting changes happen
 				iClient->iNewAltSetting = currentTransfer->iAltSetting; //before StartNextOutAlternateSetting is called,
 																	   //this variable will reflect the latest requested AlternateSetting
+			Expire(currentTransfer->iData.i);
 			if (iEndpointNumber != KEp0Number)
 				{
-				iEndpointHdr->iBilTail = aBilTail;
 //				iOutState = EEOF;
 				return KErrEof;
 				}
 			else if ((currentTransfer->iBytes==0) && (!aZLP))
 				{
-				Expire(currentTransfer->iData.i);
 				return KErrAlternateSettingChanged;
 				}
-			Expire(currentTransfer->iData.i);
 			}
 		if ((currentTransfer->iBytes==0) && (!aZLP)) // here , if empty transfer with alt setting information, Call expire
 			{
 	TInt currentTail = iEndpointHdr->iTail;
 	TInt prevTail = NULL;
 	TBool found = EFalse;
 	while (currentTail != iEndpointHdr->iBilTail)
 		{
 		TUsbcScTransferHeader* currentTransfer = (TUsbcScTransferHeader*) (iBaseAddr + currentTail);
 		if (currentTail == offsetToExpire)		// found which to expire
 			{
 			found = ETrue;
 			// This offset is to be expired
 			if (prevTail == NULL)
 				{
 				// The offset is at the list head
 				}
 			break;
 			}
 		prevTail = currentTail;
 		currentTail = currentTransfer->iNext;
 		}
 	return found ? KErrNone : KErrNotFound;
 	}
 EXPORT_C TInt TEndpointBuffer::WriteBuffer(TAny* aBuffer,TUint aSize,TBool aZLP,TRequestStatus& aStatus)
 /* Debug functions */
 EXPORT_C void TEndpointBuffer::Dump()
 	{
-	OstTraceDefExt5(OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TENDPOINTBUFFER_DUMP, "TEndpointBuffer::Dump iBufferStart: 0x%x, iSize: 0x%x, iEndpointNumber: 0x%x, iBufferNum: %d, iInState: 0x%x",
+	RDebug::Printf("TEndpointBuffer::Dump iBufferStart: 0x%x, iSize: 0x%x, iEndpointNumber: 0x%x, iBufferNum: %d, iInState: 0x%x iOutState: 0x%x\n",
-(TUint)iBufferStartAddr,iSize,iEndpointNumber,iBufferNum, (TUint)iInState);
+							iBufferStartAddr,iSize,iEndpointNumber,iBufferNum,iInState,iOutState);
+	}
-OstTraceDef1(OST_TRACE_CATEGORY_RND, TRACE_NORMAL, TENDPOINTBUFFER_DUMP_DUP1, " iOutState: 0x%x\n", iOutState);
-	}

branch	RCL_3
changeset 44	3e88ff8f41d5
parent 43	c1f20ce4abcf