--- a/bluetooth/btstack/secman/pairingserver.h Thu Jul 15 19:55:36 2010 +0300
+++ b/bluetooth/btstack/secman/pairingserver.h Thu Aug 19 11:01:00 2010 +0300
@@ -218,8 +218,8 @@
void Complete(TInt aError);
- static void CleanupStartMessage(TAny* aPtr);
static TInt StaticShutdown(TAny* aPtr);
+ TBool ShuttingDown() const;
private: // from CPairingSubSession
void DispatchSubSessMessageL(const RMessage2& aMessage);
@@ -246,12 +246,15 @@
private:
enum TState
{
- EInvalid,
+ EMintCondition,
+ EInitiated,
EInitialConnectionPending,
EInitialConnection,
EZombie,
EFinalConnectionPending,
EFinalConnection,
+ EShutdownRequested,
+ EShutdownPending,
EShutdown,
};