FCL/sf/os/kernelhwsrv: comparison kerneltest/e32test/device/t

equal deleted inserted replaced

-:d45b74d3fb20
+:ea2cef07f9fe
 #include <d32usbcsc.h>
 #include <hal.h>
 #include "t_usblib.h"
 #include <e32svr.h>
 #include "u32std.h"
+#include "d32otgdi.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "t_usbcscTraces.h"
 #endif
 #define DEBUGPRINT(a) {a;}
 #else
 #define DEBUGPRINT(a) {}
 #endif
+void OpenStackIfOtg();
+void CloseStackIfOtg();
 LOCAL_D RTest test(_L("T_USBCSC"));
+_LIT(KOtgdiLddFilename, "otgdi");
+static TBool gSupportsOtg;
+static RUsbOtgDriver gOtgPort;
 _LIT(KLddName, "eusbcsc");
 _LIT(KUsbDeviceName, "Usbcsc");
 static char sym[9]="`*+@$#%!";
 	{
 	TInt r;
 	test.Next(_L("Buffer Construction"));
 	r = gPort.RealizeInterface(gChunk);
 	test_KErrNone(r);
+	OpenStackIfOtg();
 	TUsbcScChunkHeader chunkHeader(gChunk);
 	DEBUGPRINT(test.Printf(_L("iBuffers at 0x%x, iAltSettings at 0x%x\n"),chunkHeader.iBuffers, chunkHeader.iAltSettings));
 	DEBUGPRINT(OstTraceExt2(TRACE_NORMAL, TESTBUFFERCONSTRUCTION_TESTBUFFERCONSTRUCTION, "iBuffers at 0x%x, iAltSettings at 0x%x\n",chunkHeader.iBuffers, chunkHeader.iAltSettings));
 		}
 	TInt r = gPort.RealizeInterface(gChunk);
 	test_KErrNone(r);
+	OpenStackIfOtg();
 	if (gRealHardware)
 		{
 		TUsbcScChunkHeader chunkHeader(gChunk);
 		test.Printf(_L("\n \n Trying hardware\nPlease start the Host side application...\n"));
 		CActiveScheduler::Install(NULL); // Uninstalling the scheduler
 		delete myScheduler;
 		}
 	delete altSetConfig;
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	}
 //To do Move Around Later
 	r = SettingOne(0);
 	test_KErrNone(r);
 	r = gPort.RealizeInterface(gChunk);
 	test_KErrNone(r);
+	OpenStackIfOtg();
 	const TInt timeOut = 5000; //5 millisec
 	TUsbcScChunkHeader chunkHeader(gChunk);
 	TUint base = (TUint) gChunk.Base();
 	TUsbcScHdrEndpointRecord* epInfo;
 		test_KErrNone(WaitUntilTimeout(timeOut, status));
 		test_Equal(status.Int(), KErrCancel);
 	}//grealhardware
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	test.End();
 }
 	TInt r = SettingTwo(altSetNo);
 	test_KErrNone(r);
 	r = gPort.RealizeInterface(gChunk);
 	test_KErrNone(r);
+	OpenStackIfOtg();
 	TInt out_buf = 0;
 	TInt in_buf = 0;
 	TInt in_ep = 0;
 	//Length greater than buffer size
 	gPort.WriteData(in_buf,  bufferOffset, (length + sizeof (TUint) * 3), 0,status);
 	User::WaitForRequest(status);
 	test_Compare(status.Int(), ==, KErrArgument);
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	test.End();
 	}
 	// Should not be allowed to release Interface once Chunk Realized
 	test.Printf(_L("Release Interface %d \n"), altSetNo);
 	OstTrace1(TRACE_NORMAL, TESTSETINTERFACE_TESTSETINTERFACE_DUP02, "Release Interface %d \n", altSetNo);
 	r = gPort.ReleaseInterface(altSetNo);
 	test_Compare(r, ==, KErrUsbAlreadyRealized);
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	//1 - Test if chunk constructed correctly with two Alternate Settings
 	//2 - If Realize Interface is called twice driver doesn not unload properly.
 	RChunk tmpChunk;
 	r = gPort.RealizeInterface(tmpChunk);			//TO do Uncomment to test Realize interface call twice
 	test_Equal(KErrUsbAlreadyRealized, r);
+	CloseStackIfOtg();
 	CloseChannel();
 	TestMultipleChannels();
 	UnloadDriver();
 	test.Next(_L("Check if chunk is populated correctly with 2 settings, first setting with two endpoints and second with five endpoints \n"));
 	TEndpointDescription temp1 = {5,4,1};
 	altSetConfig->iEpsDesc[1] = temp1; //{5,4,1};
 	TestBufferConstruction(altSetConfig);
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	test.Next(_L("Test SetInterface with Dodgy alternate setting - Check if destructors Cleaning up properly \n"));
 	test.Printf(_L("Check chunk still populated with one interface\n"));
 	OstTrace0(TRACE_NORMAL, TESTSETINTERFACE_TESTSETINTERFACE_DUP03, "Check chunk still populated with one interface\n");
 	TestBufferConstruction(altSetConfig);
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	test.Next(_L("Test SetInterface with invalid alternate setting \n"));
 	test.Printf(_L("Check chunk still populated with one interface \n"));
 	OstTrace0(TRACE_NORMAL, TESTSETINTERFACE_TESTSETINTERFACE_DUP04, "Check chunk still populated with one interface \n");
 	TestBufferConstruction(altSetConfig);
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	test.Next(_L("Test SetInterface with Number of endpoints much greater than maximum per client \n"));
 	LoadDriver();
 	test.Printf(_L("Check chunk not populated with any valid data as all interfaces would be destroyed \n"));
 	OstTrace0(TRACE_NORMAL, TESTSETINTERFACE_TESTSETINTERFACE_DUP05, "Check chunk not populated with any valid data as all interfaces would be destroyed \n");
 	TestBufferConstruction(altSetConfig);
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	test.Next(_L("Test Release Interface, No interface set but call Release interface and test Chunk construction \n"));
 	LoadDriver();
 	r = gPort.ReleaseInterface(1);
 	test_KErrNone(r);
 	TestBufferConstruction(altSetConfig);
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	UserSvr::HalFunction(EHalGroupKernel, EKernelHalSupervisorBarrier, (TAny*)5000, 0);
 	__KHEAP_MARKEND;
 	test.Next(_L("Test Release Interface, Release all interfaces one by one \n"));
 	gPort.ReleaseInterface(0);
 	test_KErrNone(r);
 	TestBufferConstruction(altSetConfig);
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	UserSvr::HalFunction(EHalGroupKernel, EKernelHalSupervisorBarrier, (TAny*)5000, 0);
 	__KHEAP_MARKEND;
 	delete altSetConfig;
 void OpenChannel()
 	{
 	test.Next(_L("Open Channel"));
 	TInt r = gPort.Open(0);
 	test_KErrNone(r);
+	}
+void OpenStackIfOtg()
+	{
+	// On an OTG device we have to start the OTG driver, otherwise the Client
+	// stack will remain disabled forever.
+	if (gSupportsOtg)
+		{
+		test.Start(_L("Running on OTG device: loading OTG driver\n"));
+		test.Next(_L("Load OTG LDD"));
+		TInt r = User::LoadLogicalDevice(KOtgdiLddFilename);
+		test((r == KErrNone) || (r == KErrAlreadyExists));
+		test.Next(_L("Open OTG channel"));
+		r = gOtgPort.Open();
+		test(r == KErrNone);
+		test.Next(_L("Start OTG stack"));
+		r = gOtgPort.StartStacks();
+		test(r == KErrNone);
+		test.End();
+		}
 	}
 void TestMultipleChannels()
 	{
 	RDevUsbcScClient lPort1;
 	test.Next(_L("Close USB Channel 3"));
 	lPort3.Close();
 	}
+void CloseStackIfOtg()
+	{
+	if (gSupportsOtg)
+		{
+		test.Start(_L("Close OTG stack\n"));
+		test.Next(_L("Stop OTG stack"));
+		gOtgPort.StopStacks();
+		test.Next(_L("Close OTG Channel"));
+		gOtgPort.Close();
+		test.Next(_L("Free OTG LDD"));
+		TInt r = User::FreeLogicalDevice(RUsbOtgDriver::Name());
+		test(r == KErrNone);
+		test.End();
+		}
+	}
 void CloseChannel()
 	{
 	test.Next(_L("Close Chunk Handle"));
 	gChunk.Close();
 	test.Next(_L("Close USB Channel"));
 	gPort.Close();
 	SetupBulkInterfaces(0,1,1);
 	RChunk *tChunk = &gChunk;
 	test.Printf(_L("Finalize Interface\n"));
 	OstTrace0(TRACE_NORMAL, TESTBILREADWRITE_TESTBILREADWRITE_DUP02, "Finalize Interface\n");
 	gPort.FinalizeInterface(tChunk);
+	OpenStackIfOtg();
 	if(gRealHardware)
 		{
 		test.Printf(_L("Please Start the USBIO demo application on the host side \n"));
 		OstTrace0(TRACE_NORMAL, TESTBILREADWRITE_TESTBILREADWRITE_DUP03, "Please Start the USBIO demo application on the host side \n");
 			{
 			test.Printf(_L("!!warning- compare buffers found discrepancies!\n"));
 			OstTrace0(TRACE_NORMAL, TESTBILREADWRITE_TESTBILREADWRITE_DUP09, "!!warning- compare buffers found discrepancies!\n");
 			}
 		}
+	CloseStackIfOtg();
 	gChunk.Close();
 	test.Printf(_L("Close global USB channel\n"));
 	OstTrace0(TRACE_NORMAL, TESTBILREADWRITE_TESTBILREADWRITE_DUP10, "Close global USB channel\n");
 	gPort.Close();
 	}
 	SetupBulkInterfaces(1,1,1);
 	RChunk *tChunk = &gChunk;
 	test.Printf(_L("Finalize Interface\n"));
 	OstTrace0(TRACE_NORMAL, TESTBILALTERNATESETTINGCHANGE_TESTBILALTERNATESETTINGCHANGE_DUP03, "Finalize Interface\n");
 	gPort.FinalizeInterface(tChunk);
+	OpenStackIfOtg();
 	if(gRealHardware)
 		{
 		gPort.ReEnumerate(status);
 		User::WaitForRequest(status);
 		test.Printf(_L("Enumerated. status = %d\n"), status.Int());
 		OstTrace1(TRACE_NORMAL, TESTBILALTERNATESETTINGCHANGE_TESTBILALTERNATESETTINGCHANGE_DUP04, "Enumerated. status = %d\n", status.Int());
 		}
+	CloseStackIfOtg();
 	gChunk.Close();
 	test.Printf(_L("Close global USB channel\n"));
 	OstTrace0(TRACE_NORMAL, TESTBILALTERNATESETTINGCHANGE_TESTBILALTERNATESETTINGCHANGE_DUP05, "Close global USB channel\n");
 	gPort.Close();
 	}
 	test_KErrNone(gPort.Open(0));
 	//Test for a simple interface with 2 endpoints
 	SetupBulkInterfaces(0,1,1);
 	RChunk *tChunk = &gChunk;
 	test_KErrNone(gPort.FinalizeInterface(tChunk));
+	OpenStackIfOtg();
 	if(gRealHardware)
 		{
 		test.Printf(_L("With USBIO, open and configure the device, then send then and then recieve at lest 4 class/vendor requests to interface 0\n"));
 		OstTrace0(TRACE_NORMAL, TESTBILEP0_TESTBILEP0, "With USBIO, open and configure the device, then send then and then recieve at lest 4 class/vendor requests to interface 0\n");
 		//Note- A disturbing fact! If host aborts data transmission and send a new setup packet, the userside is clueless as to what it's reading is
 		//		data/setup data.
 			test.Getch();
 		} // end if-real-hardware
+	CloseStackIfOtg();
 	gChunk.Close();
 	test.Printf(_L("Close global USB channel\n"));
 	OstTrace0(TRACE_NORMAL, TESTBILEP0_TESTBILEP0_DUP16, "Close global USB channel\n");
 	gPort.Close();
 	} // end funcion
 	// Check for OTG support as if OTG is supported, client stack is disabled
 	TBuf8<KUsbDescSize_Otg> otg_desc;
 	r = gPort.GetOtgDescriptor(otg_desc);
 	test(r == KErrNotSupported || r == KErrNone);
-	TInt supportsOtg = (r != KErrNotSupported) ? ETrue : EFalse;
+	gSupportsOtg = (r != KErrNotSupported) ? ETrue : EFalse;
+	OpenStackIfOtg();
 	// We turn on UDC here explicitly. This is done only once and just to test the API as such
 	test.Next(_L("Powering up UDC"));
 	r = gPort.PowerUpUdc();
-	if (!supportsOtg)
+	if (!gSupportsOtg)
 		{
 		test_KErrNone(r);
 		}
 	else
 		{
 		test((r == KErrNone) || (r == KErrNotReady));
 		}
+	CloseStackIfOtg();
 	CloseChannel();
 	UnloadDriver();
 	if (gSpecTest == EAll)
 		{
 		for (TInt i = 1; i <= 7; i++)
 			{
 			gSpecTest = (TSpecTestType) i;

changeset 270	ea2cef07f9fe
parent 253	d37db4dcc88d
child 271	dc268b18d709