--- a/sf_config/config/inc/bldprivate.hrh Wed Apr 21 10:23:46 2010 +0100
+++ b/sf_config/config/inc/bldprivate.hrh Wed Apr 28 09:51:11 2010 +0100
@@ -220,18 +220,18 @@
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
@@ -250,13 +250,13 @@
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.
@@ -413,14 +413,14 @@
/** #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.
@@ -442,7 +442,7 @@
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
@@ -451,7 +451,7 @@
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
@@ -470,7 +470,7 @@
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.
@@ -1346,7 +1346,7 @@
/** #__MP3
Device supports MP3 audio codec.
*/
-#undef __MP3
+#define __MP3
/** #__MROUTER
Device uses Symbian MRrouter technology for PC connectivity. If this feature is
@@ -2090,7 +2090,7 @@
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.
@@ -2130,7 +2130,7 @@
/** #__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.
@@ -2186,8 +2186,9 @@
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.
@@ -2206,6 +2207,6 @@
showing it to user)."
*/
#define __XSP_EXTENSION_MANAGER
-
+
#endif // __BLDPRIVATE_HRH