# HG changeset patch
# User bugtracker-ml@nttdocomo.com
# Date 1270569622 -3600
# Node ID f24810eebc6bbc306804582f396237eb5e7345b9
# Parent  fc9fa34e0c9efb8eb069f9bb86e85b265f27ee3e# Parent  2c1e559d48bf3bf196542eceb497e95f1047ff11
Merge BUG 1296

diff -r fc9fa34e0c9e -r f24810eebc6b baseport/syborg/hal/values.hda
--- a/baseport/syborg/hal/values.hda	Tue Mar 30 19:50:19 2010 +0100
+++ b/baseport/syborg/hal/values.hda	Tue Apr 06 17:00:22 2010 +0100
@@ -34,7 +34,7 @@
 EClipboardDrive=2
 ESystemDrive=0xffff
 EDisplayNumberOfScreens=1
-ENanoTickPeriod=1000
+ENanoTickPeriod=10000
 EFastCounterFrequency=1000000
 EFastCounterCountsUp=1
 
diff -r fc9fa34e0c9e -r f24810eebc6b baseport/syborg/specific/assp.cpp
--- a/baseport/syborg/specific/assp.cpp	Tue Mar 30 19:50:19 2010 +0100
+++ b/baseport/syborg/specific/assp.cpp	Tue Apr 06 17:00:22 2010 +0100
@@ -10,6 +10,7 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
+* NTT Docomo, Inc : BUG 1296
 *
 * Description: implementation of class Syborg
 *
@@ -263,7 +264,7 @@
 
 EXPORT_C TInt Syborg::MsTickPeriod()
 {
-	return 1000;
+	return KMsTickPeriod;
 }
 
 EXPORT_C TInt Syborg::SystemTimeInSecondsFrom2000(TInt& aTime)
diff -r fc9fa34e0c9e -r f24810eebc6b baseport/syborg/specific/highrestimer.h
--- a/baseport/syborg/specific/highrestimer.h	Tue Mar 30 19:50:19 2010 +0100
+++ b/baseport/syborg/specific/highrestimer.h	Tue Apr 06 17:00:22 2010 +0100
@@ -10,6 +10,7 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
+* NTT Docomo, Inc : BUG 1296
 *
 * Description:
 *
@@ -50,7 +51,7 @@
 // Hi-jacking r10 for tmp, not good if Rd is R10 -- grepping the the kernel shows it's not (for now)
 #define GET_HIGH_RES_TICK_COUNT(Rd)						         \
   asm("push {r10}");										     \
-  asm("mov r10, #2");										     \
+  asm("mov r10, #1");										     \
   asm("ldr "#Rd", =%a0"               : : "i" (KHwBaseRtc + 4)); \
   asm("str r10, ["#Rd", #%a0]"        : : "i" (0));			     \
   asm("pop {r10}");                                              \
diff -r fc9fa34e0c9e -r f24810eebc6b baseport/syborg/specific/syborg.h
--- a/baseport/syborg/specific/syborg.h	Tue Mar 30 19:50:19 2010 +0100
+++ b/baseport/syborg/specific/syborg.h	Tue Apr 06 17:00:22 2010 +0100
@@ -10,6 +10,7 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
+* NTT Docomo, Inc : BUG 1296
 *
 * Description:
 *
@@ -31,6 +32,7 @@
 
 const TUint KHwBasePeripherals  = KPrimaryIOBase;       
 const TUint KHwLinSeparation	= 0x1000;
+const TInt KMsTickPeriod	= 10000;
 
 const TUint KHwBaseSic				= KHwBasePeripherals + 0x00*KHwLinSeparation;
 // intended for use as a free-running counter. Reading the value register of a free-running syborg counter returns a microsec value