# HG changeset patch
# User hgs
# Date 1272467792 -3600
# Node ID 21b8e4e0ff99238c9b8d11362e835835930b0d5b
# Parent  e408fc570bb546c10c7ed2cc6518362c12f298b8
201017_03

diff -r e408fc570bb5 -r 21b8e4e0ff99 kernel/eka/drivers/usbcc/chapter9.cpp
--- a/kernel/eka/drivers/usbcc/chapter9.cpp	Tue Apr 27 15:10:09 2010 +0100
+++ b/kernel/eka/drivers/usbcc/chapter9.cpp	Wed Apr 28 16:16:32 2010 +0100
@@ -1136,8 +1136,19 @@
 	// New configuration is the same as the old one (but not 0)
 	if (iCurrentConfig == aValue)
 		{
-		// no-op
 		__KTRACE_OPT(KUSB, Kern::Printf("  Configuration: New == Old == %d --> exiting", aValue));
+
+		// From the spec 9.1.1.5, Data toggle is reset to zero here when 
+		// setconfiguration(x->x)(x!=0) received, although we only support
+		// single configuration currently.
+		TInt num = 0;
+		TInt ret = DoForEveryEndpointInUse(&DUsbClientController::ResetDataToggle, num);
+		if(ret != KErrNone)
+			{
+			__KTRACE_OPT(KPANIC, Kern::Printf("  Error: Endpoint data toggle reset failed"));
+			}
+		__KTRACE_OPT(KUSB, Kern::Printf("  Called ResetDataToggle()for %d endpoints", num));	
+	
 		return;
 		}
 	// Device is already configured
diff -r e408fc570bb5 -r 21b8e4e0ff99 kernel/eka/include/e32ver.h
--- a/kernel/eka/include/e32ver.h	Tue Apr 27 15:10:09 2010 +0100
+++ b/kernel/eka/include/e32ver.h	Wed Apr 28 16:16:32 2010 +0100
@@ -28,7 +28,7 @@
 
 const TInt KE32MajorVersionNumber=2;
 const TInt KE32MinorVersionNumber=0;
-const TInt KE32BuildVersionNumber=3072;
+const TInt KE32BuildVersionNumber=3073;
 
 const TInt KMachineConfigurationMajorVersionNumber=1;
 const TInt KMachineConfigurationMinorVersionNumber=0;
diff -r e408fc570bb5 -r 21b8e4e0ff99 kernel/eka/release.txt
--- a/kernel/eka/release.txt	Tue Apr 27 15:10:09 2010 +0100
+++ b/kernel/eka/release.txt	Wed Apr 28 16:16:32 2010 +0100
@@ -1,3 +1,11 @@
+Version 2.00.3073
+=================
+(Made by vfebvre 26/04/2010)
+
+1.	jimmzhou
+	1.	ou1cimx1#352019 [kernelmcl]Can't recieve USB data after Host call SetConfiguraion
+
+
 Version 2.00.3072
 =================
 (Made by vfebvre 22/04/2010)
diff -r e408fc570bb5 -r 21b8e4e0ff99 kerneltest/f32test/loader/security/t_ldrcheck.cpp
--- a/kerneltest/f32test/loader/security/t_ldrcheck.cpp	Tue Apr 27 15:10:09 2010 +0100
+++ b/kerneltest/f32test/loader/security/t_ldrcheck.cpp	Wed Apr 28 16:16:32 2010 +0100
@@ -588,7 +588,7 @@
     RFile corrFile;
     CleanupClosePushL(corrFile);	
 
-    TInt r=corrFile.Open(TheFs, aFileName, EFileWrite);
+    TInt r=corrFile.Open(TheFs, aFileName, EFileWrite|EFileWriteDirectIO);
 	if(r != KErrNone)
         return r;
 	
diff -r e408fc570bb5 -r 21b8e4e0ff99 userlibandfileserver/fileserver/group/release.txt
--- a/userlibandfileserver/fileserver/group/release.txt	Tue Apr 27 15:10:09 2010 +0100
+++ b/userlibandfileserver/fileserver/group/release.txt	Wed Apr 28 16:16:32 2010 +0100
@@ -1,3 +1,11 @@
+Version 2.00.3036
+=================
+(Made by vfebvre 27/04/2010)
+
+1.	erifung
+	1.	DEF144399 Frequent T_LDRCHECK failures on the H4
+
+
 Version 2.00.3035
 =================
 (Made by vfebvre 23/04/2010)
diff -r e408fc570bb5 -r 21b8e4e0ff99 userlibandfileserver/fileserver/inc/f32ver.h
--- a/userlibandfileserver/fileserver/inc/f32ver.h	Tue Apr 27 15:10:09 2010 +0100
+++ b/userlibandfileserver/fileserver/inc/f32ver.h	Wed Apr 28 16:16:32 2010 +0100
@@ -58,6 +58,6 @@
 
 @see TVersion
 */
-const TInt KF32BuildVersionNumber=3035;
+const TInt KF32BuildVersionNumber=3036;
 //
 #endif