1.1 --- a/CMakeLists.txt Fri Jun 15 03:10:57 2012 +0200 1.2 +++ b/CMakeLists.txt Tue Jun 10 14:32:02 2014 +0200 1.3 @@ -36,6 +36,7 @@ 1.4 set_property(TARGET elocal PROPERTY FOLDER "Symbian/FileServer") 1.5 set_property(TARGET erofs PROPERTY FOLDER "Symbian/FileServer") 1.6 set_property(TARGET emulator PROPERTY FOLDER "Symbian/Emulator") 1.7 +set_property(TARGET econsnogui PROPERTY FOLDER "Symbian/Emulator") 1.8 set_property(TARGET ecust PROPERTY FOLDER "Symbian/Emulator") 1.9 set_property(TARGET exstart PROPERTY FOLDER "Symbian/Boot") 1.10 set_property(TARGET e32strt PROPERTY FOLDER "Symbian/Boot")
2.1 --- a/os/boardsupport/emulator/emulatorbsp/CMakeLists.txt Fri Jun 15 03:10:57 2012 +0200 2.2 +++ b/os/boardsupport/emulator/emulatorbsp/CMakeLists.txt Tue Jun 10 14:32:02 2014 +0200 2.3 @@ -15,4 +15,7 @@ 2.4 2.5 include(estart.cmake) 2.6 2.7 +include(econsnogui.cmake) 2.8 2.9 + 2.10 +
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/os/boardsupport/emulator/emulatorbsp/econsnogui.cmake Tue Jun 10 14:32:02 2014 +0200 3.3 @@ -0,0 +1,69 @@ 3.4 +# Copyright (c) 2009-2012 St駱hane Lenclud. 3.5 +# All rights reserved. 3.6 +# This component and the accompanying materials are made available 3.7 +# under the terms of the License "Eclipse Public License v1.0" 3.8 +# which accompanies this distribution, and is available 3.9 +# at the URL "http://www.eclipse.org/legal/epl-v10.html". 3.10 +# 3.11 +# Initial Contributors: 3.12 +# St駱hane Lenclud. 3.13 +# 3.14 + 3.15 +#################### 3.16 +push_target(econsnogui) 3.17 +#################### 3.18 + 3.19 +#------------------------------------------------------------------- 3.20 +#Add this *.cmake file to our source tree 3.21 +#------------------------------------------------------------------- 3.22 +add_cmake_source() 3.23 +#Make sure all the output from all projects will go in one place 3.24 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 3.25 +#Visual Studio IDE folders 3.26 +source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 3.27 +source_group(Includes REGULAR_EXPRESSION ".+\\.h$") 3.28 +source_group(Def REGULAR_EXPRESSION ".+\\.def$") 3.29 +#------------------------------------------------------------------- 3.30 + 3.31 +#------------------------------------------------------------------- 3.32 +#Add project source files 3.33 +#------------------------------------------------------------------- 3.34 +set (sourcepath ./) 3.35 +add_source(econsnogui_uid.cpp) 3.36 + 3.37 +set (sourcepath ./specific/) 3.38 +add_source(econsnogui.cpp) 3.39 +#Def 3.40 +set (sourcepath ./bwins/) 3.41 +add_source(econsnoguiU.def) 3.42 +#------------------------------------------------------------------- 3.43 + 3.44 +#------------------------------------------------------------------- 3.45 +#Define our source and target 3.46 +#------------------------------------------------------------------- 3.47 +get_source(source) 3.48 +add_library (econsnogui SHARED ${source}) 3.49 +target_link_libraries(econsnogui edll euser) 3.50 +#Following is needed to be able to load our DLL dynamically 3.51 +set_target_properties(econsnogui PROPERTIES LINK_FLAGS "/INCLUDE:__E32Dll") 3.52 +#WIN32 libraries 3.53 +#target_link_libraries(econsnogui kernel32 user32 winmm) 3.54 +#------------------------------------------------------------------- 3.55 + 3.56 +#------------------------------------------------------------------- 3.57 +#Fix up include directories 3.58 +#------------------------------------------------------------------- 3.59 +system_include(/epoc32/include) 3.60 +system_include(/epoc32/include/platform) 3.61 +#------------------------------------------------------------------- 3.62 + 3.63 +#------------------------------------------------------------------- 3.64 +#Fix up compiler defines 3.65 +#------------------------------------------------------------------- 3.66 +#add_define(__DLL__) 3.67 +#------------------------------------------------------------------- 3.68 + 3.69 + 3.70 +#################### 3.71 +pop_target(econsnogui) 3.72 +#################### 3.73 \ No newline at end of file
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/os/boardsupport/emulator/emulatorbsp/econsnogui_uid.cpp Tue Jun 10 14:32:02 2014 +0200 4.3 @@ -0,0 +1,20 @@ 4.4 +/** 4.5 +Define PE file .SYMBIAN section. 4.6 +Notably provides UIDs. 4.7 +@file econsnogui_uid.cpp 4.8 +*/ 4.9 + 4.10 +#include <e32cmn.h> 4.11 +#include <e32cmn_private.h> 4.12 +#include <e32uid.h> 4.13 + 4.14 +//const TInt KDynamicLibraryUidValue=0x10000079; 4.15 +//const TInt KExecutableImageUidValue=0x1000007a; 4.16 + 4.17 +// VENDORID 0x70000001 4.18 + 4.19 +#pragma data_seg(push,".SYMBIAN") 4.20 +__EMULATOR_IMAGE_HEADER2(KDynamicLibraryUidValue,0x1000008d,0x100039e7,EPrioritySupervisor,0x00000000u,0x00000000u,0x00000000,0x70000001,0x00010000,0) 4.21 +#pragma data_seg(pop) 4.22 + 4.23 + 4.24 \ No newline at end of file
5.1 --- a/os/boardsupport/emulator/emulatorbsp/ecust.cmake Fri Jun 15 03:10:57 2012 +0200 5.2 +++ b/os/boardsupport/emulator/emulatorbsp/ecust.cmake Tue Jun 10 14:32:02 2014 +0200 5.3 @@ -14,7 +14,7 @@ 5.4 #Add current file to our source tree 5.5 add_cmake_source() 5.6 #Make sure all the output from all projects will go in one place 5.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 5.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 5.9 5.10 5.11 include_directories(./inc)
6.1 --- a/os/boardsupport/emulator/emulatorbsp/estart.cmake Fri Jun 15 03:10:57 2012 +0200 6.2 +++ b/os/boardsupport/emulator/emulatorbsp/estart.cmake Tue Jun 10 14:32:02 2014 +0200 6.3 @@ -18,7 +18,7 @@ 6.4 #------------------------------------------------------------------- 6.5 add_cmake_source() 6.6 #Make sure all the output from all projects will go in one place 6.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 6.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 6.9 #Visual Studio IDE folders 6.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 6.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/os/boardsupport/emulator/emulatorbsp/hal/config.cpp Tue Jun 10 14:32:02 2014 +0200 7.3 @@ -0,0 +1,423 @@ 7.4 +// ./os/boardsupport/emulator/emulatorbsp/hal/config.cpp 7.5 +// 7.6 +// Copyright (c) 1999-2014 Nokia Corporation and/or its subsidiary(-ies).// All rights reserved. 7.7 +// 7.8 +// GENERATED FILE - DO NOT EDIT 7.9 +// 7.10 + 7.11 +#include <kernel/hal_int.h> 7.12 + 7.13 +GLREF_C TInt ProcessCPUSpeed(TInt, TInt, TBool, TAny*); // ECPUSpeed 7.14 +GLREF_C TInt GetRAMSize(TInt, TInt, TBool, TAny*); // EMemoryRAM 7.15 +GLREF_C TInt GetFreeRAM(TInt, TInt, TBool, TAny*); // EMemoryRAMFree 7.16 +GLREF_C TInt GetROMSize(TInt, TInt, TBool, TAny*); // EMemoryROM 7.17 +GLREF_C TInt ProcessKeyboardClickState(TInt, TInt, TBool, TAny*); // EKeyboardClickState 7.18 +GLREF_C TInt ProcessKeyboardClickVolume(TInt, TInt, TBool, TAny*); // EKeyboardClickVolume 7.19 +GLREF_C TInt ProcessDisplayCurrentModeInfo(TInt, TInt, TBool, TAny*); // EDisplayXPixels 7.20 +GLREF_C TInt ProcessDisplayCurrentModeInfo(TInt, TInt, TBool, TAny*); // EDisplayYPixels 7.21 +GLREF_C TInt ProcessDisplayCurrentModeInfo(TInt, TInt, TBool, TAny*); // EDisplayXTwips 7.22 +GLREF_C TInt ProcessDisplayCurrentModeInfo(TInt, TInt, TBool, TAny*); // EDisplayYTwips 7.23 +GLREF_C TInt ProcessDisplayColors(TInt, TInt, TBool, TAny*); // EDisplayColors 7.24 +GLREF_C TInt ProcessDisplayState(TInt, TInt, TBool, TAny*); // EDisplayState 7.25 +GLREF_C TInt ProcessDisplayContrast(TInt, TInt, TBool, TAny*); // EDisplayContrast 7.26 +GLREF_C TInt ProcessDisplayMaxContrast(TInt, TInt, TBool, TAny*); // EDisplayContrastMax 7.27 +GLREF_C TInt ProcessMouseState(TInt, TInt, TBool, TAny*); // EMouseState 7.28 +GLREF_C TInt ProcessMouseSpeed(TInt, TInt, TBool, TAny*); // EMouseSpeed 7.29 +GLREF_C TInt ProcessMouseAcceleration(TInt, TInt, TBool, TAny*); // EMouseAcceleration 7.30 +GLREF_C TInt GetMouseButtonState(TInt, TInt, TBool, TAny*); // EMouseButtonState 7.31 +GLREF_C TInt ProcessLEDMask(TInt, TInt, TBool, TAny*); // ELEDmask 7.32 +GLREF_C TInt ProcessDisplaySpecifiedModeInfo(TInt, TInt, TBool, TAny*); // EDisplayIsMono 7.33 +GLREF_C TInt ProcessDisplaySpecifiedModeInfo(TInt, TInt, TBool, TAny*); // EDisplayIsPalettized 7.34 +GLREF_C TInt ProcessDisplaySpecifiedModeInfo(TInt, TInt, TBool, TAny*); // EDisplayBitsPerPixel 7.35 +GLREF_C TInt ProcessDisplayNumModes(TInt, TInt, TBool, TAny*); // EDisplayNumModes 7.36 +GLREF_C TInt ProcessDisplayCurrentModeInfo(TInt, TInt, TBool, TAny*); // EDisplayMemoryAddress 7.37 +GLREF_C TInt ProcessDisplaySpecifiedModeInfo(TInt, TInt, TBool, TAny*); // EDisplayOffsetToFirstPixel 7.38 +GLREF_C TInt ProcessDisplaySpecifiedModeInfo(TInt, TInt, TBool, TAny*); // EDisplayOffsetBetweenLines 7.39 +GLREF_C TInt ProcessDisplayCurrentModeInfo(TInt, TInt, TBool, TAny*); // EDisplayIsPixelOrderRGB 7.40 +GLREF_C TInt ProcessDisplayCurrentModeInfo(TInt, TInt, TBool, TAny*); // EDisplayIsPixelOrderLandscape 7.41 +GLREF_C TInt ProcessDisplayMode(TInt, TInt, TBool, TAny*); // EDisplayMode 7.42 +GLREF_C TInt ProcessCustomRestart(TInt, TInt, TBool, TAny*); // ECustomRestart 7.43 +GLREF_C TInt ProcessCustomRestartReason(TInt, TInt, TBool, TAny*); // ECustomRestartReason 7.44 +GLREF_C TInt GetDisplayNumberOfScreens(TInt, TInt, TBool, TAny*); // EDisplayNumberOfScreens 7.45 +GLREF_C TInt ProcessNanoTickPeriod(TInt, TInt, TBool, TAny*); // ENanoTickPeriod 7.46 +GLREF_C TInt ProcessFastCounterFrequency(TInt, TInt, TBool, TAny*); // EFastCounterFrequency 7.47 +GLREF_C TInt NonsecureClockOffset(TInt, TInt, TBool, TAny*); // ETimeNonSecureOffset 7.48 +GLREF_C TInt GetDisplayMemoryHandle(TInt, TInt, TBool, TAny*); // EDisplayMemoryHandle 7.49 +GLREF_C TInt GetNumCpus(TInt, TInt, TBool, TAny*); // ENumCpus 7.50 + 7.51 +const TUint8 HalInternal::Properties[]= 7.52 + { 7.53 + HAL::EValid, // EManufacturer 7.54 + HAL::EValid, // EManufacturerHardwareRev 7.55 + HAL::EValid, // EManufacturerSoftwareRev 7.56 + HAL::EValid, // EManufacturerSoftwareBuild 7.57 + HAL::EValid, // EModel 7.58 + HAL::EValid, // EMachineUid 7.59 + HAL::EValid, // EDeviceFamily 7.60 + HAL::EValid, // EDeviceFamilyRev 7.61 + HAL::EValid, // ECPU 7.62 + HAL::EValid, // ECPUArch 7.63 + HAL::EValid, // ECPUABI 7.64 + HAL::EValid|HAL::ESettable, // ECPUSpeed 7.65 + 0, // ESystemStartupReason 7.66 + 0, // ESystemException 7.67 + HAL::EValid, // ESystemTickPeriod 7.68 + HAL::EValid, // EMemoryRAM 7.69 + HAL::EValid, // EMemoryRAMFree 7.70 + HAL::EValid, // EMemoryROM 7.71 + HAL::EValid, // EMemoryPageSize 7.72 + HAL::EValid, // EPowerGood 7.73 + 0, // EPowerBatteryStatus 7.74 + HAL::EValid, // EPowerBackup 7.75 + 0, // EPowerBackupStatus 7.76 + HAL::EValid, // EPowerExternal 7.77 + HAL::EValid, // EKeyboard 7.78 + HAL::EValid, // EKeyboardDeviceKeys 7.79 + HAL::EValid, // EKeyboardAppKeys 7.80 + HAL::EValid, // EKeyboardClick 7.81 + HAL::EValid|HAL::ESettable, // EKeyboardClickState 7.82 + HAL::EValid|HAL::ESettable, // EKeyboardClickVolume 7.83 + HAL::EValid, // EKeyboardClickVolumeMax 7.84 + HAL::EValid, // EDisplayXPixels 7.85 + HAL::EValid, // EDisplayYPixels 7.86 + HAL::EValid, // EDisplayXTwips 7.87 + HAL::EValid, // EDisplayYTwips 7.88 + HAL::EValid, // EDisplayColors 7.89 + HAL::EValid|HAL::ESettable, // EDisplayState 7.90 + HAL::EValid|HAL::ESettable, // EDisplayContrast 7.91 + HAL::EValid, // EDisplayContrastMax 7.92 + HAL::EValid, // EBacklight 7.93 + 0, // EBacklightState 7.94 + HAL::EValid, // EPen 7.95 + 0, // EPenX 7.96 + 0, // EPenY 7.97 + 0, // EPenDisplayOn 7.98 + 0, // EPenClick 7.99 + 0, // EPenClickState 7.100 + 0, // EPenClickVolume 7.101 + 0, // EPenClickVolumeMax 7.102 + HAL::EValid, // EMouse 7.103 + 0, // EMouseX 7.104 + 0, // EMouseY 7.105 + HAL::EValid|HAL::ESettable, // EMouseState 7.106 + HAL::EValid|HAL::ESettable, // EMouseSpeed 7.107 + HAL::EValid|HAL::ESettable, // EMouseAcceleration 7.108 + HAL::EValid, // EMouseButtons 7.109 + HAL::EValid, // EMouseButtonState 7.110 + 0, // ECaseState 7.111 + HAL::EValid, // ECaseSwitch 7.112 + 0, // ECaseSwitchDisplayOn 7.113 + 0, // ECaseSwitchDisplayOff 7.114 + HAL::EValid, // ELEDs 7.115 + HAL::EValid|HAL::ESettable, // ELEDmask 7.116 + HAL::EValid, // EIntegratedPhone 7.117 + 0, // EDisplayBrightness 7.118 + 0, // EDisplayBrightnessMax 7.119 + 0, // EKeyboardBacklightState 7.120 + 0, // EAccessoryPower 7.121 + HAL::EValid|HAL::ESettable, // ELanguageIndex 7.122 + 0, // EKeyboardIndex 7.123 + HAL::EValid, // EMaxRAMDriveSize 7.124 + 0, // EKeyboardState 7.125 + HAL::EValid|HAL::ESettable, // ESystemDrive 7.126 + 0, // EPenState 7.127 + HAL::EValid, // EDisplayIsMono 7.128 + HAL::EValid, // EDisplayIsPalettized 7.129 + HAL::EValid, // EDisplayBitsPerPixel 7.130 + HAL::EValid, // EDisplayNumModes 7.131 + HAL::EValid, // EDisplayMemoryAddress 7.132 + HAL::EValid, // EDisplayOffsetToFirstPixel 7.133 + HAL::EValid, // EDisplayOffsetBetweenLines 7.134 + 0, // EDisplayPaletteEntry 7.135 + HAL::EValid, // EDisplayIsPixelOrderRGB 7.136 + HAL::EValid, // EDisplayIsPixelOrderLandscape 7.137 + HAL::EValid|HAL::ESettable, // EDisplayMode 7.138 + 0, // ESwitches 7.139 + 0, // EDebugPort 7.140 + 0, // ELocaleLoaded 7.141 + HAL::EValid, // EClipboardDrive 7.142 + HAL::EValid|HAL::ESettable, // ECustomRestart 7.143 + HAL::EValid, // ECustomRestartReason 7.144 + HAL::EValid, // EDisplayNumberOfScreens 7.145 + HAL::EValid, // ENanoTickPeriod 7.146 + HAL::EValid, // EFastCounterFrequency 7.147 + HAL::EValid, // EFastCounterCountsUp 7.148 + HAL::EValid, // EPointer3D 7.149 + HAL::EValid|HAL::ESettable, // EPointer3DMaxProximity 7.150 + HAL::EValid, // EPointer3DThetaSupported 7.151 + HAL::EValid, // EPointer3DPhiSupported 7.152 + HAL::EValid, // EPointer3DRotationSupported 7.153 + HAL::EValid, // EPointer3DPressureSupported 7.154 + 0, // EHardwareFloatingPoint 7.155 + HAL::EValid|HAL::ESettable, // ETimeNonSecureOffset 7.156 + 0, // EPersistStartupModeKernel 7.157 + 0, // EMaximumCustomRestartReasons 7.158 + 0, // EMaximumRestartStartupModes 7.159 + HAL::EValid|HAL::ESettable, // ECustomResourceDrive 7.160 + HAL::EValid, // EPointer3DProximityStep 7.161 + HAL::EValid, // EPointerMaxPointers 7.162 + HAL::EValid|HAL::ESettable, // EPointerNumberOfPointers 7.163 + HAL::EValid, // EPointer3DMaxPressure 7.164 + HAL::EValid, // EPointer3DPressureStep 7.165 + HAL::EValid|HAL::ESettable, // EPointer3DEnterHighPressureThreshold 7.166 + HAL::EValid|HAL::ESettable, // EPointer3DExitHighPressureThreshold 7.167 + HAL::EValid|HAL::ESettable, // EPointer3DEnterCloseProximityThreshold 7.168 + HAL::EValid|HAL::ESettable, // EPointer3DExitCloseProximityThreshold 7.169 + HAL::EValid, // EDisplayMemoryHandle 7.170 + 0, // ESerialNumber 7.171 + 0, // ECpuProfilingDefaultInterruptBase 7.172 + HAL::EValid // ENumCpus 7.173 + }; 7.174 + 7.175 +#if 0 7.176 +const TInt HalInternal::Offset[]= 7.177 + { 7.178 + 0, // EManufacturer 7.179 + 4, // EManufacturerHardwareRev 7.180 + 8, // EManufacturerSoftwareRev 7.181 + 12, // EManufacturerSoftwareBuild 7.182 + 16, // EModel 7.183 + 20, // EMachineUid 7.184 + 24, // EDeviceFamily 7.185 + 28, // EDeviceFamilyRev 7.186 + 32, // ECPU 7.187 + 36, // ECPUArch 7.188 + 40, // ECPUABI 7.189 + -1, // ECPUSpeed 7.190 + -1, // ESystemStartupReason 7.191 + -1, // ESystemException 7.192 + 44, // ESystemTickPeriod 7.193 + -1, // EMemoryRAM 7.194 + -1, // EMemoryRAMFree 7.195 + -1, // EMemoryROM 7.196 + 48, // EMemoryPageSize 7.197 + 52, // EPowerGood 7.198 + -1, // EPowerBatteryStatus 7.199 + 56, // EPowerBackup 7.200 + -1, // EPowerBackupStatus 7.201 + 60, // EPowerExternal 7.202 + 64, // EKeyboard 7.203 + 68, // EKeyboardDeviceKeys 7.204 + 72, // EKeyboardAppKeys 7.205 + 76, // EKeyboardClick 7.206 + -1, // EKeyboardClickState 7.207 + -1, // EKeyboardClickVolume 7.208 + 80, // EKeyboardClickVolumeMax 7.209 + -1, // EDisplayXPixels 7.210 + -1, // EDisplayYPixels 7.211 + -1, // EDisplayXTwips 7.212 + -1, // EDisplayYTwips 7.213 + -1, // EDisplayColors 7.214 + -1, // EDisplayState 7.215 + -1, // EDisplayContrast 7.216 + -1, // EDisplayContrastMax 7.217 + 84, // EBacklight 7.218 + -1, // EBacklightState 7.219 + 88, // EPen 7.220 + -1, // EPenX 7.221 + -1, // EPenY 7.222 + -1, // EPenDisplayOn 7.223 + -1, // EPenClick 7.224 + -1, // EPenClickState 7.225 + -1, // EPenClickVolume 7.226 + -1, // EPenClickVolumeMax 7.227 + 92, // EMouse 7.228 + -1, // EMouseX 7.229 + -1, // EMouseY 7.230 + -1, // EMouseState 7.231 + -1, // EMouseSpeed 7.232 + -1, // EMouseAcceleration 7.233 + 96, // EMouseButtons 7.234 + -1, // EMouseButtonState 7.235 + -1, // ECaseState 7.236 + 100, // ECaseSwitch 7.237 + -1, // ECaseSwitchDisplayOn 7.238 + -1, // ECaseSwitchDisplayOff 7.239 + 104, // ELEDs 7.240 + -1, // ELEDmask 7.241 + 108, // EIntegratedPhone 7.242 + -1, // EDisplayBrightness 7.243 + -1, // EDisplayBrightnessMax 7.244 + -1, // EKeyboardBacklightState 7.245 + -1, // EAccessoryPower 7.246 + 112, // ELanguageIndex 7.247 + -1, // EKeyboardIndex 7.248 + 116, // EMaxRAMDriveSize 7.249 + -1, // EKeyboardState 7.250 + 120, // ESystemDrive 7.251 + -1, // EPenState 7.252 + -1, // EDisplayIsMono 7.253 + -1, // EDisplayIsPalettized 7.254 + -1, // EDisplayBitsPerPixel 7.255 + -1, // EDisplayNumModes 7.256 + -1, // EDisplayMemoryAddress 7.257 + -1, // EDisplayOffsetToFirstPixel 7.258 + -1, // EDisplayOffsetBetweenLines 7.259 + -1, // EDisplayPaletteEntry 7.260 + -1, // EDisplayIsPixelOrderRGB 7.261 + -1, // EDisplayIsPixelOrderLandscape 7.262 + -1, // EDisplayMode 7.263 + -1, // ESwitches 7.264 + -1, // EDebugPort 7.265 + -1, // ELocaleLoaded 7.266 + 124, // EClipboardDrive 7.267 + -1, // ECustomRestart 7.268 + -1, // ECustomRestartReason 7.269 + -1, // EDisplayNumberOfScreens 7.270 + -1, // ENanoTickPeriod 7.271 + -1, // EFastCounterFrequency 7.272 + 128, // EFastCounterCountsUp 7.273 + 132, // EPointer3D 7.274 + 136, // EPointer3DMaxProximity 7.275 + 140, // EPointer3DThetaSupported 7.276 + 144, // EPointer3DPhiSupported 7.277 + 148, // EPointer3DRotationSupported 7.278 + 152, // EPointer3DPressureSupported 7.279 + -1, // EHardwareFloatingPoint 7.280 + -1, // ETimeNonSecureOffset 7.281 + -1, // EPersistStartupModeKernel 7.282 + -1, // EMaximumCustomRestartReasons 7.283 + -1, // EMaximumRestartStartupModes 7.284 + 156, // ECustomResourceDrive 7.285 + 160, // EPointer3DProximityStep 7.286 + 164, // EPointerMaxPointers 7.287 + 168, // EPointerNumberOfPointers 7.288 + 172, // EPointer3DMaxPressure 7.289 + 176, // EPointer3DPressureStep 7.290 + 180, // EPointer3DEnterHighPressureThreshold 7.291 + 184, // EPointer3DExitHighPressureThreshold 7.292 + 188, // EPointer3DEnterCloseProximityThreshold 7.293 + 192, // EPointer3DExitCloseProximityThreshold 7.294 + -1, // EDisplayMemoryHandle 7.295 + -1, // ESerialNumber 7.296 + -1, // ECpuProfilingDefaultInterruptBase 7.297 + -1 // ENumCpus 7.298 + }; 7.299 + 7.300 +#endif 7.301 +const TInt HalInternal::HalDataSize=196; 7.302 + 7.303 +const THalImplementation HalInternal::Implementation[]= 7.304 + { 7.305 + NULL, // EManufacturer 7.306 + NULL, // EManufacturerHardwareRev 7.307 + NULL, // EManufacturerSoftwareRev 7.308 + NULL, // EManufacturerSoftwareBuild 7.309 + NULL, // EModel 7.310 + NULL, // EMachineUid 7.311 + NULL, // EDeviceFamily 7.312 + NULL, // EDeviceFamilyRev 7.313 + NULL, // ECPU 7.314 + NULL, // ECPUArch 7.315 + NULL, // ECPUABI 7.316 + ProcessCPUSpeed, // ECPUSpeed 7.317 + NULL, // ESystemStartupReason 7.318 + NULL, // ESystemException 7.319 + NULL, // ESystemTickPeriod 7.320 + GetRAMSize, // EMemoryRAM 7.321 + GetFreeRAM, // EMemoryRAMFree 7.322 + GetROMSize, // EMemoryROM 7.323 + NULL, // EMemoryPageSize 7.324 + NULL, // EPowerGood 7.325 + NULL, // EPowerBatteryStatus 7.326 + NULL, // EPowerBackup 7.327 + NULL, // EPowerBackupStatus 7.328 + NULL, // EPowerExternal 7.329 + NULL, // EKeyboard 7.330 + NULL, // EKeyboardDeviceKeys 7.331 + NULL, // EKeyboardAppKeys 7.332 + NULL, // EKeyboardClick 7.333 + ProcessKeyboardClickState, // EKeyboardClickState 7.334 + ProcessKeyboardClickVolume, // EKeyboardClickVolume 7.335 + NULL, // EKeyboardClickVolumeMax 7.336 + ProcessDisplayCurrentModeInfo, // EDisplayXPixels 7.337 + ProcessDisplayCurrentModeInfo, // EDisplayYPixels 7.338 + ProcessDisplayCurrentModeInfo, // EDisplayXTwips 7.339 + ProcessDisplayCurrentModeInfo, // EDisplayYTwips 7.340 + ProcessDisplayColors, // EDisplayColors 7.341 + ProcessDisplayState, // EDisplayState 7.342 + ProcessDisplayContrast, // EDisplayContrast 7.343 + ProcessDisplayMaxContrast, // EDisplayContrastMax 7.344 + NULL, // EBacklight 7.345 + NULL, // EBacklightState 7.346 + NULL, // EPen 7.347 + NULL, // EPenX 7.348 + NULL, // EPenY 7.349 + NULL, // EPenDisplayOn 7.350 + NULL, // EPenClick 7.351 + NULL, // EPenClickState 7.352 + NULL, // EPenClickVolume 7.353 + NULL, // EPenClickVolumeMax 7.354 + NULL, // EMouse 7.355 + NULL, // EMouseX 7.356 + NULL, // EMouseY 7.357 + ProcessMouseState, // EMouseState 7.358 + ProcessMouseSpeed, // EMouseSpeed 7.359 + ProcessMouseAcceleration, // EMouseAcceleration 7.360 + NULL, // EMouseButtons 7.361 + GetMouseButtonState, // EMouseButtonState 7.362 + NULL, // ECaseState 7.363 + NULL, // ECaseSwitch 7.364 + NULL, // ECaseSwitchDisplayOn 7.365 + NULL, // ECaseSwitchDisplayOff 7.366 + NULL, // ELEDs 7.367 + ProcessLEDMask, // ELEDmask 7.368 + NULL, // EIntegratedPhone 7.369 + NULL, // EDisplayBrightness 7.370 + NULL, // EDisplayBrightnessMax 7.371 + NULL, // EKeyboardBacklightState 7.372 + NULL, // EAccessoryPower 7.373 + NULL, // ELanguageIndex 7.374 + NULL, // EKeyboardIndex 7.375 + NULL, // EMaxRAMDriveSize 7.376 + NULL, // EKeyboardState 7.377 + NULL, // ESystemDrive 7.378 + NULL, // EPenState 7.379 + ProcessDisplaySpecifiedModeInfo, // EDisplayIsMono 7.380 + ProcessDisplaySpecifiedModeInfo, // EDisplayIsPalettized 7.381 + ProcessDisplaySpecifiedModeInfo, // EDisplayBitsPerPixel 7.382 + ProcessDisplayNumModes, // EDisplayNumModes 7.383 + ProcessDisplayCurrentModeInfo, // EDisplayMemoryAddress 7.384 + ProcessDisplaySpecifiedModeInfo, // EDisplayOffsetToFirstPixel 7.385 + ProcessDisplaySpecifiedModeInfo, // EDisplayOffsetBetweenLines 7.386 + NULL, // EDisplayPaletteEntry 7.387 + ProcessDisplayCurrentModeInfo, // EDisplayIsPixelOrderRGB 7.388 + ProcessDisplayCurrentModeInfo, // EDisplayIsPixelOrderLandscape 7.389 + ProcessDisplayMode, // EDisplayMode 7.390 + NULL, // ESwitches 7.391 + NULL, // EDebugPort 7.392 + NULL, // ELocaleLoaded 7.393 + NULL, // EClipboardDrive 7.394 + ProcessCustomRestart, // ECustomRestart 7.395 + ProcessCustomRestartReason, // ECustomRestartReason 7.396 + GetDisplayNumberOfScreens, // EDisplayNumberOfScreens 7.397 + ProcessNanoTickPeriod, // ENanoTickPeriod 7.398 + ProcessFastCounterFrequency, // EFastCounterFrequency 7.399 + NULL, // EFastCounterCountsUp 7.400 + NULL, // EPointer3D 7.401 + NULL, // EPointer3DMaxProximity 7.402 + NULL, // EPointer3DThetaSupported 7.403 + NULL, // EPointer3DPhiSupported 7.404 + NULL, // EPointer3DRotationSupported 7.405 + NULL, // EPointer3DPressureSupported 7.406 + NULL, // EHardwareFloatingPoint 7.407 + NonsecureClockOffset, // ETimeNonSecureOffset 7.408 + NULL, // EPersistStartupModeKernel 7.409 + NULL, // EMaximumCustomRestartReasons 7.410 + NULL, // EMaximumRestartStartupModes 7.411 + NULL, // ECustomResourceDrive 7.412 + NULL, // EPointer3DProximityStep 7.413 + NULL, // EPointerMaxPointers 7.414 + NULL, // EPointerNumberOfPointers 7.415 + NULL, // EPointer3DMaxPressure 7.416 + NULL, // EPointer3DPressureStep 7.417 + NULL, // EPointer3DEnterHighPressureThreshold 7.418 + NULL, // EPointer3DExitHighPressureThreshold 7.419 + NULL, // EPointer3DEnterCloseProximityThreshold 7.420 + NULL, // EPointer3DExitCloseProximityThreshold 7.421 + GetDisplayMemoryHandle, // EDisplayMemoryHandle 7.422 + NULL, // ESerialNumber 7.423 + NULL, // ECpuProfilingDefaultInterruptBase 7.424 + GetNumCpus // ENumCpus 7.425 + }; 7.426 +
8.1 --- a/os/boardsupport/emulator/emulatorbsp/hal/hal.cmake Fri Jun 15 03:10:57 2012 +0200 8.2 +++ b/os/boardsupport/emulator/emulatorbsp/hal/hal.cmake Tue Jun 10 14:32:02 2014 +0200 8.3 @@ -18,7 +18,7 @@ 8.4 #------------------------------------------------------------------- 8.5 add_cmake_source() 8.6 #Make sure all the output from all projects will go in one place 8.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 8.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 8.9 #Visual Studio IDE folders 8.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 8.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/os/boardsupport/emulator/emulatorbsp/hal/values.cpp Tue Jun 10 14:32:02 2014 +0200 9.3 @@ -0,0 +1,137 @@ 9.4 +// ./os/boardsupport/emulator/emulatorbsp/hal/values.cpp 9.5 +// 9.6 +// Copyright (c) 1999-2014 Nokia Corporation and/or its subsidiary(-ies).// All rights reserved. 9.7 +// 9.8 +// GENERATED FILE - DO NOT EDIT 9.9 +// 9.10 + 9.11 +#include <kernel/hal_int.h> 9.12 +#ifdef __CW32__ 9.13 +// CodeWarrior requires EXPORT_C on the definiton here, as well as the declaration (in hal_int.h) 9.14 +EXPORT_C const TInt HalInternal::InitialValue[]= 9.15 +#else 9.16 +EXPORT_D const TInt HalInternal::InitialValue[]= 9.17 +#endif 9.18 + { 9.19 + 4, // EManufacturer 9.20 + 1, // EManufacturerHardwareRev 9.21 + 256, // EManufacturerSoftwareRev 9.22 + 592, // EManufacturerSoftwareBuild 9.23 + 19748, // EModel 9.24 + 268459874, // EMachineUid 9.25 + 0, // EDeviceFamily 9.26 + 1, // EDeviceFamilyRev 9.27 + 2, // ECPU 9.28 + 1792, // ECPUArch 9.29 + 4, // ECPUABI 9.30 + 0, // ECPUSpeed 9.31 + 0, // ESystemStartupReason 9.32 + 0, // ESystemException 9.33 + 15625, // ESystemTickPeriod 9.34 + 128, // EMemoryRAM 9.35 + 128, // EMemoryRAMFree 9.36 + 16, // EMemoryROM 9.37 + 4096, // EMemoryPageSize 9.38 + 1, // EPowerGood 9.39 + 0, // EPowerBatteryStatus 9.40 + 0, // EPowerBackup 9.41 + 0, // EPowerBackupStatus 9.42 + 1, // EPowerExternal 9.43 + 2, // EKeyboard 9.44 + 3, // EKeyboardDeviceKeys 9.45 + 9, // EKeyboardAppKeys 9.46 + 1, // EKeyboardClick 9.47 + 1, // EKeyboardClickState 9.48 + 0, // EKeyboardClickVolume 9.49 + 1, // EKeyboardClickVolumeMax 9.50 + 0, // EDisplayXPixels 9.51 + 0, // EDisplayYPixels 9.52 + 0, // EDisplayXTwips 9.53 + 0, // EDisplayYTwips 9.54 + 0, // EDisplayColors 9.55 + 1, // EDisplayState 9.56 + 0, // EDisplayContrast 9.57 + 0, // EDisplayContrastMax 9.58 + 0, // EBacklight 9.59 + 0, // EBacklightState 9.60 + 0, // EPen 9.61 + 0, // EPenX 9.62 + 0, // EPenY 9.63 + 1, // EPenDisplayOn 9.64 + 0, // EPenClick 9.65 + 0, // EPenClickState 9.66 + 0, // EPenClickVolume 9.67 + 0, // EPenClickVolumeMax 9.68 + 1, // EMouse 9.69 + 0, // EMouseX 9.70 + 0, // EMouseY 9.71 + 1, // EMouseState 9.72 + 1, // EMouseSpeed 9.73 + 1, // EMouseAcceleration 9.74 + 2, // EMouseButtons 9.75 + 0, // EMouseButtonState 9.76 + 0, // ECaseState 9.77 + 0, // ECaseSwitch 9.78 + 1, // ECaseSwitchDisplayOn 9.79 + 1, // ECaseSwitchDisplayOff 9.80 + 2, // ELEDs 9.81 + 0, // ELEDmask 9.82 + 0, // EIntegratedPhone 9.83 + 0, // EDisplayBrightness 9.84 + 0, // EDisplayBrightnessMax 9.85 + 0, // EKeyboardBacklightState 9.86 + 0, // EAccessoryPower 9.87 + 0, // ELanguageIndex 9.88 + 0, // EKeyboardIndex 9.89 + 4194304, // EMaxRAMDriveSize 9.90 + 0, // EKeyboardState 9.91 + 4294967295, // ESystemDrive 9.92 + 0, // EPenState 9.93 + 0, // EDisplayIsMono 9.94 + 0, // EDisplayIsPalettized 9.95 + 0, // EDisplayBitsPerPixel 9.96 + 0, // EDisplayNumModes 9.97 + 0, // EDisplayMemoryAddress 9.98 + 0, // EDisplayOffsetToFirstPixel 9.99 + 0, // EDisplayOffsetBetweenLines 9.100 + 0, // EDisplayPaletteEntry 9.101 + 0, // EDisplayIsPixelOrderRGB 9.102 + 0, // EDisplayIsPixelOrderLandscape 9.103 + 0, // EDisplayMode 9.104 + 0, // ESwitches 9.105 + 0, // EDebugPort 9.106 + 0, // ELocaleLoaded 9.107 + 2, // EClipboardDrive 9.108 + 0, // ECustomRestart 9.109 + 0, // ECustomRestartReason 9.110 + 1, // EDisplayNumberOfScreens 9.111 + 0, // ENanoTickPeriod 9.112 + 0, // EFastCounterFrequency 9.113 + 1, // EFastCounterCountsUp 9.114 + 1, // EPointer3D 9.115 + -100, // EPointer3DMaxProximity 9.116 + 1, // EPointer3DThetaSupported 9.117 + 1, // EPointer3DPhiSupported 9.118 + 1, // EPointer3DRotationSupported 9.119 + 1, // EPointer3DPressureSupported 9.120 + 0, // EHardwareFloatingPoint 9.121 + 0, // ETimeNonSecureOffset 9.122 + 0, // EPersistStartupModeKernel 9.123 + 0, // EMaximumCustomRestartReasons 9.124 + 0, // EMaximumRestartStartupModes 9.125 + 65535, // ECustomResourceDrive 9.126 + 5, // EPointer3DProximityStep 9.127 + 8, // EPointerMaxPointers 9.128 + 6, // EPointerNumberOfPointers 9.129 + 5000, // EPointer3DMaxPressure 9.130 + 500, // EPointer3DPressureStep 9.131 + 2147483647, // EPointer3DEnterHighPressureThreshold 9.132 + -2147483647, // EPointer3DExitHighPressureThreshold 9.133 + 2147483647, // EPointer3DEnterCloseProximityThreshold 9.134 + -2147483647, // EPointer3DExitCloseProximityThreshold 9.135 + 0, // EDisplayMemoryHandle 9.136 + 0, // ESerialNumber 9.137 + 0, // ECpuProfilingDefaultInterruptBase 9.138 + 1 // ENumCpus 9.139 + }; 9.140 +
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/os/boardsupport/emulator/emulatorbsp/soundsc.cmake Tue Jun 10 14:32:02 2014 +0200 10.3 @@ -0,0 +1,75 @@ 10.4 +# Copyright (c) 2009-2012 St駱hane Lenclud. 10.5 +# All rights reserved. 10.6 +# This component and the accompanying materials are made available 10.7 +# under the terms of the License "Eclipse Public License v1.0" 10.8 +# which accompanies this distribution, and is available 10.9 +# at the URL "http://www.eclipse.org/legal/epl-v10.html". 10.10 +# 10.11 +# Initial Contributors: 10.12 +# St駱hane Lenclud. 10.13 +# 10.14 + 10.15 +push_target(soundsc) 10.16 + 10.17 +#Add current file to our source tree 10.18 +add_cmake_source() 10.19 +#Make sure all the output from all projects will go in one place 10.20 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 10.21 + 10.22 + 10.23 +include_directories(./inc) 10.24 +include_directories(../../../kernelhwsrv/kernel/eka/include/kernel/win32) 10.25 +include_directories(../../../kernelhwsrv/kernel/eka/include/memmodel/emul) 10.26 +include_directories(../../../kernelhwsrv/kernel/eka/include) 10.27 +include_directories(../../../kernelhwsrv/kernel/eka/include/nkern) 10.28 +include_directories(../../../kernelhwsrv/kernel/eka/include/nkern/win32) 10.29 + 10.30 + 10.31 +#Hoping we include the right entry point 10.32 +set (sourcepath ../../../kernelhwsrv/kernel/eka/kernel/win32/) 10.33 +add_source(v_entry.cpp) 10.34 + 10.35 +set (sourcepath ../../../kernelhwsrv/kernel/eka/drivers/power/binary/) 10.36 +add_source( 10.37 +bpower.cpp 10.38 +) 10.39 + 10.40 +set (sourcepath ./specific/) 10.41 +add_source( 10.42 +variant.cpp timer.cpp property.cpp 10.43 +) 10.44 + 10.45 +#Hoping we include the right entry point 10.46 +set (sourcepath ./bwins/) 10.47 +add_source(vwinsu.def) 10.48 + 10.49 +get_source(source) 10.50 +add_library (ecust SHARED ${source}) 10.51 +target_link_libraries(ecust emulator ekern) 10.52 +#WIN32 libraries 10.53 +target_link_libraries(ecust kernel32 user32 winmm) 10.54 +# 10.55 +add_define(__EXPORT_MEMCPY__) 10.56 +add_define(__IN_KERNEL__) 10.57 +add_define(__KERNEL_MODE__) 10.58 +add_define(__MEMMODEL_EMUL_SINGLE_HOST_PROCESS__) 10.59 + 10.60 + 10.61 +#Create our data directory for the emulator 10.62 +#See 10.63 +#file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/\${BUILD_TYPE}/data) 10.64 +#execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${BUILD_TYPE}/data) 10.65 + 10.66 +#add_custom_command ( 10.67 +# TARGET ecust 10.68 +# PRE_BUILD 10.69 +# COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}${CMAKE_CFG_INTDIR}/data 10.70 +# ) 10.71 + 10.72 + 10.73 +add_custom_target ( 10.74 + createEmuDataFolder 10.75 + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/data 10.76 + ) 10.77 + 10.78 +pop_target(ecust) 10.79 \ No newline at end of file
11.1 --- a/os/boardsupport/emulator/emulatorbsp/specific/property.cpp Fri Jun 15 03:10:57 2012 +0200 11.2 +++ b/os/boardsupport/emulator/emulatorbsp/specific/property.cpp Tue Jun 10 14:32:02 2014 +0200 11.3 @@ -28,6 +28,21 @@ 11.4 #define _DUMP_PROPERTY 11.5 #endif 11.6 11.7 + 11.8 +//SL: added this to support relative paths 11.9 +#include <stdio.h> 11.10 +#ifdef WIN32 11.11 +#include <direct.h> 11.12 +#define GetCurrentDir _getcwd 11.13 +#define FullPath _fullpath 11.14 +#else 11.15 +#include <unistd.h> 11.16 +#define GetCurrentDir getcwd 11.17 +#define FullPath fullpath 11.18 +#endif 11.19 + 11.20 + 11.21 + 11.22 const char* KDefaultMachineName = "epoc"; 11.23 const char* KDefaultTestMachineName = "defaulttest"; 11.24 11.25 @@ -1164,6 +1179,7 @@ 11.26 return mpath; 11.27 } 11.28 11.29 + 11.30 TInt Wins::SetupDrive(int aDrive, const char* aPath) 11.31 // 11.32 // set up emulated drives 11.33 @@ -1208,8 +1224,15 @@ 11.34 11.35 } 11.36 else 11.37 - // otherwise, aPath is fully qualified path name. Use that. 11.38 - return iProperties.Replace(prop, aPath) ? KErrNone : KErrNoMemory; 11.39 + { 11.40 + //Otherwise aPath is potentially a relative path 11.41 + char path[FILENAME_MAX+1]; 11.42 + //Resolve relative path 11.43 + FullPath(path,aPath,sizeof(path)/sizeof(char)); 11.44 + //Now path is fully qualified path name. Use that. 11.45 + return iProperties.Replace(prop, path) ? KErrNone : KErrNoMemory; 11.46 + } 11.47 + 11.48 11.49 } 11.50
12.1 --- a/os/kernelhwsrv/kernel/eka/drivers/locmedia/elocd.cmake Fri Jun 15 03:10:57 2012 +0200 12.2 +++ b/os/kernelhwsrv/kernel/eka/drivers/locmedia/elocd.cmake Tue Jun 10 14:32:02 2014 +0200 12.3 @@ -18,7 +18,7 @@ 12.4 #------------------------------------------------------------------- 12.5 add_cmake_source() 12.6 #Make sure all the output from all projects will go in one place 12.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 12.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 12.9 #Visual Studio IDE folders 12.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 12.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
13.1 --- a/os/kernelhwsrv/kernel/eka/drivers/trace/btracec.cmake Fri Jun 15 03:10:57 2012 +0200 13.2 +++ b/os/kernelhwsrv/kernel/eka/drivers/trace/btracec.cmake Tue Jun 10 14:32:02 2014 +0200 13.3 @@ -18,7 +18,7 @@ 13.4 #------------------------------------------------------------------- 13.5 add_cmake_source() 13.6 #Make sure all the output from all projects will go in one place 13.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 13.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 13.9 #Visual Studio IDE folders 13.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 13.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
14.1 --- a/os/kernelhwsrv/kernel/eka/drivers/trace/btracex.cmake Fri Jun 15 03:10:57 2012 +0200 14.2 +++ b/os/kernelhwsrv/kernel/eka/drivers/trace/btracex.cmake Tue Jun 10 14:32:02 2014 +0200 14.3 @@ -18,7 +18,7 @@ 14.4 #------------------------------------------------------------------- 14.5 add_cmake_source() 14.6 #Make sure all the output from all projects will go in one place 14.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 14.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 14.9 #Visual Studio IDE folders 14.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 14.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
15.1 --- a/os/kernelhwsrv/kernel/eka/eka.cmake Fri Jun 15 03:10:57 2012 +0200 15.2 +++ b/os/kernelhwsrv/kernel/eka/eka.cmake Tue Jun 10 14:32:02 2014 +0200 15.3 @@ -12,7 +12,7 @@ 15.4 #Add current file to our source tree 15.5 add_cmake_source() 15.6 #Make sure all the output from all projects will go in one place 15.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 15.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 15.9 15.10 add_definitions(-D__SYMC__) 15.11
16.1 --- a/os/kernelhwsrv/kernel/eka/euser/edll.cmake Fri Jun 15 03:10:57 2012 +0200 16.2 +++ b/os/kernelhwsrv/kernel/eka/euser/edll.cmake Tue Jun 10 14:32:02 2014 +0200 16.3 @@ -18,7 +18,7 @@ 16.4 #------------------------------------------------------------------- 16.5 add_cmake_source() 16.6 #Make sure all the output from all projects will go in one place 16.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 16.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 16.9 #Visual Studio IDE folders 16.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 16.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
17.1 --- a/os/kernelhwsrv/kernel/eka/euser/eexe.cmake Fri Jun 15 03:10:57 2012 +0200 17.2 +++ b/os/kernelhwsrv/kernel/eka/euser/eexe.cmake Tue Jun 10 14:32:02 2014 +0200 17.3 @@ -18,7 +18,7 @@ 17.4 #------------------------------------------------------------------- 17.5 add_cmake_source() 17.6 #Make sure all the output from all projects will go in one place 17.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 17.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 17.9 #Visual Studio IDE folders 17.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 17.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
18.1 --- a/os/kernelhwsrv/kernel/eka/euser/emulator.cmake Fri Jun 15 03:10:57 2012 +0200 18.2 +++ b/os/kernelhwsrv/kernel/eka/euser/emulator.cmake Tue Jun 10 14:32:02 2014 +0200 18.3 @@ -18,7 +18,7 @@ 18.4 #------------------------------------------------------------------- 18.5 add_cmake_source() 18.6 #Make sure all the output from all projects will go in one place 18.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 18.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 18.9 #Visual Studio IDE folders 18.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 18.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
19.1 --- a/os/kernelhwsrv/kernel/eka/euser/epoc.cmake Fri Jun 15 03:10:57 2012 +0200 19.2 +++ b/os/kernelhwsrv/kernel/eka/euser/epoc.cmake Tue Jun 10 14:32:02 2014 +0200 19.3 @@ -18,7 +18,7 @@ 19.4 #------------------------------------------------------------------- 19.5 add_cmake_source() 19.6 #Make sure all the output from all projects will go in one place 19.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 19.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 19.9 #Visual Studio IDE folders 19.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 19.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
20.1 --- a/os/kernelhwsrv/kernel/eka/euser/estub.cmake Fri Jun 15 03:10:57 2012 +0200 20.2 +++ b/os/kernelhwsrv/kernel/eka/euser/estub.cmake Tue Jun 10 14:32:02 2014 +0200 20.3 @@ -18,7 +18,7 @@ 20.4 #------------------------------------------------------------------- 20.5 add_cmake_source() 20.6 #Make sure all the output from all projects will go in one place 20.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 20.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 20.9 #Visual Studio IDE folders 20.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 20.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
21.1 --- a/os/kernelhwsrv/kernel/eka/euser/euser.cmake Fri Jun 15 03:10:57 2012 +0200 21.2 +++ b/os/kernelhwsrv/kernel/eka/euser/euser.cmake Tue Jun 10 14:32:02 2014 +0200 21.3 @@ -15,7 +15,7 @@ 21.4 #Add current file to our source tree 21.5 add_cmake_source() 21.6 #Make sure all the output from all projects will go in one place 21.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 21.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 21.9 #Visual Studio IDE folders 21.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 21.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
22.1 --- a/os/kernelhwsrv/kernel/eka/euser/scppnwdl.cmake Fri Jun 15 03:10:57 2012 +0200 22.2 +++ b/os/kernelhwsrv/kernel/eka/euser/scppnwdl.cmake Tue Jun 10 14:32:02 2014 +0200 22.3 @@ -15,7 +15,7 @@ 22.4 #Add current file to our source tree 22.5 add_cmake_source() 22.6 #Make sure all the output from all projects will go in one place 22.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 22.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 22.9 #Visual Studio IDE folders 22.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 22.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
23.1 --- a/os/kernelhwsrv/kernel/eka/euser/scppnwdl_kern.cmake Fri Jun 15 03:10:57 2012 +0200 23.2 +++ b/os/kernelhwsrv/kernel/eka/euser/scppnwdl_kern.cmake Tue Jun 10 14:32:02 2014 +0200 23.3 @@ -15,7 +15,7 @@ 23.4 #Add current file to our source tree 23.5 add_cmake_source() 23.6 #Make sure all the output from all projects will go in one place 23.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 23.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 23.9 #Visual Studio IDE folders 23.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 23.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
24.1 --- a/os/kernelhwsrv/kernel/eka/euser/us_des.cpp Fri Jun 15 03:10:57 2012 +0200 24.2 +++ b/os/kernelhwsrv/kernel/eka/euser/us_des.cpp Tue Jun 10 14:32:02 2014 +0200 24.3 @@ -360,15 +360,18 @@ 24.4 const TInt KAlignTRealX = 4; 24.5 const TInt KAlignTInt64 = 4; 24.6 #else 24.7 + #ifndef __VC32__ // MSVC generates an internal compiler error with the following code 24.8 struct TReal_align {char c; TReal a;}; 24.9 const TInt KAlignTReal = _FOFF(TReal_align,a); 24.10 - #ifndef __VC32__ // MSVC generates an internal compiler error with the following code 24.11 + 24.12 struct TRealX_align {char c; TRealX a;}; 24.13 const TInt KAlignTRealX = _FOFF(TRealX_align,a); 24.14 24.15 struct TInt64_align {char c; TInt64 a;}; 24.16 const TInt KAlignTInt64 = _FOFF(TInt64_align,a); 24.17 #else 24.18 + //SL: Now also hardcoding KAlignTReal 24.19 + const TInt KAlignTReal = 4; 24.20 const TInt KAlignTRealX = 4; // Hard code value for MSVC 24.21 const TInt KAlignTInt64 = 4; // Hard code value for MSVC 24.22 #endif
25.1 --- a/os/kernelhwsrv/kernel/eka/include/emulator.h Fri Jun 15 03:10:57 2012 +0200 25.2 +++ b/os/kernelhwsrv/kernel/eka/include/emulator.h Tue Jun 10 14:32:02 2014 +0200 25.3 @@ -25,7 +25,9 @@ 25.4 #define __EMULATOR_H__ 25.5 25.6 #include <e32def.h> 25.7 -#define WIN32_LEAN_AND_MEAN 25.8 +#ifndef WIN32_LEAN_AND_MEAN 25.9 +# define WIN32_LEAN_AND_MEAN 25.10 +#endif 25.11 #pragma warning( disable : 4201 ) // nonstandard extension used : nameless struct/union 25.12 #include <windows.h> 25.13 #pragma warning( default : 4201 ) // nonstandard extension used : nameless struct/union
26.1 --- a/os/kernelhwsrv/kernel/eka/include/nkern/win32/nk_plat.h Fri Jun 15 03:10:57 2012 +0200 26.2 +++ b/os/kernelhwsrv/kernel/eka/include/nkern/win32/nk_plat.h Tue Jun 10 14:32:02 2014 +0200 26.3 @@ -26,9 +26,20 @@ 26.4 #ifndef __NK_WIN32_H__ 26.5 #define __NK_WIN32_H__ 26.6 26.7 +//SL: Avoid warnings 26.8 +#ifdef _CRTIMP 26.9 +#undef _CRTIMP 26.10 +#endif 26.11 + 26.12 #define _CRTIMP // we want to use the win32 static runtime library 26.13 26.14 #define WIN32_LEAN_AND_MEAN 26.15 + 26.16 +//SL: Avoid warnings 26.17 +#ifdef _WIN32_WINNT 26.18 +#undef _WIN32_WINNT 26.19 +#endif 26.20 + 26.21 #define _WIN32_WINNT 0x0400 26.22 #include <windows.h> 26.23
27.1 --- a/os/kernelhwsrv/kernel/eka/kernel/ekern.cmake Fri Jun 15 03:10:57 2012 +0200 27.2 +++ b/os/kernelhwsrv/kernel/eka/kernel/ekern.cmake Tue Jun 10 14:32:02 2014 +0200 27.3 @@ -15,7 +15,7 @@ 27.4 #Add current file to our source tree 27.5 add_cmake_source() 27.6 #Make sure all the output from all projects will go in one place 27.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 27.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 27.9 #Visual Studio IDE folders 27.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 27.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
28.1 --- a/os/kernelhwsrv/kernel/eka/kernel/ekll.cmake Fri Jun 15 03:10:57 2012 +0200 28.2 +++ b/os/kernelhwsrv/kernel/eka/kernel/ekll.cmake Tue Jun 10 14:32:02 2014 +0200 28.3 @@ -18,7 +18,7 @@ 28.4 #------------------------------------------------------------------- 28.5 add_cmake_source() 28.6 #Make sure all the output from all projects will go in one place 28.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 28.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 28.9 #Visual Studio IDE folders 28.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 28.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
29.1 --- a/os/kernelhwsrv/kernel/eka/kernel/exstart.cmake Fri Jun 15 03:10:57 2012 +0200 29.2 +++ b/os/kernelhwsrv/kernel/eka/kernel/exstart.cmake Tue Jun 10 14:32:02 2014 +0200 29.3 @@ -18,7 +18,7 @@ 29.4 #------------------------------------------------------------------- 29.5 add_cmake_source() 29.6 #Make sure all the output from all projects will go in one place 29.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 29.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 29.9 #Visual Studio IDE folders 29.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 29.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
30.1 --- a/os/kernelhwsrv/kernel/eka/nkern/win32/vectors.cpp Fri Jun 15 03:10:57 2012 +0200 30.2 +++ b/os/kernelhwsrv/kernel/eka/nkern/win32/vectors.cpp Tue Jun 10 14:32:02 2014 +0200 30.3 @@ -29,15 +29,9 @@ 30.4 EXPORT_C TInt __fastcall Dispatch(TInt aFunction, TInt* aArgs) 30.5 { 30.6 NThread& me = *static_cast<NThread*>(TheScheduler.iCurrentThread); 30.7 - //SL: Can't figure out why this fails at times 30.8 + //SL: If you panic here its probably because you forgot to Emulator::Lock() when doing system calls. 30.9 + //@see: http://www.developer.nokia.com/Community/Wiki/Symbian_OS_Internals/03._Threads,_Processes_and_Libraries#Forced_exit_-_diverting_threads 30.10 __NK_ASSERT_ALWAYS(!me.iDiverted); 30.11 - 30.12 - /* 30.13 - if (me.iDiverted) 30.14 - { 30.15 - __KTRACE_OPT(KSCHED,DEBUGPRINT("WARNING: not diverted!")); 30.16 - } 30.17 - */ 30.18 30.19 EnterKernel(); 30.20
31.1 --- a/os/kernelhwsrv/kerneltest/e32test/symc/tsymc.cmake Fri Jun 15 03:10:57 2012 +0200 31.2 +++ b/os/kernelhwsrv/kerneltest/e32test/symc/tsymc.cmake Tue Jun 10 14:32:02 2014 +0200 31.3 @@ -18,7 +18,7 @@ 31.4 #------------------------------------------------------------------- 31.5 add_cmake_source() 31.6 #Make sure all the output from all projects will go in one place 31.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 31.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 31.9 #Visual Studio IDE folders 31.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 31.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$") 31.12 @@ -53,7 +53,7 @@ 31.13 #Copy test files 31.14 install( FILES 31.15 ${PROJECT_SOURCE_DIR}/os/kernelhwsrv/kerneltest/e32test/symc/tsymc.txt 31.16 - DESTINATION ${CMAKE_BINARY_DIR}/\${BUILD_TYPE}/c/tsymc ) 31.17 + DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${BUILD_TYPE}/c/tsymc ) 31.18 #------------------------------------------------------------------- 31.19 31.20
32.1 --- a/os/kernelhwsrv/kerneltest/e32test/symc/tsymc.cpp Fri Jun 15 03:10:57 2012 +0200 32.2 +++ b/os/kernelhwsrv/kerneltest/e32test/symc/tsymc.cpp Tue Jun 10 14:32:02 2014 +0200 32.3 @@ -7,6 +7,11 @@ 32.4 #include <e32base.h> 32.5 #include <f32file.h> 32.6 32.7 +#define TEST_SUSTAIN 32.8 + 32.9 +TTime startTime; 32.10 + 32.11 + 32.12 32.13 TInt IdleCallBack(TAny* aParam) 32.14 { 32.15 @@ -14,16 +19,10 @@ 32.16 32.17 count++; 32.18 32.19 - if (count>5) 32.20 - { 32.21 - //Stop it there 32.22 - CActiveScheduler::Stop(); 32.23 - return EFalse; 32.24 - } 32.25 - 32.26 - 32.27 + //Only do this on first run 32.28 if (count==1) 32.29 { 32.30 + startTime.HomeTime(); 32.31 //Quick file system test 32.32 RFs fs; 32.33 User::LeaveIfError(fs.Connect()); 32.34 @@ -48,11 +47,11 @@ 32.35 //file.Close(); 32.36 } 32.37 32.38 - //Test write 32.39 + //Test write 32.40 TInt writeErr=file.Write(KWriteThat); 32.41 file.Close(); 32.42 } 32.43 - 32.44 + 32.45 //Test file creation 32.46 TInt createErr=file.Create(fs,KFileNameToCreate,EFileWrite); 32.47 if (!createErr) 32.48 @@ -66,9 +65,23 @@ 32.49 CleanupStack::PopAndDestroy(1,&fs); 32.50 } 32.51 32.52 + //Check our exit condition 32.53 + TTime time; 32.54 + time.HomeTime(); 32.55 + TTimeIntervalSeconds seconds; 32.56 + User::LeaveIfError(time.SecondsFrom(startTime,seconds)); 32.57 + 32.58 + //Just run for a few seconds 32.59 + if (seconds.Int()>5) 32.60 + { 32.61 + //Stop it there 32.62 + CActiveScheduler::Stop(); 32.63 + return EFalse; 32.64 + } 32.65 + 32.66 32.67 //Keep playing 32.68 - return ETrue; 32.69 + return ETrue; 32.70 } 32.71 32.72 32.73 @@ -89,7 +102,7 @@ 32.74 CleanupStack::PushL(base); 32.75 CleanupStack::PopAndDestroy(2,other); 32.76 //delete base; 32.77 - 32.78 + 32.79 //Testing cleanup stack 32.80 TRAPD(err, 32.81 base=new(ELeave) CBase(); 32.82 @@ -121,14 +134,14 @@ 32.83 32.84 //TODO: 32.85 //RHashSet<TUint32> hash; 32.86 - 32.87 + 32.88 //Testing AOs 32.89 //Install an active scheduler 32.90 CActiveScheduler* activeScheduler = new(ELeave) CActiveScheduler; 32.91 CActiveScheduler::Install(activeScheduler); 32.92 CleanupStack::PushL(activeScheduler); 32.93 32.94 - CIdle* idle = CIdle::NewL(CActive::EPriorityIdle); 32.95 + CIdle* idle = CIdle::NewL(CActive::EPriorityIdle); 32.96 CleanupStack::PushL(idle); 32.97 32.98 idle->Start(TCallBack(IdleCallBack,NULL)); 32.99 @@ -150,7 +163,7 @@ 32.100 { 32.101 //What do we do then 32.102 //SetReturnedHandle 32.103 - 32.104 + 32.105 __UHEAP_MARK; 32.106 32.107 //CBase* base=new(ELeave) CBase(); 32.108 @@ -177,11 +190,10 @@ 32.109 32.110 TInt err=KErrNone; 32.111 TRAP(err,MainL()); 32.112 - 32.113 + 32.114 delete cleanupStack; 32.115 32.116 __UHEAP_MARKEND; 32.117 32.118 return err; 32.119 - } 32.120 - 32.121 + } 32.122 \ No newline at end of file
33.1 --- a/os/kernelhwsrv/userlibandfileserver/domainmgr/group/domaincli.cmake Fri Jun 15 03:10:57 2012 +0200 33.2 +++ b/os/kernelhwsrv/userlibandfileserver/domainmgr/group/domaincli.cmake Tue Jun 10 14:32:02 2014 +0200 33.3 @@ -18,7 +18,7 @@ 33.4 #------------------------------------------------------------------- 33.5 add_cmake_source() 33.6 #Make sure all the output from all projects will go in one place 33.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 33.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 33.9 #Visual Studio IDE folders 33.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 33.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
34.1 --- a/os/kernelhwsrv/userlibandfileserver/domainmgr/group/domainpolicy.cmake Fri Jun 15 03:10:57 2012 +0200 34.2 +++ b/os/kernelhwsrv/userlibandfileserver/domainmgr/group/domainpolicy.cmake Tue Jun 10 14:32:02 2014 +0200 34.3 @@ -18,7 +18,7 @@ 34.4 #------------------------------------------------------------------- 34.5 add_cmake_source() 34.6 #Make sure all the output from all projects will go in one place 34.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 34.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 34.9 #Visual Studio IDE folders 34.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 34.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
35.1 --- a/os/kernelhwsrv/userlibandfileserver/domainmgr/group/domainsrv.cmake Fri Jun 15 03:10:57 2012 +0200 35.2 +++ b/os/kernelhwsrv/userlibandfileserver/domainmgr/group/domainsrv.cmake Tue Jun 10 14:32:02 2014 +0200 35.3 @@ -18,7 +18,7 @@ 35.4 #------------------------------------------------------------------- 35.5 add_cmake_source() 35.6 #Make sure all the output from all projects will go in one place 35.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 35.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 35.9 #Visual Studio IDE folders 35.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 35.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
36.1 --- a/os/kernelhwsrv/userlibandfileserver/fileserver/group/efile.cmake Fri Jun 15 03:10:57 2012 +0200 36.2 +++ b/os/kernelhwsrv/userlibandfileserver/fileserver/group/efile.cmake Tue Jun 10 14:32:02 2014 +0200 36.3 @@ -18,7 +18,7 @@ 36.4 #------------------------------------------------------------------- 36.5 add_cmake_source() 36.6 #Make sure all the output from all projects will go in one place 36.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 36.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 36.9 #Visual Studio IDE folders 36.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 36.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
37.1 --- a/os/kernelhwsrv/userlibandfileserver/fileserver/group/efsrv.cmake Fri Jun 15 03:10:57 2012 +0200 37.2 +++ b/os/kernelhwsrv/userlibandfileserver/fileserver/group/efsrv.cmake Tue Jun 10 14:32:02 2014 +0200 37.3 @@ -18,7 +18,7 @@ 37.4 #------------------------------------------------------------------- 37.5 add_cmake_source() 37.6 #Make sure all the output from all projects will go in one place 37.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 37.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 37.9 #Visual Studio IDE folders 37.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 37.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
38.1 --- a/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/ecomp.cmake Fri Jun 15 03:10:57 2012 +0200 38.2 +++ b/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/ecomp.cmake Tue Jun 10 14:32:02 2014 +0200 38.3 @@ -18,7 +18,7 @@ 38.4 #------------------------------------------------------------------- 38.5 add_cmake_source() 38.6 #Make sure all the output from all projects will go in one place 38.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 38.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 38.9 #Visual Studio IDE folders 38.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 38.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
39.1 --- a/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/elocal.cmake Fri Jun 15 03:10:57 2012 +0200 39.2 +++ b/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/elocal.cmake Tue Jun 10 14:32:02 2014 +0200 39.3 @@ -18,7 +18,7 @@ 39.4 #------------------------------------------------------------------- 39.5 add_cmake_source() 39.6 #Make sure all the output from all projects will go in one place 39.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 39.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 39.9 #Visual Studio IDE folders 39.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 39.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
40.1 --- a/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/erofs.cmake Fri Jun 15 03:10:57 2012 +0200 40.2 +++ b/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/erofs.cmake Tue Jun 10 14:32:02 2014 +0200 40.3 @@ -18,7 +18,7 @@ 40.4 #------------------------------------------------------------------- 40.5 add_cmake_source() 40.6 #Make sure all the output from all projects will go in one place 40.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 40.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 40.9 #Visual Studio IDE folders 40.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 40.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
41.1 --- a/os/ossrv/lowlevellibsandfws/apputils/group/bafl.cmake Fri Jun 15 03:10:57 2012 +0200 41.2 +++ b/os/ossrv/lowlevellibsandfws/apputils/group/bafl.cmake Tue Jun 10 14:32:02 2014 +0200 41.3 @@ -18,7 +18,7 @@ 41.4 #------------------------------------------------------------------- 41.5 add_cmake_source() 41.6 #Make sure all the output from all projects will go in one place 41.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 41.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 41.9 #Visual Studio IDE folders 41.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 41.11 source_group(Sources REGULAR_EXPRESSION ".+\\.CPP$")
42.1 --- a/os/persistentdata/persistentstorage/centralrepository/group/cenrepcli.cmake Fri Jun 15 03:10:57 2012 +0200 42.2 +++ b/os/persistentdata/persistentstorage/centralrepository/group/cenrepcli.cmake Tue Jun 10 14:32:02 2014 +0200 42.3 @@ -18,7 +18,7 @@ 42.4 #------------------------------------------------------------------- 42.5 add_cmake_source() 42.6 #Make sure all the output from all projects will go in one place 42.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 42.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 42.9 #Visual Studio IDE folders 42.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 42.11 source_group(Includes REGULAR_EXPRESSION ".+\\.h$")
43.1 --- a/os/persistentdata/persistentstorage/store/BMAKE/estor.cmake Fri Jun 15 03:10:57 2012 +0200 43.2 +++ b/os/persistentdata/persistentstorage/store/BMAKE/estor.cmake Tue Jun 10 14:32:02 2014 +0200 43.3 @@ -18,7 +18,7 @@ 43.4 #------------------------------------------------------------------- 43.5 add_cmake_source() 43.6 #Make sure all the output from all projects will go in one place 43.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 43.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 43.9 #Visual Studio IDE folders 43.10 source_group(Sources REGULAR_EXPRESSION ".+\\.cpp$") 43.11 source_group(Sources REGULAR_EXPRESSION ".+\\.CPP$")
44.1 --- a/symbian.cmake Fri Jun 15 03:10:57 2012 +0200 44.2 +++ b/symbian.cmake Tue Jun 10 14:32:02 2014 +0200 44.3 @@ -11,7 +11,7 @@ 44.4 44.5 44.6 #Make sure all the output from all projects will go in one place 44.7 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin) 44.8 +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 44.9 #------------------------------------------------------------------ 44.10 44.11 project (symbian) 44.12 @@ -25,6 +25,8 @@ 44.13 add_definitions(-D__LEAVE_EQUALS_THROW__) 44.14 add_definitions(-D__SUPPORT_CPP_EXCEPTIONS__) 44.15 add_definitions(-D__PLATSEC_UNLOCKED__) 44.16 +add_definitions(-DMONITOR_THREAD_CPU_TIME) 44.17 +add_definitions(-DSYMBIAN_FIX_TDESC_CONSTRUCTORS) 44.18 # TODO: I guess public stuff should also define SYMBIAN_ENABLE_SPLIT_HEADERS 44.19 44.20 44.21 @@ -68,14 +70,44 @@ 44.22 add_subdirectory(./os/kernelhwsrv/kerneltest) 44.23 #------------------------------------------------------------- 44.24 44.25 +#Copy epoc.ini to binary directory 44.26 +#Not used anymore we are using configure instead, see below 44.27 +#install( FILES 44.28 +# ${PROJECT_SOURCE_DIR}/symc/epoc.ini 44.29 +# DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${BUILD_TYPE}/data ) 44.30 + 44.31 + 44.32 +#If SYMC_DRIVE_C is not defined we default to parent folder 44.33 +if (NOT DEFINED SYMC_DRIVE_C) 44.34 + set(SYMC_DRIVE_C_NOT_DEFINED ON) 44.35 +endif() 44.36 + 44.37 + 44.38 +###### Configure epoc.ini 44.39 +set(DEBUG_EPOC_INI "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/data/epoc.ini") 44.40 +set(RELEASE_EPOC_INI "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/data/epoc.ini") 44.41 + 44.42 +#Specify default C drive root for debug build 44.43 +if (DEFINED SYMC_DRIVE_C_NOT_DEFINED) 44.44 + set(SYMC_DRIVE_C "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/c" ) 44.45 +endif() 44.46 + 44.47 +#Configure epoc.ini for debug build 44.48 +configure_file( ${PROJECT_SOURCE_DIR}/symc/epoc.ini ${DEBUG_EPOC_INI}) 44.49 + 44.50 +#Specify default C drive root for release build 44.51 +if (DEFINED SYMC_DRIVE_C_NOT_DEFINED) 44.52 + set(SYMC_DRIVE_C "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/c" ) 44.53 +endif() 44.54 + 44.55 +#Configure epoc.ini for release build 44.56 +configure_file( ${PROJECT_SOURCE_DIR}/symc/epoc.ini ${RELEASE_EPOC_INI}) 44.57 + 44.58 #Add a custom target just to group our cmake files together 44.59 file(GLOB_RECURSE DotCMakeFiles "./*.cmake") 44.60 -add_custom_target(symbian SOURCES ${source} ${DotCMakeFiles} ./symc/epoc.ini ) 44.61 +add_custom_target(symbian SOURCES ${source} ${DotCMakeFiles} ./symc/epoc.ini ${DEBUG_EPOC_INI} ${RELEASE_EPOC_INI}) 44.62 source_group(CMake FILES ${DotCMakeFiles} ${CMAKE_CURRENT_LIST_FILE} ) 44.63 -source_group(Data FILES ./symc/epoc.ini) 44.64 - 44.65 -#Copy epoc.ini to binary directory 44.66 -install( FILES 44.67 - ${PROJECT_SOURCE_DIR}/symc/epoc.ini 44.68 - DESTINATION ${CMAKE_BINARY_DIR}/\${BUILD_TYPE}/data ) 44.69 +source_group(Data FILES ./symc/epoc.ini) 44.70 +source_group(Data\\Debug FILES ${DEBUG_EPOC_INI}) 44.71 +source_group(Data\\Release FILES ${RELEASE_EPOC_INI}) 44.72
45.1 --- a/symc/epoc.ini Fri Jun 15 03:10:57 2012 +0200 45.2 +++ b/symc/epoc.ini Tue Jun 10 14:32:02 2014 +0200 45.3 @@ -13,9 +13,14 @@ 45.4 ;Default drives are from the binary directory <bin-dir>\c and <bin-dir>\d 45.5 ;Specify the C drive root 45.6 ;_epoc_drive_c=d:\dev\epoc_drive_c 45.7 +;Default to the project directory which is typically the parent folder from the current directory 45.8 +_epoc_drive_c=@SYMC_DRIVE_C@ 45.9 ;Specify the Z drive root 45.10 ;_epoc_drive_z=d:\dev\tsymc\z 45.11 45.12 +;Default is 63 MB, Zero sets it to 1GB 45.13 +MegabytesOfFreeMemory=128 45.14 + 45.15 ;Debug mode 45.16 JustInTime=1 45.17
46.1 --- a/utils.cmake Fri Jun 15 03:10:57 2012 +0200 46.2 +++ b/utils.cmake Tue Jun 10 14:32:02 2014 +0200 46.3 @@ -126,15 +126,16 @@ 46.4 #Use those include path macro instead of cmake built-in include_directories as it allows us to set include directories per target instead of per directory. 46.5 macro(system_include path) 46.6 get_target(targetName) 46.7 - get_target_property(value ${targetName} COMPILE_FLAGS) 46.8 - #MS CL compiler specific. I guess gcc should use -I instead of /I 46.9 - if (${value} STREQUAL "value-NOTFOUND") 46.10 - set(value "/I ${PROJECT_SOURCE_DIR}${path}") 46.11 - else (${value} STREQUAL "value-NOTFOUND") 46.12 - set(value "${value} /I ${PROJECT_SOURCE_DIR}${path}") 46.13 - endif (${value} STREQUAL "value-NOTFOUND") 46.14 + #get_target_property(value ${targetName} COMPILE_FLAGS) 46.15 + ##MS CL compiler specific. I guess gcc should use -I instead of /I 46.16 + #if (${value} STREQUAL "value-NOTFOUND") 46.17 + # set(value "/I ${PROJECT_SOURCE_DIR}${path}") 46.18 + #else (${value} STREQUAL "value-NOTFOUND") 46.19 + # set(value "${value} /I ${PROJECT_SOURCE_DIR}${path}") 46.20 + #endif (${value} STREQUAL "value-NOTFOUND") 46.21 #message("Add system include: ${value}") 46.22 - set_target_properties(${targetName} PROPERTIES COMPILE_FLAGS "${value}") 46.23 + #set_target_properties(${targetName} PROPERTIES COMPILE_FLAGS "${value}") 46.24 + set_property(TARGET ${targetName} APPEND PROPERTY INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}${path}) 46.25 endmacro(system_include) 46.26 46.27 #----------------------------------------------------- 46.28 @@ -143,14 +144,15 @@ 46.29 #TODO: Is this working with releative path? 46.30 macro(user_include path) 46.31 get_target(targetName) 46.32 - get_target_property(value ${targetName} COMPILE_FLAGS) 46.33 - #MS CL compiler specific. I guess gcc should use -I instead of /I 46.34 - if (${value} STREQUAL "value-NOTFOUND") 46.35 - set(value "/I ${CMAKE_CURRENT_LIST_DIR}/${path}") 46.36 - else (${value} STREQUAL "value-NOTFOUND") 46.37 - set(value "${value} /I ${CMAKE_CURRENT_LIST_DIR}/${path}") 46.38 - endif (${value} STREQUAL "value-NOTFOUND") 46.39 - set_target_properties(${targetName} PROPERTIES COMPILE_FLAGS "${value}") 46.40 + #get_target_property(value ${targetName} COMPILE_FLAGS) 46.41 + ##MS CL compiler specific. I guess gcc should use -I instead of /I 46.42 + #if (${value} STREQUAL "value-NOTFOUND") 46.43 + # set(value "/I ${CMAKE_CURRENT_LIST_DIR}/${path}") 46.44 + #else (${value} STREQUAL "value-NOTFOUND") 46.45 + # set(value "${value} /I ${CMAKE_CURRENT_LIST_DIR}/${path}") 46.46 + #endif (${value} STREQUAL "value-NOTFOUND") 46.47 + #set_target_properties(${targetName} PROPERTIES COMPILE_FLAGS "${value}") 46.48 + set_property(TARGET ${targetName} APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/${path}) 46.49 endmacro(user_include) 46.50 46.51