Merge GCC_SURGE with current default head.
--- a/baseport/syborg/bld.inf Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/bld.inf Tue Sep 07 12:23:10 2010 +0100
@@ -96,7 +96,10 @@
webcamera/webcamera_app
//Non volatile memory device
-mednvmemory\mednvmemory
+mednvmemory/mednvmemory
+
+// Ethernet
+ethernet/pdd/enet
PRJ_EXTENSIONS
start extension base/config
--- a/baseport/syborg/bootstrap/syborg.inc Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/bootstrap/syborg.inc Tue Sep 07 12:23:10 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 Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/bootstrap/syborg.s Tue Sep 07 12:23:10 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/hal/config.hcf Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/hal/config.hcf Tue Sep 07 12:23:10 2010 +0100
@@ -9,7 +9,16 @@
ECPU=0
ECPUArch=0
ECPUABI=0
-ECPUSpeed = GetCPUSpeed
+
+
+// NTT Docomo - Defect 1290 fix - E32test t_atomic.EXE failed with unhandled exception handling - start
+//
+// NTT DOCOMO, INC - Fix for bug 1290 "E32test t_atomic.EXE failed with unhandled exception handling"
+// Mark as not supported (comment-out), because it doesn't make sense on a non cycle-accurate simulator platform...
+// ECPUSpeed = GetCPUSpeed
+//
+// NTT Docomo - Defect 1290 fix - E32test t_atomic.EXE failed with unhandled exception handling - End
+
ESystemStartupReason = GetSystemStartupReason
ESystemException = GetSystemException
ESystemTickPeriod=0
--- a/baseport/syborg/hal/values.hda Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/hal/values.hda Tue Sep 07 12:23:10 2010 +0100
@@ -3,13 +3,23 @@
EManufacturerSoftwareRev=0x100
EManufacturerSoftwareBuild=0x250
EModel=0x42525453
-EMachineUid=OmapH4
+// NTT Docomo - Defect 1292 fix - E32test t_mstim.exe failed to load test LDD - start
+EMachineUid=0x10005152
+// NTT Docomo - Defect 1292 fix - E32test t_mstim.exe failed to load test LDD - end
EDeviceFamily=crystal
EDeviceFamilyRev=0x001
ECPU=arm
ECPUArch=0xC0
ECPUABI=arm5
-ECPUSpeed=0
+
+// NTT Docomo - Defect 1290 fix - E32test t_atomic.EXE failed with unhandled exception handling - start
+//
+// NTT DOCOMO, INC - Fix for bug 1290 "E32test t_atomic.EXE failed with unhandled exception handling"
+// Mark as not supported (comment-out), because it doesn't make sense on a non cycle-accurate simulator platform...
+// ECPUSpeed=0
+//
+// NTT Docomo - Defect 1290 fix - E32test t_atomic.EXE failed with unhandled exception handling - end
+
ESystemStartupReason=cold
ESystemException=0
ESystemTickPeriod=15625
--- a/baseport/syborg/rom/base_syborg.iby Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/rom/base_syborg.iby Tue Sep 07 12:23:10 2010 +0100
@@ -106,6 +106,10 @@
/* Generic nonvolatile memory */
extension[VARID]= KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_mednvmemory.pdd \sys\bin\mednvmemory.pdd
+/* Ethernet drivers */
+device[VARID]=KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_ethernet.pdd \sys\bin\ethernet.pdd
+device[VARID]=KERNEL_DIR\DEBUG_DIR\enet.ldd \sys\bin\enet.ldd
+
// Host Filesystem
extension[VARID]= KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_svphostfsdriver.ldd sys\bin\svphostfsdriver.ldd
file= KERNEL_DIR\DEBUG_DIR\svphostfsy.fsy sys\bin\svphostfsy.fsy
--- a/baseport/syborg/rom/header.iby Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/rom/header.iby Tue Sep 07 12:23:10 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/assp.cpp Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/specific/assp.cpp Tue Sep 07 12:23:10 2010 +0100
@@ -11,6 +11,7 @@
*
* Contributors:
* NTT Docomo, Inc : BUG 1296
+* NTT DOCOMO, INC - Fix for bug 1292 "E32test t_mstim.exe failed to load test LDD"
*
* Description: implementation of class Syborg
*
@@ -81,7 +82,10 @@
TVariantInfoV01& info = infoBuf();
TUint clock=0;
info.iRomVersion = Epoc::RomHeader().iVersion;
- info.iMachineUniqueId = (TInt64(HALData::EMachineUid_OmapH4)<<32);
+// NTT Docomo - Defect 1292 fix - E32test t_mstim.exe failed to load test LDD - start
+ const TInt KMachineUid_Syborg = 0x10005152;
+ info.iMachineUniqueId = (TInt64(KMachineUid_Syborg)<<32);
+// NTT Docomo - Defect 1292 fix - E32test t_mstim.exe failed to load test LDD - end
info.iLedCapabilities = (8<<16) + KLedMaskGreen1;
info.iProcessorClockInKHz = clock;
info.iSpeedFactor = clock/25;
--- a/baseport/syborg/specific/syborg.h Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/specific/syborg.h Tue Sep 07 12:23:10 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 Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/syborg.dts Tue Sep 07 12:23:10 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 Wed Aug 04 15:41:26 2010 +0100
+++ b/baseport/syborg/test/bld.inf Tue Sep 07 12:23:10 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
--- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/target-arm/translate.c Wed Aug 04 15:41:26 2010 +0100
+++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/target-arm/translate.c Tue Sep 07 12:23:10 2010 +0100
@@ -3289,7 +3289,10 @@
break;
case 0xc:
case 0xd:
- if (dp && (insn & 0x03e00000) == 0x00400000) {
+// SF Bug 1284 - QEMU has faulty instruction emulation for VMOV (between two ARM core registers and two single-precision registers) - start
+// if (dp && (insn & 0x03e00000) == 0x00400000) {
+ if ((insn & 0x03e00e00) == 0x00400a00) {
+// SF Bug 1284 - QEMU has faulty instruction emulation for VMOV (between two ARM core registers and two single-precision registers) - end
/* two-register transfer */
rn = (insn >> 16) & 0xf;
rd = (insn >> 12) & 0xf;