diff -r 7e15987c4500 -r 8c311f9acc5e usbengines/usbotgwatcher/inc/cusbnotenotifier.h
--- a/usbengines/usbotgwatcher/inc/cusbnotenotifier.h	Tue Feb 02 00:52:37 2010 +0200
+++ b/usbengines/usbotgwatcher/inc/cusbnotenotifier.h	Fri Mar 19 09:48:52 2010 +0200
@@ -1,20 +1,19 @@
 /*
-* Copyright (c) 2008 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:  Base classes for Usb notifier wrapper  
+ * Copyright (c) 2008 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:  Base classes for Usb notifier wrapper  
+ *
+ */
 
 #ifndef C_CUSBNOTENOTIFIER_H
 #define C_CUSBNOTENOTIFIER_H
@@ -38,62 +37,67 @@
      */
     class CNotifierActive : public CActive
         {
-        public:
-            /**
-             * Default constructor
-             * @param aNotifier RNotifier API
-             * @param aUsbNoteNotifier the note notifier container
-             */
-            CNotifierActive(RNotifier& aNotifier, CUsbNoteNotifier* aUsbNoteNotifier);
-            
-            /**
-             * Destructor
-             */
-            virtual ~CNotifierActive();
-        
-            /**
-             * Start to show the notifier
-             */
-            void StartL();
-            
-        protected:
-            // From base class CActive
-            /**
-             * Caled when outstanding request completed
-             */
-            void RunL();
+    public:
+        /**
+         * Default constructor
+         * @param aNotifier RNotifier API
+         * @param aUsbNoteNotifier the note notifier container
+         */
+        CNotifierActive(RNotifier& aNotifier, CUsbNoteNotifier& aUsbNoteNotifier);
+
+        /**
+         * Destructor
+         */
+        virtual ~CNotifierActive();
+
+        /**
+         * Start to show the notifier
+         */
+        void StartL();
+
+    protected:
+        // From base class CActive
+        /**
+         * Caled when outstanding request completed
+         */
+        void RunL();
 
-            /**
-             * Called when outstanding request cancelled
-             */
-            void DoCancel();
+        /**
+         * Called when outstanding request cancelled
+         */
+        void DoCancel();
 
-            /**
-             * Called when RunL leaves   
-             * @param aError errorcode
-             * @return errorcode 
-             */
-            TInt RunError(TInt aError);
+        /**
+         * Called when RunL leaves   
+         * @param aError errorcode
+         * @return errorcode 
+         */
+        TInt RunError(TInt aError);
 
-        private:
-            // data
+    private:
+        // data
 
-            /**
-             * The note notifier container 
-             * Not Own 
-             */
-            CUsbNoteNotifier* iUsbNoteNotifier;
-            
-            /**
-             * RNotifier API
-             * Not Own 
-             */
-            RNotifier& iNotifier;
+        /**
+         * The note notifier container 
+         * Not Own 
+         */
+        CUsbNoteNotifier& iUsbNoteNotifier;
+
+        /**
+         * RNotifier API
+         * Not Own 
+         */
+        RNotifier& iNotifier;
 
             /**
              * Response from notifier 
              */
             TPckg<TInt> iRes;
+            
+            /**
+             * Notifier id pckg buffer
+             */
+            TPckgBuf<TInt> iNotifIdPckg;
         };
 public:
 
@@ -122,14 +126,14 @@
      * @param acat Category
      * @param aNotidId id 
      */
-    CUsbNoteNotifier(RNotifier& aNotifier, CUsbNotifManager* aNotifManager,
+    CUsbNoteNotifier(RNotifier& aNotifier, CUsbNotifManager& aNotifManager,
             TUid aCat, TUint aNotifId);
 
     /**
      * 2nd phase constructor.
      */
     void ConstructL();
-    
+
 private:
     // data
 
@@ -138,7 +142,7 @@
      * Own 
      */
     CNotifierActive* iNotifierActive;
-    
+
     /**
      * RNotifier API
      * Not Own