--- a/kerneltest/e32test/iic/iic_psl/spi.cpp Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/iic/iic_psl/spi.cpp Wed Sep 01 12:34:56 2010 +0100
@@ -19,7 +19,6 @@
#include <drivers/iic_trace.h>
#endif
-#ifndef STANDALONE_CHANNEL
#define NUM_CHANNELS 4 // Arbitrary
// Macros to be updated(?) with interaction with Configuration Repository
@@ -27,7 +26,6 @@
#define CHANNEL_TYPE(n) (KChannelTypeArray[n])
const DIicBusChannel::TChannelDuplex KChannelDuplexArray[NUM_CHANNELS] = {DIicBusChannel::EHalfDuplex, DIicBusChannel::EHalfDuplex, DIicBusChannel::EHalfDuplex, DIicBusChannel::EFullDuplex};
#define CHANNEL_DUPLEX(n) (KChannelDuplexArray[n])
-#endif/*STANDALONE_CHANNEL*/
#ifdef LOG_SPI
#define SPI_PRINT(str) Kern::Printf str
@@ -124,10 +122,8 @@
aDes.Copy((TUint8*)&caps,size);
}
-#ifndef STANDALONE_CHANNEL
// supported channels for this implementation
static DIicBusChannel* ChannelPtrArray[NUM_CHANNELS];
-#endif
//DECLARE_EXTENSION_WITH_PRIORITY(BUS_IMPLMENTATION_PRIORITY)
DECLARE_STANDARD_PDD() // SPI test driver to be explicitly loaded as an LDD, not kernel extension
@@ -491,7 +487,10 @@
TInt DSimulatedIicBusChannelMasterSpi::DoSimulatedTransaction()
{
TInt r = AsynchStateMachine(EHwTransferDone);
- CancelTimeOut();
+ if(iTimeoutTimer.Cancel() == FALSE)
+ {
+ SPI_PRINT(("timer is not cancelled"));
+ }
return r;
}