--- a/bsptemplate/asspandvariant/template_variant/specific/variant.cpp	Thu Aug 19 11:14:22 2010 +0300
+++ b/bsptemplate/asspandvariant/template_variant/specific/variant.cpp	Tue Aug 31 16:34:26 2010 +0300
@@ -27,8 +27,12 @@
 const TUint KHtCustomRestartMask  = KHtCustomRestartMax << KHtCustomRestartShift; 
 
 const TUint KHtRestartStartupModesMax = 0xf; // Variable, platform dependant 
+
+#undef USE_MODE_SHIFT_MASK
+#ifdef USE_MODE_SHIFT_MASK
 const TUint KHtRestartStartupModesShift = 16; // Variable, platform dependant 
 const TUint KHtRestartStartupModesMask = KHtRestartStartupModesMax << KHtRestartStartupModesShift;
+#endif
 
 void TemplateVariantFault(TInt aLine)
 	{
@@ -430,8 +434,11 @@
 			// TO DO: (optional)
 			//
 			// Read the restart startup mode, e.g:
-			// TInt startup = (Kern::SuperPage().iHwStartupReason & KHtRestartStartupModesMask) >> KHtRestartStartupModesShift;
-			// kumemput32(a1, &startup, sizeof(TInt));
+#undef USE_MODE_SHIFT_MASK
+#ifdef USE_MODE_SHIFT_MASK
+			TInt startup = (Kern::SuperPage().iHwStartupReason & KHtRestartStartupModesMask) >> KHtRestartStartupModesShift;
+			kumemput32(a1, &startup, sizeof(TInt));
+#endif
 			break; 			
 			}