--- a/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/data/10207ABC.rss Thu Oct 14 14:53:04 2010 +0300
+++ b/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/data/10207ABC.rss Mon Oct 25 16:38:55 2010 +0300
@@ -53,4 +53,5 @@
};
}
-// End of File
\ No newline at end of file
+// End of File
+
Binary file posmsgpluginreferenceimpl/doc/S60_3_2_OMA_SUPL_POS_Message_Plugin_Reference_Implementation_Design_C.doc has changed
--- a/systemswstubs/asyreference/group/ASYReferencePlugin.mmp Thu Oct 14 14:53:04 2010 +0300
+++ b/systemswstubs/asyreference/group/ASYReferencePlugin.mmp Mon Oct 25 16:38:55 2010 +0300
@@ -47,8 +47,6 @@
END
LIBRARY euser.lib
-LIBRARY ASYProxy.lib
-LIBRARY AccPolicy.lib
LIBRARY accclient.lib
LIBRARY acccontrol.lib
LIBRARY accpolicy.lib
Binary file systemswstubs/examplecommonisc/doc/S60_3_2_ISC_Data_Transmission_Plugin_Reference_API_Specification_C.doc has changed
Binary file systemswstubs/examplecommonisc/doc/S60_ISC_Multiplexer_Plug_In_Reference_API_Specification_C.doc has changed
--- a/systemswstubs/featuremanagerstub/data/10205058.rss Thu Oct 14 14:53:04 2010 +0300
+++ b/systemswstubs/featuremanagerstub/data/10205058.rss Mon Oct 25 16:38:55 2010 +0300
@@ -45,4 +45,6 @@
};
}
};
- }
\ No newline at end of file
+ }
+
+
--- a/systemswstubs/hwrmstubplugins/data/10205040.rss Thu Oct 14 14:53:04 2010 +0300
+++ b/systemswstubs/hwrmstubplugins/data/10205040.rss Mon Oct 25 16:38:55 2010 +0300
@@ -79,4 +79,6 @@
};
}
};
- }
\ No newline at end of file
+ }
+
+
Binary file systemswstubs/ssyreference/doc/S60_5_0_SSY_Reference_Design_C.doc has changed
--- a/systemswstubs/ssyreference/group/SsyReferenceConfig.xml Thu Oct 14 14:53:04 2010 +0300
+++ b/systemswstubs/ssyreference/group/SsyReferenceConfig.xml Mon Oct 25 16:38:55 2010 +0300
@@ -148,11 +148,20 @@
<!-- Channel item property, unit property for common (item index = -1), see KSensrvPropIdChannelUnit -->
</PropertyItem>
</Properties>
- <ChannelData StartIntervalMs="1000">
- <ChannelDataItem DataTypeId="0x1020507E" count="3" IntervalMs="5000">
- <SsyRefChannelDataAxis XAxis="1" YAxis="1" ZAxis="50" ></SsyRefChannelDataAxis>
+
+ <!-- DSG: ChannelData with StartIntervalMs=-1 indicates we're using the PSListener -->
+ <!-- DSG: The published values are drawn from the enum TEmulatorFlip -->
+ <ChannelData StartIntervalMs="-1">
+ <!-- DSG: This ChannelDataItem is activated when the published value is 0 (EEmulatorFlipRestore) i.e. DisplayUp -->
+ <ChannelDataItem DataTypeId="0x1020507E" count="4" IntervalMs="0">
+ <SsyRefChannelDataAxis XAxis="22" YAxis="49" ZAxis="55" ></SsyRefChannelDataAxis>
+ </ChannelDataItem>
+ <!-- DSG: This ChannelDataItem is activated when the published value is 2 (EEmulatorFlipLeft) i.e. 90CCW or RightUp -->
+ <ChannelDataItem DataTypeId="0x1020507E" count="4" IntervalMs="2">
+ <SsyRefChannelDataAxis XAxis="50" YAxis="32" ZAxis="44" ></SsyRefChannelDataAxis>
</ChannelDataItem>
</ChannelData>
+
</ChannelItem>
<ChannelItem
ChannelId="3"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemswstubs/ssyreference/inc/ssypslistener.h Mon Oct 25 16:38:55 2010 +0300
@@ -0,0 +1,131 @@
+/*
+* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Listener for PS key changes
+*
+*/
+
+
+#ifndef SSYPSLISTENER_H
+#define SSYPSLISTENER_H
+
+#include <e32base.h>
+#include <ecom/ecom.h>
+#include <e32property.h>
+
+/**
+* A callback interface for handling PS notifications
+*
+* @since S60 5.0
+*/
+class MSsyPsObserver
+ {
+ public:
+
+ /**
+ * Called when the subscribed value is set.
+ * All changes are not guarateed to be notified but latest value will
+ * always be notified.
+ *
+ * @since S60 5.0
+ * @param aCategory The category of ps value that was set
+ * @param aKey The key id of ps value that was set
+ * @param aValue The value that was set
+ */
+ virtual void PsValueSet( TUid aCategory,
+ TUint aKey,
+ TInt aValue ) = 0;
+ };
+
+/**
+* Listens for specified PS key value and notifies observer
+* when the key is set.
+*
+* @since S60 5.0
+*/
+class CSsyPsListener : public CActive
+ {
+ public:
+
+ /**
+ * Two-phased constructor.
+ *
+ * @since S60 5.0
+ * @param aObserver Callback object for informing about PS value sets
+ * @param aCategory The category of ps value that was set
+ * @param aKey The key id of ps value that was set
+ */
+ static CSsyPsListener* NewL( MSsyPsObserver& aObserver,
+ TUid aCategory,
+ TUint aKey );
+ /**
+ * Destructor.
+ */
+ virtual ~CSsyPsListener();
+
+ protected:
+
+ // From CActive
+ void RunL();
+ TInt RunError(TInt aError);
+ void DoCancel();
+
+ /**
+ * C++ constructor
+ *
+ * @since S60 5.0
+ */
+ CSsyPsListener(MSsyPsObserver& aObserver,
+ TUid aCategory,
+ TUint aKey);
+
+ /**
+ * 2nd phase of construction.
+ *
+ * @since S60 5.0
+ */
+ void ConstructL();
+
+ private: // Member variables
+
+ /**
+ * Observer for sets
+ * Not own.
+ */
+ MSsyPsObserver& iObserver;
+
+ /**
+ * Property used for listening
+ */
+ RProperty iProperty;
+
+ /**
+ * Category of the listened key
+ */
+ TUid iCategory;
+
+ /**
+ * The listened key identifier
+ */
+ TUint iKey;
+
+ /**
+ * The listened key value
+ */
+ TInt iValue;
+
+ };
+
+
+
+#endif // SSYPSLISTENER_H
--- a/systemswstubs/ssyreference/inc/ssyreferencecmdhandler.h Thu Oct 14 14:53:04 2010 +0300
+++ b/systemswstubs/ssyreference/inc/ssyreferencecmdhandler.h Mon Oct 25 16:38:55 2010 +0300
@@ -22,6 +22,11 @@
#include <e32base.h>
#include "ssyreferenceconfig.h"
+#define DSG
+#ifdef DSG
+#include "ssypslistener.h"
+#endif // DSG
+
// FORWARD DECLARATIONS
class CSsyReferenceChannel;
@@ -33,6 +38,9 @@
* @since S60 5.0
*/
class CSsyReferenceCmdHandler : public CActive
+#ifdef DSG
+ , public MSsyPsObserver
+#endif // DSG
{
public:
@@ -89,6 +97,7 @@
*/
TInt GenerateChannelDataItem();
+
private:
/**
@@ -141,6 +150,14 @@
*/
CPeriodic* iTimer;
+#ifdef DSG
+ CSsyPsListener* iPsListener;
+ void SendData();
+ TInt GenerateChannelStateItem();
+ static TInt StateItemCallback(TAny* aThis);
+ void PsValueSet(TUid aCategory, TUint aKey, TInt aValue);
+ static TInt FakeStateCallback(TAny* aThis);
+#endif // DSG
};
#endif // SSYREFERENCECMDHANDLER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemswstubs/ssyreference/src/ssypslistener.cpp Mon Oct 25 16:38:55 2010 +0300
@@ -0,0 +1,154 @@
+/*
+* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Listener for PS key changes
+*
+*/
+
+
+
+//#include "siftrace.h"
+#include "ssypslistener.h"
+
+_LIT( KPanicCategory, "SsyPsListener" );
+
+// -----------------------------------------------------------------------------
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CSsyPsListener* CSsyPsListener::NewL(MSsyPsObserver& aObserver,
+ TUid aCategory,
+ TUint aKey)
+ {
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::NewL(0x%x)" ), &aObserver ) );
+
+ CSsyPsListener* self = new (ELeave) CSsyPsListener(aObserver, aCategory, aKey);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::NewL - return 0x%x" ), self ) );
+
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// C++ constructor
+// ---------------------------------------------------------------------------
+//
+CSsyPsListener::CSsyPsListener(MSsyPsObserver& aObserver,
+ TUid aCategory,
+ TUint aKey)
+ : CActive(EPriorityStandard),
+ iObserver(aObserver),
+ iCategory(aCategory),
+ iKey(aKey)
+ {
+ // Nothing to do
+ }
+
+// ---------------------------------------------------------------------------
+// 2nd phase of construction.
+// ---------------------------------------------------------------------------
+//
+void CSsyPsListener::ConstructL()
+ {
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::ConstructL()" ) ) );
+
+ CActiveScheduler::Add(this);
+
+ // Start listening specified PS key
+ User::LeaveIfError(iProperty.Attach(iCategory, iKey));
+
+ iProperty.Subscribe(iStatus);
+ SetActive();
+
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::ConstructL - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CSsyPsListener::~CSsyPsListener()
+ {
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::~CSsyPsListener()" ) ) );
+
+ Cancel();
+
+ iProperty.Close();
+
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::~CSsyPsListener - return" ) ) );
+ }
+
+// -----------------------------------------------------------------------------
+// Handle notification from the other thread.
+// -----------------------------------------------------------------------------
+//
+void CSsyPsListener::RunL()
+ {
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::RunL()" ) ) );
+
+ TInt err(KErrNone);
+
+ // Restart listening
+ iProperty.Subscribe(iStatus);
+ SetActive();
+
+ // Get value
+ err = iProperty.Get(iValue);
+
+ if (err == KErrNone)
+ {
+ // Everything ok, notify owner about new plugins
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::RunL() - Notifying observer: iCategory: %d, iKey: %d, iValue: %d" ), iCategory, iKey, iValue ) );
+ iObserver.PsValueSet(iCategory, iKey, iValue);
+ }
+
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::RunL - return" ) ) );
+ }
+
+// -----------------------------------------------------------------------------
+// Handle error in RunL
+// -----------------------------------------------------------------------------
+//
+#ifdef COMPONENT_TRACE_DEBUG
+TInt CSsyPsListener::RunError(TInt aError)
+#else
+TInt CSsyPsListener::RunError(TInt /*aError*/)
+#endif
+ {
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::RunError(%d)" ), aError) );
+
+ // Panic this thread if there is unhandled error in RunL.
+ // This should not be possible.
+ User::Panic(KPanicCategory, 0);
+
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::RunError - return %d" ), KErrNone ) );
+
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// Handle cancel order on this active object.
+// -----------------------------------------------------------------------------
+//
+void CSsyPsListener::DoCancel()
+ {
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::DoCancel()" ) ) );
+
+ iProperty.Cancel();
+
+ COMPONENT_TRACE( ( _L( "SSYStub - CSsyPsListener::DoCancel - return" ) ) );
+ }
+
--- a/systemswstubs/ssyreference/src/ssyreferencecmdhandler.cpp Thu Oct 14 14:53:04 2010 +0300
+++ b/systemswstubs/ssyreference/src/ssyreferencecmdhandler.cpp Mon Oct 25 16:38:55 2010 +0300
@@ -22,6 +22,13 @@
#include "ssyreferencechannel.h"
#include "ssyreferencetrace.h"
+#ifdef DSG
+#include <u32exec.h>
+#include <e32uid.h>
+#define SystemCategory KUidSystemCategory
+#define EmulatorOrientationKey KSystemEmulatorOrientationKey
+#endif // DSG
+
// ======== CONSTANTS ========
const TInt KSsyRefShortDelay = 100;
@@ -84,6 +91,15 @@
iMessage = NULL;
}
+#ifdef DSG
+ if ( iPsListener )
+ {
+ iPsListener->Cancel();
+ delete iPsListener;
+ iPsListener = NULL;
+ }
+#endif // DSG
+
if ( iTimer )
{
iTimer->Cancel();
@@ -112,7 +128,16 @@
delete iTimer;
iTimer = NULL;
}
-
+
+#ifdef DSG
+ if ( iPsListener )
+ {
+ iPsListener->Cancel();
+ delete iPsListener;
+ iPsListener = NULL;
+ }
+#endif // DSG
+
iDataItemArray.Reset();
iDataItemPtr = 0;
err = KErrNone;
@@ -240,9 +265,31 @@
// Reset pointer
iDataItemPtr = 0;
+
// Start timer and continue processing in callback function
iTimer = CPeriodic::NewL( EPriorityNormal );
+#ifndef DSG
iTimer->Start( startInterval * 1000, 0, TCallBack( DataItemCallback, this ) );
+#else
+ User::JustInTime();
+ if (startInterval > 0)
+ {
+ iTimer->Start(startInterval * 1000, 0, TCallBack(DataItemCallback, this));
+ }
+ else
+ {
+ // Register to receive property updates ...
+ if (!iPsListener)
+ iPsListener = CSsyPsListener::NewL(*this, SystemCategory, EmulatorOrientationKey);
+ if (iPsListener)
+ {
+ // Respond to the inital value of the property, if it exists
+ static TInt initialValue;
+ if (RProperty::Get(SystemCategory, EmulatorOrientationKey, initialValue) == KErrNone)
+ PsValueSet(SystemCategory, EmulatorOrientationKey, initialValue);
+ }
+ }
+#endif // DSG
}
break;
}
@@ -359,4 +406,99 @@
return KErrNone;
}
+#ifdef DSG
+
+void CSsyReferenceCmdHandler::SendData()
+ {
+ if (iMessage)
+ {
+ TSsyRefChannelDataBase dataItem = iDataItemArray[iDataItemPtr];
+
+ // Set timestamp to data item
+ TTime time;
+ time.HomeTime();
+ dataItem.SetTimestamp(time);
+
+ // Add data item to message
+ iMessage->SetDataItem(&dataItem);
+
+ // Send response
+ iMessage->SetFunction(ESsyReferenceDataItemReceived);
+ iSsyChannel.ProcessResponse(iMessage);
+ }
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::GenerateChannelStateItem
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceCmdHandler::GenerateChannelStateItem()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::GenerateChannelStateItem()" ) ) );
+
+ SendData();
+
+ // If we wrap around, or the 'Interval' (i.e. state number) of the next entry
+ // differs from that of the current one, we've finished this sequence of callbacks
+ TInt newIndex = iDataItemPtr+1;
+ if (newIndex >= iDataItemArray.Count())
+ newIndex = 0;
+ TInt oldState = iDataItemArray[iDataItemPtr].Interval();
+ TInt newState = iDataItemArray[newIndex].Interval();
+ if (newState == oldState && newIndex != 0)
+ {
+ iDataItemPtr = newIndex;
+ }
+ else
+ {
+ iTimer->Cancel();
+
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::GenerateChannelStateItem() - return" ) ) );
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::StateItemCallback
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceCmdHandler::StateItemCallback( TAny* aThis )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::StateItemCallback()" ) ) );
+ return static_cast<CSsyReferenceCmdHandler*>( aThis )->GenerateChannelStateItem();
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::PsValueSet
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceCmdHandler::PsValueSet(TUid aCategory, TUint aKey, TInt aValue)
+ {
+ TUid c = aCategory;
+ TInt k = aKey;
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::PsValueSet(%x, %x, %d)" ), aCategory, aKey, aValue ) );
+
+ // Find where to start ...
+ for (TInt index = 0; index < iDataItemArray.Count(); ++index)
+ {
+ TSsyRefChannelDataBase& dataItem = iDataItemArray[index];
+ if (dataItem.Interval() == aValue)
+ {
+ // The 'Interval' (i.e. state number) matches the property value.
+ // Set the start index and start the timer callback running
+ iDataItemPtr = index;
+ iTimer->Cancel();
+ iTimer->Start(10, 10000, TCallBack(StateItemCallback, this));
+ break;
+ }
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::PsValueSet() - return" ) ) );
+ }
+
+#include "ssypslistener.cpp"
+
+#endif // DSG
+
// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wlanhwinit_stub/bwins/wlanhwinitU.DEF Mon Oct 25 16:38:55 2010 +0300
@@ -0,0 +1,9 @@
+EXPORTS
+ ??1CWlanHwInit@@UAE@XZ @ 1 NONAME ; CWlanHwInit::~CWlanHwInit(void)
+ ?GetHwInitData@CWlanHwInit@@UAEXPAPBEAAI01@Z @ 2 NONAME ; void CWlanHwInit::GetHwInitData(unsigned char const * *, unsigned int &, unsigned char const * *, unsigned int &)
+ ?GetHwTestData@CWlanHwInit@@UAEHIAAVTDes8@@@Z @ 3 NONAME ; int CWlanHwInit::GetHwTestData(unsigned int, class TDes8 &)
+ ?GetHwTestInitData@CWlanHwInit@@UAEXPAPBEAAI01@Z @ 4 NONAME ; void CWlanHwInit::GetHwTestInitData(unsigned char const * *, unsigned int &, unsigned char const * *, unsigned int &)
+ ?GetMacAddress@CWlanHwInit@@UAEHAAUTMacAddr@@@Z @ 5 NONAME ; int CWlanHwInit::GetMacAddress(struct TMacAddr &)
+ ?NewL@CWlanHwInit@@SAPAV1@XZ @ 6 NONAME ; class CWlanHwInit * CWlanHwInit::NewL(void)
+ ?SetHwTestData@CWlanHwInit@@UAEHIAAVTDesC8@@@Z @ 7 NONAME ; int CWlanHwInit::SetHwTestData(unsigned int, class TDesC8 &)
+
--- a/wlanhwinit_stub/bwinscw/wlanhwinitU.DEF Thu Oct 14 14:53:04 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
- ??1CWlanHwInit@@UAE@XZ @ 1 NONAME ; CWlanHwInit::~CWlanHwInit(void)
- ?GetHwInitData@CWlanHwInit@@UAEXPAPBEAAI01@Z @ 2 NONAME ; void CWlanHwInit::GetHwInitData(unsigned char const * *, unsigned int &, unsigned char const * *, unsigned int &)
- ?GetHwTestData@CWlanHwInit@@UAEHIAAVTDes8@@@Z @ 3 NONAME ; int CWlanHwInit::GetHwTestData(unsigned int, class TDes8 &)
- ?GetHwTestInitData@CWlanHwInit@@UAEXPAPBEAAI01@Z @ 4 NONAME ; void CWlanHwInit::GetHwTestInitData(unsigned char const * *, unsigned int &, unsigned char const * *, unsigned int &)
- ?GetMacAddress@CWlanHwInit@@UAEHAAUTMacAddr@@@Z @ 5 NONAME ; int CWlanHwInit::GetMacAddress(struct TMacAddr &)
- ?NewL@CWlanHwInit@@SAPAV1@XZ @ 6 NONAME ; class CWlanHwInit * CWlanHwInit::NewL(void)
- ?SetHwTestData@CWlanHwInit@@UAEHIAAVTDesC8@@@Z @ 7 NONAME ; int CWlanHwInit::SetHwTestData(unsigned int, class TDesC8 &)
-
--- a/wlanhwinit_stub/group/wlanhwinit.mmp Thu Oct 14 14:53:04 2010 +0300
+++ b/wlanhwinit_stub/group/wlanhwinit.mmp Mon Oct 25 16:38:55 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 7 %
+* %version: 8 %
*/
#include <platform_paths.hrh>
@@ -28,16 +28,6 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
-#if defined( ARMCC )
-DEFFILE ../eabi/
-#elif defined( WINSCW )
-DEFFILE ../bwinscw/
-#elif defined( WINS )
-DEFFILE ../bwins/
-#else
-DEFFILE ../bmarm/
-#endif
-
SOURCEPATH ../src
SOURCE wlanhwinit.cpp