--- a/haitest/bspsvs/suite/bsp/digitiser/group/bld.inf Tue Feb 02 01:39:10 2010 +0200
+++ b/haitest/bspsvs/suite/bsp/digitiser/group/bld.inf Mon Feb 08 10:11:09 2010 +0000
@@ -58,6 +58,11 @@
../testdata/tube/t_digitiser.tcs z:/base/digitiser/t_digitiser.tcs
#endif
+#if defined(TEST_DEVICE_SYBORG)
+../testdata/syborg/t_digitiser.ini z:/base/digitiser/t_digitiser.ini
+../testdata/syborg/t_digitiser.tcs z:/base/digitiser/t_digitiser.tcs
+#endif
+
PRJ_TESTMMPFILES
t_digitiser.mmp
--- a/haitest/bspsvs/suite/bsp/group/bld.inf Tue Feb 02 01:39:10 2010 +0200
+++ b/haitest/bspsvs/suite/bsp/group/bld.inf Mon Feb 08 10:11:09 2010 +0000
@@ -18,6 +18,6 @@
#include "../digitiser/group/bld.inf"
#include "../uart/group/bld.inf"
#include "../mmc/group/bld.inf"
-#include "../sound/group/bld.inf"
+//#include "../sound/group/bld.inf"
#include "../keypad/group/bld.inf"
#include "../usb/group/bld.inf"
--- a/haitest/bspsvs/suite/bsp/keypad/group/bld.inf Tue Feb 02 01:39:10 2010 +0200
+++ b/haitest/bspsvs/suite/bsp/keypad/group/bld.inf Mon Feb 08 10:11:09 2010 +0000
@@ -17,7 +17,6 @@
#include "../../../group/device.cfg"
PRJ_TESTEXPORTS
-//t_keypad.oby /src/cedar/generic/base/e32/rombuild/t_keypad.oby
t_keypad.oby /sf/os/kernelhwsrv/kernel/eka/rombuild/t_keypad.oby
t_keypad.oby /epoc32/rom/haitests/t_keypad.oby
t_keypad.iby /epoc32/rom/haitests/t_keypad.iby
@@ -32,31 +31,28 @@
../testdata/BASE-BSP-KEYPAD-DRIVER.ini z:/base/keypad/base-bsp-keypad-driver.ini
#if defined(TEST_DEVICE_H4HRP)
-../testdata/h4hrp/t_keypad.ini /epoc32/release/armv5/udeb/z/base/keypad/t_keypad.ini
-../testdata/h4hrp/t_keypad.tcs /epoc32/release/armv5/udeb/z/base/keypad/t_keypad.tcs
-../testdata/h4hrp/t_keypad.ini /epoc32/release/armv5/urel/z/base/keypad/t_keypad.ini
-../testdata/h4hrp/t_keypad.tcs /epoc32/release/armv5/urel/z/base/keypad/t_keypad.tcs
+../testdata/h4hrp/t_keypad.ini z:/base/keypad/t_keypad.ini
+../testdata/h4hrp/t_keypad.tcs z:/base/keypad/t_keypad.tcs
#endif
#if defined(TEST_DEVICE_H6HRP)
-../testdata/h6hrp/t_keypad.ini /epoc32/release/armv5/udeb/z/base/keypad/t_keypad.ini
-../testdata/h6hrp/t_keypad.tcs /epoc32/release/armv5/udeb/z/base/keypad/t_keypad.tcs
-../testdata/h6hrp/t_keypad.ini /epoc32/release/armv5/urel/z/base/keypad/t_keypad.ini
-../testdata/h6hrp/t_keypad.tcs /epoc32/release/armv5/urel/z/base/keypad/t_keypad.tcs
+../testdata/h6hrp/t_keypad.ini z:/base/keypad/t_keypad.ini
+../testdata/h6hrp/t_keypad.tcs z:/base/keypad/t_keypad.tcs
#endif
#if defined(TEST_DEVICE_DEVLON52)
-../testdata/devlon52/t_keypad.ini /epoc32/release/armv5/udeb/z/base/keypad/t_keypad.ini
-../testdata/devlon52/t_keypad.tcs /epoc32/release/armv5/udeb/z/base/keypad/t_keypad.tcs
-../testdata/devlon52/t_keypad.ini /epoc32/release/armv5/urel/z/base/keypad/t_keypad.ini
-../testdata/devlon52/t_keypad.tcs /epoc32/release/armv5/urel/z/base/keypad/t_keypad.tcs
+../testdata/devlon52/t_keypad.ini z:/base/keypad/t_keypad.ini
+../testdata/devlon52/t_keypad.tcs z:/base/keypad/t_keypad.tcs
#endif
#if defined(TEST_DEVICE_MERLIN)
-../testdata/merlin/t_keypad.ini /epoc32/release/armv5/udeb/z/base/keypad/t_keypad.ini
-../testdata/merlin/t_keypad.tcs /epoc32/release/armv5/udeb/z/base/keypad/t_keypad.tcs
-../testdata/merlin/t_keypad.ini /epoc32/release/armv5/urel/z/base/keypad/t_keypad.ini
-../testdata/merlin/t_keypad.tcs /epoc32/release/armv5/urel/z/base/keypad/t_keypad.tcs
+../testdata/merlin/t_keypad.ini z:/base/keypad/t_keypad.ini
+../testdata/merlin/t_keypad.tcs z:/base/keypad/t_keypad.tcs
+#endif
+
+#if defined(TEST_DEVICE_SYBORG)
+../testdata/syborg/t_keypad.ini z:/base/keypad/t_keypad.ini
+../testdata/syborg/t_keypad.tcs z:/base/keypad/t_keypad.tcs
#endif
PRJ_TESTMMPFILES
--- a/haitest/bspsvs/suite/bsp/lcd/group/bld.inf Tue Feb 02 01:39:10 2010 +0200
+++ b/haitest/bspsvs/suite/bsp/lcd/group/bld.inf Mon Feb 08 10:11:09 2010 +0000
@@ -35,34 +35,28 @@
../testdata/base-bsp-screen-driver-modeless.ini z:/base/screen/base-bsp-screen-driver-modeless.ini
#if defined(TEST_DEVICE_H4HRP)
-../testdata/h4hrp/armv5/t_screen.ini /epoc32/release/armv5/udeb/z/base/screen/t_screen.ini
-../testdata/h4hrp/armv5/t_screen.ini /epoc32/release/armv5/urel/z/base/screen/t_screen.ini
-../testdata/h4hrp/armv5/t_screen.tcs /epoc32/release/armv5/udeb/z/base/screen/t_screen.tcs
-../testdata/h4hrp/armv5/t_screen.tcs /epoc32/release/armv5/urel/z/base/screen/t_screen.tcs
+../testdata/h4hrp/armv5/t_screen.ini z:/base/screen/t_screen.ini
+../testdata/h4hrp/armv5/t_screen.tcs z:/base/screen/t_screen.tcs
#endif
#if defined(TEST_DEVICE_H6HRP)
-../testdata/h6hrp/armv5/t_screen.ini /epoc32/release/armv5/udeb/z/base/screen/t_screen.ini
-../testdata/h6hrp/armv5/t_screen.ini /epoc32/release/armv5/urel/z/base/screen/t_screen.ini
-../testdata/h6hrp/armv5/t_screen.tcs /epoc32/release/armv5/udeb/z/base/screen/t_screen.tcs
-../testdata/h6hrp/armv5/t_screen.tcs /epoc32/release/armv5/urel/z/base/screen/t_screen.tcs
+../testdata/h6hrp/armv5/t_screen.ini z:/base/screen/t_screen.ini
+../testdata/h6hrp/armv5/t_screen.tcs z:/base/screen/t_screen.tcs
#endif
#if defined(TEST_DEVICE_DEVLON51)
-../testdata/devlon51/armv5/t_screen.ini /epoc32/release/armv5/udeb/z/base/screen/t_screen.ini
-../testdata/devlon51/armv5/t_screen.ini /epoc32/release/armv5/urel/z/base/screen/t_screen.ini
-../testdata/devlon51/armv5/t_screen.tcs /epoc32/release/armv5/udeb/z/base/screen/t_screen.tcs
-../testdata/devlon51/armv5/t_screen.tcs /epoc32/release/armv5/urel/z/base/screen/t_screen.tcs
+../testdata/devlon51/armv5/t_screen.ini z:/base/screen/t_screen.ini
+../testdata/devlon51/armv5/t_screen.tcs z:/base/screen/t_screen.tcs
#endif
#if defined(TEST_DEVICE_DEVLON52)
-../testdata/devlon52/armv5/t_screen.ini /epoc32/release/armv5/udeb/z/base/screen/t_screen.ini
-../testdata/devlon52/armv5/t_screen.ini /epoc32/release/armv5/urel/z/base/screen/t_screen.ini
-../testdata/devlon52/armv5/t_screen.tcs /epoc32/release/armv5/udeb/z/base/screen/t_screen.tcs
-../testdata/devlon52/armv5/t_screen.tcs /epoc32/release/armv5/urel/z/base/screen/t_screen.tcs
+../testdata/devlon52/armv5/t_screen.ini z:/base/screen/t_screen.ini
+../testdata/devlon52/armv5/t_screen.tcs z:/base/screen/t_screen.tcs
#endif
#if defined(TEST_DEVICE_MERLIN)
-../testdata/merlin/armv5/t_screen.ini /epoc32/release/armv5/udeb/z/base/screen/t_screen.ini
-../testdata/merlin/armv5/t_screen.ini /epoc32/release/armv5/urel/z/base/screen/t_screen.ini
-../testdata/merlin/armv5/t_screen.tcs /epoc32/release/armv5/udeb/z/base/screen/t_screen.tcs
-../testdata/merlin/armv5/t_screen.tcs /epoc32/release/armv5/urel/z/base/screen/t_screen.tcs
+../testdata/merlin/armv5/t_screen.ini z:/base/screen/t_screen.ini
+../testdata/merlin/armv5/t_screen.tcs z:/base/screen/t_screen.tcs
+#endif
+#if defined(TEST_DEVICE_SYBORG)
+../testdata/syborg/armv5/t_screen.ini z:/base/screen/t_screen.ini
+../testdata/syborg/armv5/t_screen.tcs z:/base/screen/t_screen.tcs
#endif
--- a/haitest/bspsvs/suite/bsp/mmc/ldd/group/d_mmcsdif.mmp Tue Feb 02 01:39:10 2010 +0200
+++ b/haitest/bspsvs/suite/bsp/mmc/ldd/group/d_mmcsdif.mmp Mon Feb 08 10:11:09 2010 +0000
@@ -36,7 +36,7 @@
SYSTEMINCLUDE ../inc
LIBRARY epbusmmc.lib
-LIBRARY epbussd.lib
+//LIBRARY epbussd.lib
epocallowdlldata
--- a/haitest/bspsvs/suite/group/device.cfg Tue Feb 02 01:39:10 2010 +0200
+++ b/haitest/bspsvs/suite/group/device.cfg Mon Feb 08 10:11:09 2010 +0000
@@ -18,7 +18,7 @@
// Used within the build process to export the correct files for the supported devices
// Uncomment only one of the devices definied in listed below
-#define TEST_DEVICE_H4HRP
+//#define TEST_DEVICE_H4HRP
//#define TEST_DEVICE_H6HRP
//#define TEST_DEVICE_DEVLON51
//#define TEST_DEVICE_DEVLON52
@@ -26,3 +26,4 @@
//#define TEST_DEVICE_TUBE
//#define TEST_DEVICE_LUMIERE
//#define TEST_DEVICE_TOPAZMXC
+#define TEST_DEVICE_SYBORG
--- a/haitest/bspsvs/testdata/bsp/common/group/bld.inf Tue Feb 02 01:39:10 2010 +0200
+++ b/haitest/bspsvs/testdata/bsp/common/group/bld.inf Mon Feb 08 10:11:09 2010 +0000
@@ -36,6 +36,9 @@
#if defined(TEST_DEVICE_TUBE)
../tube/t_prompt.ini /epoc32/data/z/base/t_prompt.ini
#endif
+#if defined(TEST_DEVICE_SYBORG)
+../syborg/t_prompt.ini /epoc32/data/z/base/t_prompt.ini
+#endif
t_prompt.iby /epoc32/rom/haitests/t_prompt.iby