# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1270070920 -10800
# Node ID fcd52893bbd3b7b2f2035f93b8fd0a26302d3274
# Parent  96e5756969015ccd9ddad4fc932695611e889baf
Revision: 201007
Kit: 201013

diff -r 96e575696901 -r fcd52893bbd3 usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/NumberOfAcmFunctions.ini
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classcontroller/group/NumberOfAcmFunctions.ini	Mon Mar 15 12:46:46 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-//[ACM X] is referring to the Xth ACM *function*
-//which is accessed by the (X-1)th ACM *port*.
-
-
-[ACM_CONF]
-NumberOfAcmFunctions= 1
-
-[ACM 1]
-ProtocolNum= 1     //0x01 - code taken from USBCDC 1.1 Table 17- Hayes compatible modem
-//ControlInterfaceName= CDCUserControlInterface
-//DataInterfaceName= CDCUserDataInterface
-
-//[AMC 2]
-//ProtocolNum= 255  //0xFF - Vendor-specific
-//ControlInterfaceName= CDCSpecificControlInterface
-//DataInterfaceName= CDCSpecificDataInterface
-
diff -r 96e575696901 -r fcd52893bbd3 usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ecacm.ini
--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/group/ecacm.ini	Mon Mar 15 12:46:46 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-; Copyright (c) 2004-2009 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:
-; Ini file for ECACM plug-in ( EPOC Comms Abstract Control Model Comms System Module ).
-; 
-;
-
-
-[HostUSBDeviceDriver]
-CanHandleZLP= 0;
-
diff -r 96e575696901 -r fcd52893bbd3 usbmgmt/usbmgr/host/fdf/production/server/inc/eventqueue.h
--- a/usbmgmt/usbmgr/host/fdf/production/server/inc/eventqueue.h	Mon Mar 15 12:46:46 2010 +0200
+++ b/usbmgmt/usbmgr/host/fdf/production/server/inc/eventqueue.h	Thu Apr 01 00:28:40 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -104,9 +104,7 @@
 		KUsbBadHubPosition			= 3,
 		KUsbBadHub					= 4,
 		KUsbEventOverflow			= 5,
-		KUsbBadDeviceAttached       = 6,
-		KUsbBadDeviceDetached       = 7,
-		KNumberOfDevmonEventTypes	= 8,
+		KNumberOfDevmonEventTypes	= 6
 		};
 	TFixedArray<TUint, KNumberOfDevmonEventTypes> iDevmonEventCount;
 	};
diff -r 96e575696901 -r fcd52893bbd3 usbmgmt/usbmgr/host/fdf/production/server/src/eventqueue.cpp
--- a/usbmgmt/usbmgr/host/fdf/production/server/src/eventqueue.cpp	Mon Mar 15 12:46:46 2010 +0200
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/eventqueue.cpp	Thu Apr 01 00:28:40 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -291,12 +291,7 @@
 			case KUsbEventOverflow:
 				aEvent = KErrUsbEventOverflow;
 				break;
-			case KUsbBadDeviceAttached:
-			    aEvent = KErrUsbBadDeviceAttached;
-			    break;
-			case KUsbBadDeviceDetached:
-			    aEvent = KEventUsbBadDeviceDetached;
-			    break;
+			
 			case KNumberOfDevmonEventTypes:
 			default:
 				LOGTEXT2(_L8("\tUnexpected devmon error, not handled properly %d"), ii);
@@ -343,13 +338,7 @@
 			break;
 		case KErrUsbEventOverflow:
 			index = KUsbEventOverflow;
-			break;
-        case KErrUsbBadDeviceAttached:
-            index = KUsbBadDeviceAttached;
-            break;
-        case KEventUsbBadDeviceDetached:
-            index = KUsbBadDeviceDetached;
-            break;			
+			break;			
 
 		default:
 			LOGTEXT2(_L8("\tUnexpected devmon error, not handled properly %d"), aEvent);
diff -r 96e575696901 -r fcd52893bbd3 usbmgmt/usbmgrtest/t_acm_pub_sub/data/numberofacmfunctions.ini
--- a/usbmgmt/usbmgrtest/t_acm_pub_sub/data/numberofacmfunctions.ini	Mon Mar 15 12:46:46 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-; numberofacmfunctions.ini
-; 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:
-;
-;
-
-[ACM_CONF]
-NumberOfAcmFunctions= 3
-
-[ACM 1]
-ProtocolNum= 1     //0x01 - code taken from USBCDC 1.1 Table 17- Hayes compatible modem
-
-
-[ACM 2]
-ProtocolNum= 255  //0xFF - Vendor-specific
-
-
-[ACM 3]
-ProtocolNum= 127  //0x7F - Random code