NTT DOCOMO, INC - Fix for bug 1291 "E32test t_tock.exe failed to load Logical Device"
--- a/baseport/syborg/bootstrap/syborg.inc Fri Aug 27 15:33:49 2010 +0100
+++ b/baseport/syborg/bootstrap/syborg.inc Fri Aug 27 16:03:29 2010 +0100
@@ -10,6 +10,7 @@
;* Nokia Corporation - initial contribution.
;*
;* Contributors:
+;* NTT DOCOMO, INC - Fix for bug 1291 "E32test t_tock.exe failed to load Logical Device"
;*
;* Description:
;*
@@ -53,7 +54,11 @@
KHwBaseAudio EQU KHwBaseRegisters + 0x0e000
KHwBaseWebcamera EQU KHwBaseRegisters + 0x0f000
KHwNVMemoryDevice EQU KHwBaseRegisters + 0x10000
-KHwBasePlatform EQU KHwBaseRegisters + 0x11000
+; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
+; KHwBasePlatform EQU KHwBaseRegisters + 0x12000
+KHwBaseTimer2 EQU KHwBaseRegisters + 0x12000
+KHwBasePlatform EQU KHwBaseRegisters + 0x13000
+; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
;-----------------------------------------------------------------------------
; Module linear bases
@@ -81,6 +86,10 @@
KHwLinBaseAudio EQU KHwLinBaseRegisters + 0x0e*KHwLinSeparation
KHwLinBaseWebcameraDevice EQU KHwLinBaseRegisters + 0x0f*KHwLinSeparation
KHwLinBaseNVMemory EQU KHwLinBaseRegisters + 0x10*KHwLinSeparation
-KHwLinBasePlatform EQU KHwLinBaseRegisters + 0x11*KHwLinSeparation
+; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
+; KHwLinBasePlatform EQU KHwLinBaseRegisters + 0x12*KHwLinSeparation
+KHwLinBaseTimer2 EQU KHwLinBaseRegisters + 0x12*KHwLinSeparation
+KHwLinBasePlatform EQU KHwLinBaseRegisters + 0x13*KHwLinSeparation
+; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
END
--- a/baseport/syborg/bootstrap/syborg.s Fri Aug 27 15:33:49 2010 +0100
+++ b/baseport/syborg/bootstrap/syborg.s Fri Aug 27 16:03:29 2010 +0100
@@ -10,6 +10,7 @@
;* Nokia Corporation - initial contribution.
;*
;* Contributors:
+;* NTT DOCOMO, INC - Fix for bug 1291 "E32test t_tock.exe failed to load Logical Device"
;*
;* Description:
;*
@@ -184,6 +185,9 @@
HW_MAPPING KHwBaseAudio, 1, HW_MULT_4K
HW_MAPPING KHwBaseWebcamera, 1, HW_MULT_4K
HW_MAPPING KHwNVMemoryDevice, 1, HW_MULT_4K
+; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
+ HW_MAPPING KHwBaseTimer2, 1, HW_MULT_4K
+; NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
HW_MAPPING KHwBasePlatform, 8, HW_MULT_4K
DCD 0 ; terminator
--- a/baseport/syborg/rom/header.iby Fri Aug 27 15:33:49 2010 +0100
+++ b/baseport/syborg/rom/header.iby Fri Aug 27 16:03:29 2010 +0100
@@ -10,6 +10,7 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
+* NTT DOCOMO, INC - Fix for bug 1291 "E32test t_tock.exe failed to load Logical Device"
*
* Description:
*
@@ -55,4 +56,7 @@
unicode
#endif
-#define VARIANT_PATH syborg
+// NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
+#define VARIANT_PATH_OUTSIDE_SF_OS
+#define VARIANT_PATH sf\adaptation\qemu\baseport\syborg
+// NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
--- a/baseport/syborg/specific/syborg.h Fri Aug 27 15:33:49 2010 +0100
+++ b/baseport/syborg/specific/syborg.h Fri Aug 27 16:03:29 2010 +0100
@@ -11,6 +11,7 @@
*
* Contributors:
* NTT Docomo, Inc : BUG 1296
+* NTT DOCOMO, INC - Fix for bug 1291 "E32test t_tock.exe failed to load Logical Device"
*
* Description:
*
@@ -54,7 +55,11 @@
const TUint KHwSVPAudioDevice = KHwBasePeripherals + 0x0e*KHwLinSeparation;
const TUint KHwSVPWebcameraDevice = KHwBasePeripherals + 0x0f*KHwLinSeparation;
const TUint KHwNVMemoryDevice = KHwBasePeripherals + 0x10*KHwLinSeparation;
-const TUint KHwSVPPlatformDevice = KHwBasePeripherals + 0x11*KHwLinSeparation;
+// NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
+//const TUint KHwSVPPlatformDevice = KHwBasePeripherals + 0x12*KHwLinSeparation;
+const TUint KHwBaseCounterTimer2 = KHwBasePeripherals + 0x12*KHwLinSeparation;
+const TUint KHwSVPPlatformDevice = KHwBasePeripherals + 0x13*KHwLinSeparation;
+// NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
enum TSyborgInterruptId
{
@@ -70,7 +75,10 @@
EIntSerial3 = 8,
EIntNet0 = 9,
EIntAudio0 = 10,
- EIntNVMemoryDevice = 12
+ EIntNVMemoryDevice = 12,
+// NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
+ EIntTimer2 = 14
+// NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end
};
// Timer Mode
--- a/baseport/syborg/syborg.dts Fri Aug 27 15:33:49 2010 +0100
+++ b/baseport/syborg/syborg.dts Fri Aug 27 16:03:29 2010 +0100
@@ -130,9 +130,16 @@
interrupts = <c>;
interrupt-parent = <&intc>;
};
+ timer@1 {
+ compatible = "syborg,timer";
+ reg = <c0012000>;
+ frequency = <d#0100000>;
+ interrupts = <e>;
+ interrupt-parent = <&intc>;
+ };
platform@0 {
compatible = "syborg,platform";
- reg = <c0011000>;
+ reg = <c0013000>;
};
};
};
--- a/baseport/syborg/test/bld.inf Fri Aug 27 15:33:49 2010 +0100
+++ b/baseport/syborg/test/bld.inf Fri Aug 27 16:03:29 2010 +0100
@@ -10,6 +10,7 @@
* Nokia Corporation - initial contribution.
*
* Contributors:
+* NTT DOCOMO, INC - Fix for bug 1291 "E32test t_tock.exe failed to load Logical Device"
*
* Description:
*
@@ -24,17 +25,30 @@
PRJ_TESTMMPFILES
// Drivers
+// NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - start
+
// requires baseport specific definitions for TIMER and TimeDelta in d_mstim.cpp
../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_mstim support
+
// requires baseport specific definitions for TIMER and TimeDelta and LongTimeDelta in d_tick.cpp
../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_tick support
+
// requires definitions for KTickPeriodMs and KTicksPerMillisecond. These are baseport specific and require changes to d_latncy
-../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_latncy support
+// Not yet implemented...
+// ../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_latncy support
+
../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_shadow support
-../../../../../os/kernelhwsrv/kerneltest/e32test/group/bm_pdd support
+
+// Not yet implemented...
+// ../../../../../os/kernelhwsrv/kerneltest/e32test/group/bm_pdd support
+
//../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_sharedio support
+
// needs dma.dll
//../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_dma support // DMA kernel-side test harness for real DMA framework
+
// needs epbusm.dll
//../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_medch support
+
../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_cache support
+// NTT Docomo - Defect 1291 fix - E32test t_tock.exe failed to load Logical Device - end