FCL/sf/incubator/modemadaptation: comparison connectivitylayer/usbphonetlink/usbpnserver

equal deleted inserted replaced

-:942573423a60
+:fa67e03b87df
 #ifndef NCP_COMMON_BRIDGE_FAMILY
 #include <test_serverisi.h>         // For APE Test Server message ID
 #include <iscnokiadefinitions.h>    // For APE Test Server channel ID
 #endif /* NCP_COMMON_BRIDGE_FAMILY */
-// EXTERNAL DATA STRUCTURES
-// EXTERNAL FUNCTION PROTOTYPES
-// CONSTANTS
-// MACROS
-// LOCAL CONSTANTS AND MACROS
-// MODULE DATA STRUCTURES
-// LOCAL FUNCTION PROTOTYPES
-// FORWARD DECLARATIONS
-// ============================= LOCAL FUNCTIONS ===============================
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // CUsbPnUsbReceiver::CUsbPnUsbReceiver
 // C++ default constructor can NOT contain any code, that
 // -----------------------------------------------------------------------------
 //
 CUsbPnUsbReceiver::CUsbPnUsbReceiver( RDevUsbcClient& aLdd )
 :CActive( CActive::EPriorityStandard )
 , iLdd( aLdd )
-, iRecvPtr(0,0)
+, iRecvPtr( NULL, NULL )
-, iStorage(0)
+, iStorage( NULL )
 {
 OstTrace1( TRACE_NORMAL, CUSBPNUSBRECEIVER_CUSBPNUSBRECEIVER_ENTRY, "CUsbPnUsbReceiver::CUsbPnUsbReceiver;aLdd=%x", ( TUint )&( aLdd ) );
 C_TRACE( ( _T( "CUsbPnUsbReceiver::CUsbPnUsbReceiver( aLdd:0x%x )" ), &aLdd ) );
 CActiveScheduler::Add(this);
 Cancel();
 if( iIsaSender )
 {
 delete iIsaSender;
 }
+iIsaSender = NULL;
-iPacket = 0;
+iPacket = NULL;
 if( iStorage )
 {
 delete iStorage;
 }
 }
 // -----------------------------------------------------------------------------
 // CUsbPnUsbReceiver::DoCancel
-// ?implementation_description
-// (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CUsbPnUsbReceiver::DoCancel( )
 {
 OstTrace0( TRACE_NORMAL, CUSBPNUSBRECEIVER_DOCANCEL_ENTRY, "CUsbPnUsbReceiver::DoCancel" );
 C_TRACE( ( _T( "CUsbPnUsbReceiver::DoCancel() - return void" ) ) );
 }
 // -----------------------------------------------------------------------------
 // CUsbPnUsbReceiver::RunL
-// ?implementation_description
-// (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CUsbPnUsbReceiver::RunL( )
 {
 OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_RUNL_ENTRY, "CUsbPnUsbReceiver::RunL;iStatus:%d", iStatus.Int() );
 User::LeaveIfError( iStatus.Int() );
 ConstructMessageL();
 if( iMessageComplete )
 {
-iIsaSender->Send( *iPacket );
+iIsaSender->AddPacketToSendingQueue( *iPacket );
-iMessageComplete = EFalse;
+SetMessageComplete( EFalse );
-iByteCount = 0;
+SetByteCount( NULL );
-iMessageLength = 0;
+SetMessageLength( NULL );
-// Start fresh receive
 Receive( ETrue );
 }
 OstTrace0( TRACE_API, CUSBPNUSBRECEIVER_RUNL_EXIT, "CUsbPnUsbReceiver::RunL - return void" );
 A_TRACE( ( _T( "CUsbPnUsbReceiver::RunL() - return void" ) ) );
 }
 // -----------------------------------------------------------------------------
+// CUsbPnUsbReceiver::SetMessageComplete
+// -----------------------------------------------------------------------------
+void CUsbPnUsbReceiver::SetMessageComplete( const TBool aMsgComplete )
+{
+OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_SETMESSAGECOMPLETE_ENTRY, "CUsbPnUsbReceiver::SetMessageComplete;aMsgComplete:%d", aMsgComplete );
+A_TRACE( ( _T( "CUsbPnUsbReceiver::SetMessageComplete() aMsgComplete:%d" ), aMsgComplete ) );
+iMessageComplete = aMsgComplete;
+OstTrace0( TRACE_API, CUSBPNUSBRECEIVER_SETMESSAGECOMPLETE_EXIT, "CUsbPnUsbReceiver::SetMessageComplete - return void" );
+A_TRACE( ( _T( "CUsbPnUsbReceiver::SetMessageComplete() - return void" ) ) );
+}
+// -----------------------------------------------------------------------------
+// CUsbPnUsbReceiver::SetByteCount
+// -----------------------------------------------------------------------------
+void CUsbPnUsbReceiver::SetByteCount( const TUint aByteCount )
+{
+OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_SETBYTECOUNT_ENTRY, "CUsbPnUsbReceiver::SetByteCount;aByteCount:%d", aByteCount );
+A_TRACE( ( _T( "CUsbPnUsbReceiver::SetByteCount() aByteCount:%d" ), aByteCount ) );
+iByteCount = aByteCount;
+OstTrace0( TRACE_API, CUSBPNUSBRECEIVER_SETBYTECOUNT_EXIT, "CUsbPnUsbReceiver::SetByteCount - return void" );
+A_TRACE( ( _T( "CUsbPnUsbReceiver::SetByteCount() - return void" ) ) );
+}
+// -----------------------------------------------------------------------------
+// CUsbPnUsbReceiver::SetMessageLength
+// -----------------------------------------------------------------------------
+void CUsbPnUsbReceiver::SetMessageLength( const TUint aMessageLength )
+{
+OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_SetMessageLength_ENTRY, "CUsbPnUsbReceiver::SetMessageLength;aMessageLength:%d", aMessageLength );
+A_TRACE( ( _T( "CUsbPnUsbReceiver::SetMessageLength() aMessageLength:%d" ), aMessageLength ) );
+iMessageLength = aMessageLength;
+OstTrace0( TRACE_API, CUSBPNUSBRECEIVER_SetMessageLength_EXIT, "CUsbPnUsbReceiver::SetMessageLength - return void" );
+A_TRACE( ( _T( "CUsbPnUsbReceiver::SetMessageLength() - return void" ) ) );
+}
+// -----------------------------------------------------------------------------
 // CUsbPnUsbReceiver::RunError
-// ?implementation_description
-// (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CUsbPnUsbReceiver::RunError( TInt aError )
 {
 OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_RUNERROR_ENTRY, "CUsbPnUsbReceiver::RunError;aError=%d", aError );
 case KErrUsbDeviceBusReset:
 case KErrUsbEpNotReady:
 {
 OstTrace0( TRACE_NORMAL, CUSBPNUSBRECEIVER_RUNERROR, "CUsbPnUsbReceiver::RunError - Cable detached!" );
 C_TRACE( ( _T( "CUsbPnUsbReceiver::RunError - Cable detached!" )));
-aError = KErrNone;
 break;
 }
 default:
 {
-TRACE_ASSERT_ALWAYS;  // Log the errorcase.
+TRACE_ASSERT_ALWAYS;
-aError = KErrNone; // Ignore error..
+User::Panic( KUsbPnPanicCat, aError );
 break;
 }
 }
 OstTrace0( TRACE_NORMAL, CUSBPNUSBRECEIVER_RUNERROR_EXIT, "CUsbPnUsbReceiver::RunError - return" );
 C_TRACE( ( _T( "CUsbPnUsbReceiver::RunL() - return" ) ) );
-return aError;
+return KErrNone;
 }
 // -----------------------------------------------------------------------------
 // CUsbPnUsbReceiver::Receive
-// ?implementation_description
+// -----------------------------------------------------------------------------
-// (other items were commented in a header).
+//
-// -----------------------------------------------------------------------------
+void CUsbPnUsbReceiver::Receive( TBool )
-//
-void CUsbPnUsbReceiver::Receive( TBool /*aForward*/ )
 {
 OstTrace0( TRACE_NORMAL, CUSBPNUSBRECEIVER_RECEIVE_ENTRY, "CUsbPnUsbReceiver::Receive" );
 C_TRACE( ( _T( "CUsbPnUsbReceiver::Receive()" )) );
 // iEnumerated flag is controlled by CUsbPnInterface. ETrue when altset1. EFalse if altset0 or cable disconnected.
 if( iEnumerated )
 {
 if(!IsActive())
 {
-TRAPD( err, iPacket = &iIsaSender->PacketL() );
+TRAPD( err, iPacket = &iIsaSender->GetNextPacketL() );
 if(!err)
 {
 iRecvPtr.Set( iPacket->Buffer().Des() );
 iLdd.ReadUntilShort( iStatus, EEndpoint2, iRecvPtr );
 OstTrace0( TRACE_NORMAL, CUSBPNUSBRECEIVER_RECEIVE, "CUsbPnUsbReceiver::Receive - Receiving" );
 C_TRACE( ( _T( "CUsbPnUsbReceiver::Receive - Receiving" )) );
 SetActive();
 }
 else
 {
-// No free packets so receiving not activated until sender
 OstTrace0( TRACE_NORMAL, CUSBPNUSBRECEIVER_RECEIVE_DUP1, "CUsbPnUsbReceiver::Receive - Sender tells when to continue" );
 C_TRACE( ( _T( "CUsbPnUsbReceiver::Receive - Sender tells when to continue" )) );
 }
 }
 }
 C_TRACE( ( _T( "CUsbPnUsbReceiver::Receive() - return void" ) ) );
 }
 // -----------------------------------------------------------------------------
 // CUsbPnUsbReceiver::IsaSender
-// ?implementation_description
-// (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 MUsbPnControlObserver* CUsbPnUsbReceiver::IsaSender()
 {
 OstTrace0( TRACE_NORMAL, CUSBPNUSBRECEIVER_ISASENDER_ENTRY, "CUsbPnUsbReceiver::IsaSender" );
 return (MUsbPnControlObserver*)iIsaSender;
 }
 // -----------------------------------------------------------------------------
 // CUsbPnUsbReceiver::SetEnumerated
-// ?implementation_description
-// (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CUsbPnUsbReceiver::SetEnumerated( TBool aState )
 {
 OstTrace1( TRACE_NORMAL, CUSBPNUSBRECEIVER_SETENUMERATED_ENTRY, "CUsbPnUsbReceiver::SetEnumerated;aState=%d", aState );
 if( iByteCount == 0 )
 {
 TUint16 lsb(iRecvPtr[ISI_HEADER_OFFSET_LENGTH +1]);
 TUint16 msb(iRecvPtr[ISI_HEADER_OFFSET_LENGTH]);
-iMessageLength = (lsb | (msb<<8));
+iMessageLength = ( lsb | ( msb<<8 ) );
 OstTrace1( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP1, "CUsbPnUsbReceiver::ConstructMessageL;iMessageLength=%d", iMessageLength );
 E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - iMessageLength:%d" ), iMessageLength ) );
 if( iMessageLength >= 4 )
 {
 OstTrace1( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP2, "CUsbPnUsbReceiver::ConstructMessageLNew message;Received:%d", iByteCount );
 E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - New message. Received:%d"), iByteCount));
 if( ( PN_HEADER_SIZE + iMessageLength ) > packetLength )
 {
-// realloc
 OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP3, "CUsbPnUsbReceiver::ConstructMessageL - partial message. Receive more" );
 E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - partial message. Receive more")));
-// Alloc temporary buffer to store data
 iStorage = HBufC8::NewL( iMessageLength + PN_HEADER_SIZE );
 TPtr8 tmp( iStorage->Des() );
 tmp.Append( iPacket->Buffer() );
 }
 }
 E_TRACE((_T("CUsbPnUsbReceiver::ConstructMessage - Append to previous part. iByteCount:%d"), iByteCount));
 TPtr8 tmp( iStorage->Des() );
 tmp.Append( iPacket->Buffer() );
 }
-// Ready to be sent?
+// message ready to be sent
-if( iByteCount == iMessageLength + PN_HEADER_SIZE )
+if( iByteCount == ( iMessageLength + PN_HEADER_SIZE ) )
 {
 OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP5, "CUsbPnUsbReceiver::ConstructMessageL - message complete" );
 E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - message complete")));
 if( iByteCount > KPnPacketSize )
 {
-// Realloc iPacket's buffer with needed length
 OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP6, "CUsbPnUsbReceiver::ConstructMessageL - realloc for whole message" );
 E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - realloc for whole message")));
 iPacket->ReallocBufferL( iMessageLength + PN_HEADER_SIZE );
 iRecvPtr.Set( iPacket->Buffer().Des() );
 iRecvPtr.Append( *iStorage );
 TUint8 tmp5(iRecvPtr[ISI_HEADER_OFFSET_LENGTH +1]);
 iRecvPtr[ISI_HEADER_OFFSET_LENGTH] = tmp5;
 iRecvPtr[ISI_HEADER_OFFSET_LENGTH +1] = tmp4;
 #ifndef NCP_COMMON_BRIDGE_FAMILY
-// Message directly to APE Test Server. Rare labeling case for optimized performance
+// Message directly to APE Test Server.
 if( (iRecvPtr[ISI_HEADER_OFFSET_RESOURCEID] == PN_EPOC_TEST) &&
 (iRecvPtr[ISI_HEADER_OFFSET_MESSAGEID] == TS_SOS_FILE_WRITE_REQ ) )
 {
 OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP7, "CUsbPnUsbReceiver::ConstructMessageL - Message to APE Test Server" );
 E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - Message to APE Test Server")));
-// Set Receiver device
-//TUint8 recvDev = iRecvPtr[ISI_HEADER_OFFSET_RECEIVERDEVICE] & 0x03;
-//iRecvPtr[ISI_HEADER_OFFSET_RECEIVERDEVICE] = (recvDev | (PN_DEV_SOS & 0xFC));
 iRecvPtr[ISI_HEADER_OFFSET_RECEIVERDEVICE] = PN_DEV_SOS;
+iRecvPtr[ISI_HEADER_OFFSET_RECEIVEROBJECT] = EIscNokiaTest;
-// Set Receiver Object ID
+}
-TUint8 objIdHighBits = (EIscNokiaTest >> 8) & 0x03;
+#endif // NCP_COMMON_BRIDGE_FAMILY
-TUint8 objIdLowBits = (EIscNokiaTest & 0x00ff);
-TUint8 receiverDevice( (iRecvPtr[ISI_HEADER_OFFSET_RECEIVERDEVICE] ) & 0xFC );
-receiverDevice = (receiverDevice | objIdHighBits);
-iRecvPtr[ISI_HEADER_OFFSET_RECEIVERDEVICE] = receiverDevice;
-iRecvPtr[ISI_HEADER_OFFSET_RECEIVEROBJECT] = objIdLowBits;
-}
-#endif /* NCP_COMMON_BRIDGE_FAMILY */
 iMessageComplete = ETrue;
 }
 else
 {
 SetActive();
 }
 OstTrace0( TRACE_NORMAL, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_EXIT, "CUsbPnUsbReceiver::ConstructMessageL - return void" );
 C_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage() - return void" ) ) );
 }
 // ========================== OTHER EXPORTED FUNCTIONS =========================
 //  End of File

changeset 7	fa67e03b87df
parent 5	8ccc39f9d787
child 8	6295dc2169f3