--- a/telephonyserverplugins/attestltsy/atcommand/generic/src/globalphonemanager.cpp	Thu Jun 03 15:32:35 2010 +0100
+++ b/telephonyserverplugins/attestltsy/atcommand/generic/src/globalphonemanager.cpp	Fri Jul 16 17:42:23 2010 +0100
@@ -29,7 +29,7 @@
 _LIT(KPDDName,"ECDRV");
 _LIT(KLDDName,"ECOMM");
 #else
-_LIT(KPDDName,"EUART1");
+_LIT(KPDDName,"EUART");
 #if defined (PDD2_NAME)
 _LIT(KPDD2Name,"EUART2");
 #endif
@@ -125,26 +125,38 @@
 	iPhoneStatus.iGprsMaxNumContexts = 1;
 	iPhoneStatus.iMode=RPhone::EModeOnlineCommand;
 	
+	LOGTEXT(_L8("[LTSY] Creating CLTsyCallInformationManager"));
+	
 	//Create the call information manager
 	iCallInfoManager = CLtsyCallInformationManager::NewL();
 	
+	LOGTEXT(_L8("[LTSY] Loading PDD"));
+	
 	// load physical device driver
 	TInt r = User::LoadPhysicalDevice(KPDDName);
 	if (r != KErrNone && r != KErrAlreadyExists)
 		{
+		LOGTEXT(_L8("[LTSY] Loading PDD Failed"));
 		User::Leave(r);
 		}
 	
+	LOGTEXT(_L8("[LTSY] Loading LDD"));
+	
 	// load logical device driver
 	r = User::LoadLogicalDevice(KLDDName);
 	if (r != KErrNone && r != KErrAlreadyExists)
 		{
+		LOGTEXT(_L8("[LTSY] Loading LDD Failed"));
 		User::Leave(r);
 		}
-		
+	
+	LOGTEXT(_L8("[LTSY] Creating CAtManager"));
+	
 	// create the AT Manager
 	iAtManager = CAtManager::NewL();
 	
+	LOGTEXT(_L8("[LTSY] Creating CCommEngine"));
+	
 	// create the Comm Engine which handle 
 	iCommEngine = CCommEngine::NewL(KLtsyChatBufferSize,KLtsyCommReadPriority,KLtsyCommWritePriority,iPhoneStatus.iPortAccess);
 	
@@ -152,6 +164,7 @@
 	iCommEngine->SetCommEngineObserver(iAtManager);
 	iCommEngine->SetCommReadLineNotify(iAtManager);
 	
+	LOGTEXT(_L8("[LTSY] Creating CTsyConfig"));
 	// create a CommDB configration helper class
 	iConfiguration = CTsyConfig::NewL();
 	

--- a/telephonyserverplugins/attestltsy/config/modifycenrep.pl	Thu Jun 03 15:32:35 2010 +0100
+++ b/telephonyserverplugins/attestltsy/config/modifycenrep.pl	Fri Jul 16 17:42:23 2010 +0100
@@ -17,11 +17,14 @@
 #
 
 use strict;
+use File::Copy;
 
 # Open the cenrep files
 my $cenrep = "/epoc32/release/winscw/UDEB/z/private/10202be9/10282E7F.txt";
 my $newcenrep = "/epoc32/release/winscw/UDEB/z/private/10202be9/10282E7F.tmp";
 my $cenrepbak = "/epoc32/release/winscw/UDEB/z/private/10202be9/10282E7F.bak";
+my $cenreprom = "/epoc32/data/z/private/10202be9/10282E7F.txt";
+my $cenreprombak = "/epoc32/data/z/private/10202be9/10282E7F.bak";
 my $file2string;
 
 # Open the file in UNICODE-16 and read the whole contents into a string
@@ -42,7 +45,9 @@
 
 
 # Now backup the old and copy the new files
-rename($cenrep, $cenrepbak) or die "Couldn't backup feature data file '$cenrep'\n" unless (-e $cenrepbak); # OK for this to fail as it probably just means there's already a backup
-rename($newcenrep, $cenrep) or die "Couldn't copy feature data file '$newcenrep'\n";
+rename($cenreprom, $cenreprombak) or die "Couldn't backup ROM cenrep file '$cenrep'\n" unless (-e $cenrepbak); # OK for this to fail as it probably just means there's already a backup
+copy($newcenrep, $cenreprom) or die "Couldn't copy the cenrep file for ROM usage '$cenreprom'\n";
+rename($cenrep, $cenrepbak) or die "Couldn't backup cenrep file '$cenrep'\n" unless (-e $cenrepbak); # OK for this to fail as it probably just means there's already a backup
+rename($newcenrep, $cenrep) or die "Couldn't copy cenrep file '$newcenrep'\n";
 
 print "\tCCE CenRep Setup\n";
\ No newline at end of file

--- a/telephonyserverplugins/attestltsy/config/modifyfeaturedb.pl	Thu Jun 03 15:32:35 2010 +0100
+++ b/telephonyserverplugins/attestltsy/config/modifyfeaturedb.pl	Fri Jul 16 17:42:23 2010 +0100
@@ -19,6 +19,7 @@
 
 use strict;
 use FMCreate;
+use File::Copy;
 
 #
 # Hardwire the datafile - this is only an example.
@@ -26,6 +27,7 @@
 my $datfile = "/epoc32/release/winscw/udeb/z/private/10205054/features.dat";
 my $datfile2 = "/epoc32/release/winscw/udeb/z/private/10205054/features2.dat";
 my $datfileback = "/epoc32/release/winscw/udeb/z/private/10205054/features.bak";
+my $datfilerom = "/epoc32/data/z/private/10205054/features.dat";
 
 #
 # Create an object that represents a feature data file.
@@ -48,10 +50,10 @@
 
 $tomtab[0] = 81; 	# KFeatureIdProtocolGsm
 $tomtab[1] = 82; 	# KFeatureIdProtocolWcdma
-$tomtab[1] = 1696;	# KFeatureIdOnScreenDialer
+$tomtab[2] = 1696;	# KFeatureIdOnScreenDialer
+$tomtab[3] = 1715;	# KFeatureIdTouchCallHandling
 
 foreach $ffuid (@tomtab)
-#for ($ffuid = 1696; $ffuid <= 1696; $ffuid++)
 {
 	$ff = $fmc->GetFeatureFlagByUID($ffuid);
 	if(ref($ff) ne "FeatureFlag")
@@ -84,6 +86,7 @@
 #
 $fmc->WriteToFile($datfile2) or die "Couldn't write feature data file '$datfile2'\n";
 
+copy($datfile2, $datfilerom) or die "Couldn't copy the data file for ROM usage: '$datfilerom'\n";
 rename($datfile, $datfileback) or die "Couldn't backup feature data file '$datfile'\n";
 rename($datfile2, $datfile) or die "Couldn't copy feature data file '$datfile2'\n";
 

--- a/telephonyserverplugins/common_tsy/group/ctsy.iby	Thu Jun 03 15:32:35 2010 +0100
+++ b/telephonyserverplugins/common_tsy/group/ctsy.iby	Fri Jul 16 17:42:23 2010 +0100
@@ -42,7 +42,7 @@
 
 //*** phonetsy ***
 #ifdef SYMBIAN_USING_CTSY_DISPATCHER  
-file=ABI_DIR\DEBUG_DIR\phonetsywithdispatcher.tsy	Sys\Bin\phonetsywithdispatcher.tsy
+file=ABI_DIR\DEBUG_DIR\phonetsywithdispatcher.tsy	Sys\Bin\phonetsy.tsy
 #else
 file=ABI_DIR\DEBUG_DIR\PHONETSY.TSY        Sys\Bin\PHONETSY.TSY
 #endif

--- a/telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.iby	Thu Jun 03 15:32:35 2010 +0100
+++ b/telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.iby	Fri Jul 16 17:42:23 2010 +0100
@@ -20,8 +20,8 @@
 file=ABI_DIR\DEBUG_DIR\ctsydispatcher.dll			SYSTEM_BINDIR\ctsydispatcher.dll
 
 // dispatcher tests
-#include <cstktsyutility.iby>
-#include <commonsimatktsy.iby>
-#include <te_ctsydispatcher_component.iby>
+//#include <cstktsyutility.iby>
+//#include <commonsimatktsy.iby>
+//#include <te_ctsydispatcher_component.iby>
 
 #endif // __CTSYDISPATCHER__