diff -r 000000000000 -r cec860690d41 haitest/bspsvs/suite/bsp/mmc/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/haitest/bspsvs/suite/bsp/mmc/group/bld.inf	Tue Feb 02 01:39:10 2010 +0200
@@ -0,0 +1,107 @@
+//
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#include "../../../group/device.cfg"
+#include "../../../../testdata/bsp/common/group/bld.inf"
+
+PRJ_TESTEXPORTS
+//t_mmcsd.oby													/src/cedar/generic/base/e32/rombuild/t_mmcsd.oby
+t_mmcsd.oby													/sf/os/kernelhwsrv/kernel/eka/rombuild/t_mmcsd.oby
+t_mmcsd.oby													/epoc32/rom/haitests/t_mmcsd.oby
+t_mmcsd.iby													/epoc32/rom/haitests/t_mmcsd.iby
+t_mmcsd_binaries.iby										/epoc32/rom/haitests/t_mmcsd_binaries.iby
+t_mmcsd_testdata.iby										/epoc32/rom/haitests/t_mmcsd_testdata.iby
+
+../pkg/t_mmc.bat											z:/base/t_mmc.bat
+../pkg/t_sd.bat												z:/base/t_sd.bat
+
+../scripts/BASE-BSP-MMC-SOCKET-DRIVER.script				z:/base/mmcsd/base-bsp-mmc-socket-driver.script
+../testdata/BASE-BSP-MMC-SOCKET-DRIVER.ini					z:/base/mmcsd/base-bsp-mmc-socket-driver.ini
+
+../scripts/BASE-BSP-SD-SOCKET-DRIVER.script					z:/base/mmcsd/base-bsp-sd-socket-driver.script
+../testdata/BASE-BSP-SD-SOCKET-DRIVER.ini					z:/base/mmcsd/base-bsp-sd-socket-driver.ini
+
+../scripts/BASE-BSP-MMC-SOCKET-DRIVER-MANUAL.script			z:/base/mmcsd/base-bsp-mmc-socket-driver-manual.script
+../testdata/BASE-BSP-MMC-SOCKET-DRIVER-MANUAL.ini			z:/base/mmcsd/base-bsp-mmc-socket-driver-manual.ini
+
+../scripts/BASE-BSP-SD-SOCKET-DRIVER-MANUAL.script			z:/base/mmcsd/base-bsp-sd-socket-driver-manual.script
+../testdata/BASE-BSP-SD-SOCKET-DRIVER-MANUAL.ini			z:/base/mmcsd/base-bsp-sd-socket-driver-manual.ini
+
+../scripts/BASE-BSP-MMC-STACK-DRIVER.script					z:/base/mmcsd/base-bsp-mmc-stack-driver.script
+../testdata/BASE-BSP-MMC-STACK-DRIVER.ini					z:/base/mmcsd/base-bsp-mmc-stack-driver.ini
+
+../scripts/BASE-BSP-SD-STACK-DRIVER.script					z:/base/mmcsd/base-bsp-sd-stack-driver.script
+../testdata/BASE-BSP-SD-STACK-DRIVER.ini					z:/base/mmcsd/base-bsp-sd-stack-driver.ini
+
+../scripts/BASE-BSP-MMC-STACK-DRIVER-MANUAL.script			z:/base/mmcsd/base-bsp-mmc-stack-driver-manual.script
+../testdata/BASE-BSP-MMC-STACK-DRIVER-MANUAL.ini			z:/base/mmcsd/base-bsp-mmc-stack-driver-manual.ini
+
+../scripts/BASE-BSP-SD-STACK-DRIVER-MANUAL.script			z:/base/mmcsd/base-bsp-sd-stack-driver-manual.script
+../testdata/BASE-BSP-SD-STACK-DRIVER-MANUAL.ini				z:/base/mmcsd/base-bsp-sd-stack-driver-manual.ini
+
+../scripts/BASE-BSP-MMC-PSU-DRIVER.script					z:/base/mmcsd/base-bsp-mmc-psu-driver.script
+../testdata/BASE-BSP-MMC-PSU-DRIVER.ini						z:/base/mmcsd/base-bsp-mmc-psu-driver.ini
+
+../scripts/BASE-BSP-SD-PSU-DRIVER.script					z:/base/mmcsd/base-bsp-sd-psu-driver.script
+../testdata/BASE-BSP-SD-PSU-DRIVER.ini						z:/base/mmcsd/base-bsp-sd-psu-driver.ini
+
+../scripts/BASE-BSP-MMC-MEDIACHANGE-DRIVER.script			z:/base/mmcsd/base-bsp-mmc-mediachange-driver.script
+../testdata/BASE-BSP-MMC-MEDIACHANGE-DRIVER.ini				z:/base/mmcsd/base-bsp-mmc-mediachange-driver.ini
+
+../scripts/BASE-BSP-SD-MEDIACHANGE-DRIVER.script			z:/base/mmcsd/base-bsp-sd-mediachange-driver.script
+../testdata/BASE-BSP-SD-MEDIACHANGE-DRIVER.ini				z:/base/mmcsd/base-bsp-sd-mediachange-driver.ini
+
+../scripts/BASE-BSP-MMC-MEDIACHANGE-DRIVER-MANUAL.script	z:/base/mmcsd/base-bsp-mmc-mediachange-driver-manual.script
+../testdata/BASE-BSP-MMC-MEDIACHANGE-DRIVER-MANUAL.ini		z:/base/mmcsd/base-bsp-mmc-mediachange-driver-manual.ini
+
+../scripts/BASE-BSP-SD-MEDIACHANGE-DRIVER-MANUAL.script		z:/base/mmcsd/base-bsp-sd-mediachange-driver-manual.script
+../testdata/BASE-BSP-SD-MEDIACHANGE-DRIVER-MANUAL.ini		z:/base/mmcsd/base-bsp-sd-mediachange-driver-manual.ini
+
+../scripts/BASE-BSP-MMC-PSUBASE-DRIVER.script				z:/base/mmcsd/base-bsp-mmc-psubase-driver.script
+../testdata/BASE-BSP-MMC-PSUBASE-DRIVER.ini					z:/base/mmcsd/base-bsp-mmc-psubase-driver.ini
+
+../scripts/BASE-BSP-SD-PSUBASE-DRIVER.script				z:/base/mmcsd/base-bsp-sd-psubase-driver.script
+../testdata/BASE-BSP-SD-PSUBASE-DRIVER.ini					z:/base/mmcsd/base-bsp-sd-psubase-driver.ini
+
+
+#if defined(TEST_DEVICE_H4HRP)
+../testdata/h4hrp/mmc/t_mmc.ini								z:/base/mmcsd/t_mmc.ini
+../testdata/h4hrp/sd/t_sd.ini								z:/base/mmcsd/t_sd.ini
+../testdata/h4hrp/t_mmcsd.tcs								z:/base/mmcsd/t_mmcsd.tcs
+
+#endif
+
+#if defined(TEST_DEVICE_H6HRP)
+../testdata/h6hrp/mmc/t_mmc.ini								z:/base/mmcsd/t_mmc.ini
+../testdata/h6hrp/sd/t_sd.ini								z:/base/mmcsd/t_sd.ini
+../testdata/h6hrp/t_mmcsd.tcs								z:/base/mmcsd/t_mmcsd.tcs
+
+#endif
+
+#if defined(TEST_DEVICE_DEVLON52)
+
+../testdata/devlon52/mmc/t_mmc.ini							z:/base/mmcsd/t_mmc.ini
+../testdata/devlon52/sd/t_sd.ini							z:/base/mmcsd/t_sd.ini
+../testdata/devlon52/t_mmcsd.tcs							z:/base/mmcsd/t_mmcsd.tcs
+
+#endif
+
+// MMCSD Test LDD Driver Build
+#include "../ldd/group/bld.inf"
+
+PRJ_TESTMMPFILES
+
+t_mmcsd.mmp