FCL/sf/os/deviceplatformrelease: comparison foundation_system/sf

equal deleted inserted replaced

-:04e7a3912350
+:877bf5d7469a
 @see SysUtil::GetSWVersion
 @see SysUtil::DiskSpaceBelowCriticalLevelL
 */
-#undef SYMBIAN_BAFL_SYSUTIL
+#define SYMBIAN_BAFL_SYSUTIL
 /** #SYMBIAN_DOS_SERVER_SERVICES
 Indicate that the DOS Server Services is present. This is needed to turn the RF
 on in an emergency call when the phone is in flight mode. In 9.5 we are using
 the System State Manager.
 /** #SYMBIAN_EXCLUDE_D_EXC
 This flag can be used to exclude Symbian's d_exc.exe from rom image when
 Symbian's base.iby is included
 */
-#undef SYMBIAN_EXCLUDE_D_EXC
+#define SYMBIAN_EXCLUDE_D_EXC
 /** #SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN
 This flag is used to exclude Symbian Camera API stub
 */
-#undef SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN
+#define SYMBIAN_EXCLUDE_ECAM_STUBPLUGIN
 /** #SYMBIAN_EXCLUDE_KEYMAP
 This flag can be used to include/exclude Symbian's KEYMAP_FILE (EKData.dll) from
 rom image if base.iby is included
 */
-#undef SYMBIAN_EXCLUDE_KEYMAP
+#define SYMBIAN_EXCLUDE_KEYMAP
 /** #SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT
 The macro SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT is used to exclude the location
 management components of the Location Framework from ROM.Default value should be
 "Defined".
 that flag it can be excluded from usbhostmsmm.iby.
 Related with PREQ1305
 */
-#undef SYMBIAN_EXCLUDE_MSMM_POLICY_PLUGIN
+#define SYMBIAN_EXCLUDE_MSMM_POLICY_PLUGIN
 /** #SYMBIAN_EXCLUDE_SCDV
 This flag can be used to exclude Symbian ScDv.dll from rom image when Symbian's
 base.iby is included
 */
-#undef SYMBIAN_EXCLUDE_SCDV
+#define SYMBIAN_EXCLUDE_SCDV
 /** #SYMBIAN_EXCLUDE_SIP
 Excludes Symbian SIP components.
 */
 #undef SYMBIAN_EXCLUDE_SIP
 /** #SYMBIAN_GRAPHICS_ADAPTATION
 This flag is used to take right graphics adaptation components to the ROM build
 */
-#define SYMBIAN_GRAPHICS_ADAPTATION                        None
+#define SYMBIAN_GRAPHICS_ADAPTATION                        SGA_SW
 /** #SYMBIAN_GRAPHICS_USE_GCE
 Includes the Symbian the Surface Manager and Graphics Composition Engine on ROM
 images. Required binaries are only built, when SYMBIAN_BUILD_GCE flag is defined
 in symbian_os.hrh.
 #define SYMBIAN_INCLUDE_LOCATION_PRIVACY_REQUEST_APIS
 /** #SYMBIAN_INCLUDE_USB_OTG_HOST
 Feature USB Host (and related OTG) binaries are included into romimage
 */
-#undef SYMBIAN_INCLUDE_USB_OTG_HOST
+#define SYMBIAN_INCLUDE_USB_OTG_HOST
 /** #SYMBIAN_INCLUDE_USB_RNDIS
 plugin, RNDIS agent and IP stack packet driver in the ROM.
 Introduced by PREQ1872.
 */
-#undef SYMBIAN_INCLUDE_USB_RNDIS
+#define SYMBIAN_INCLUDE_USB_RNDIS
 /** #SYMBIAN_MULTIMEDIA_A3FDEVSOUND
 This definition is used in symbian A3F build files.
 If this flag is enabled, A3F is build.
 if this flag is disabled, devsound is build.
 paging. From Symbian 9.4 onwards same pool is used by file system cache and thus
 the amount of pages should be increased in order to preserve good system
 performance and memory consumption balance. Increasing the value increases the
 memory consumption.
 */
-#define SYMBIAN_ODP_NUMBER_OF_MAX_LIVE_PAGES               4096
+#define SYMBIAN_ODP_NUMBER_OF_MAX_LIVE_PAGES               65536
 /** #SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES
 Defines the minimum number of 4k live pages available in the system for code
 paging. From Symbian 9.4 onwards same pool is used by file system cache and thus
 the amount of pages should be increased in order to preserve good system
 performance and memory consumption balance. Increasing the value decreases the
 amount of free memory after start up.
 */
-#define SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES               0
+#define SYMBIAN_ODP_NUMBER_OF_MIN_LIVE_PAGES               1024
 /** #SYMBIAN_SYSTEM_STATE_MANAGEMENT
 If SYMBIAN_SYSTEM_STATE_MANAGEMENT is defined, this will enable
 the System State Management Architecture, which supports the
 concept of system states (including startup, normal operation,
 the transitioning between them according to licensee-defined
 policies and procedures.
 This define supports PREQ1871.
 */
-#undef SYMBIAN_SYSTEM_STATE_MANAGEMENT
+#define SYMBIAN_SYSTEM_STATE_MANAGEMENT
 /** #SYMBIAN_USE_DOS_SERVER_SERVICES
 The DOS_SERVER_SERVICES should indicate that the DOS Server Services is present.
 This is needed to turn the RF on in an emergency call when the phone is in
 flight mode.
 */
-#define SYMBIAN_USE_DOS_SERVER_SERVICES
+#undef SYMBIAN_USE_DOS_SERVER_SERVICES
 /** #SYMBIAN_USE_HCI_V2
 Defines if HCIv2 (bluetooth v2.0) is used in image or not.
 */
 #define SYMBIAN_USE_HCI_V2
 /** #SYMBIAN_USE_NOKIA_FEATURE_MANAGER
 The macro NOKIA_FEATURE_MANAGER should indicate that the Nokia version of the
 Feature Manager is present. The Feature Manager was part of the CoreOS, and
 there is a Symbian version of it in 9.5.
 */
-#define SYMBIAN_USE_NOKIA_FEATURE_MANAGER
+#undef SYMBIAN_USE_NOKIA_FEATURE_MANAGER
 /** #USE_MSCDB
 Enable usage of mass storage double buffering.
 */
 #define USE_MSCDB
 #define __MOBILE_ACTIVE_SYNC
 /** #__MP3
 Device supports MP3 audio codec.
 */
-#undef __MP3
+#define __MP3
 /** #__MROUTER
 Device uses Symbian MRrouter technology for PC connectivity.  If this feature is
 on the alternative feature __SRCS shall be off.
 */
 proactive commands or envelope command responses."
 */
 #define __SAT_LANGUAGE_NOTIFICATION
 /** #__SAT_LAUNCH_BROWSER
-"If this flag is enabled, upon receiving SAT Launch Browser command, the ME
+When this flag is enabled, upon receiving SAT Launch Browser command, the ME
 shall decide if it is able to execute the command. See details from 3GPP
-specifications."
+specifications.
 */
 #define __SAT_LAUNCH_BROWSER
 /** #__SAT_MO_SM_CONTROL
 "When this flag is enabled, mobile originated short messages are controlled by
 /** #__UI_TRANSITION_EFFECTS
 Defines whether transition effects are used in UI. Also controls whether the
 effect engine is included in ROM or not.
 */
-#undef __UI_TRANSITION_EFFECTS
+#define __UI_TRANSITION_EFFECTS
 /** #__UI_ZOOM
 This feature activates the zooming support in Series 60 UI.
 */
 #define __UI_ZOOM
 #undef __USB_PICTBRIDGE_UI
 /** #__USB_PTP
 Includes and excludes PTP (Picture Transfer Protocol) components.
 */
-#define __USB_PTP
+#undef __USB_PTP
 /** #__USB_REMOTE_PERSONALITY
 Includes and excludes S60 USB Remote Personality component.
 */
 #define __USB_REMOTE_PERSONALITY
 /** #__WINDOWS_MEDIA
 Device supports Windows Media. In other words it indicates whether WM-related
 components such as ASF-parser and codecs are in place.
 */
-#undef __WINDOWS_MEDIA
+#define _WINDOWS_MEDIA
 /** #__WINDOWS_MEDIA_DRM
 Device supports Windows Media DRM. In other words it indicates whether WMDRM
 related components such as WMDRM MTP plugin and WMDRM PK are in place.
 */
 #define __WINDOWS_MEDIA_DRM
 manage multiple xSP extensions and provide additional functionality (e.g.
 Sorting of xSP tabs, Accessing certain xSP view from external application and
 showing it to user)."
 */
 #define __XSP_EXTENSION_MANAGER
-#endif // __BLDPRIVATE_HRH
+/**
+* block of Feature flags believed to be required for wk12 tb10.1 baseline
+*/
+#define FF_CONTACTS_MYCARD
+#define FF_CONTACTS_REMOTE_LOOKUP
+#define FF_CONTACTS_SOCIAL
+#define FF_DEVICE_ENCRYPTION_FEATURE
+#define FF_DM_BROWSER_ADAPTER
+#define FF_DM_STREAMING_ADAPTER
+#define FF_TMS
+#endif // __BLDPRIVATE_HRH

changeset 41	877bf5d7469a
parent 36	fc38b048ab2f
child 53	cf2e20ee4073