--- a/baseport/syborg/armv5.mbc Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/armv5.mbc Tue Aug 04 11:50:27 2009 +0100
@@ -31,44 +31,44 @@
abld -k target armv5
SECTION_DIRS
-..\e32utils\group
-..\e32
-..\e32\compsupp
-..\f32\group
-..\hal
+..\..\..\kernelhwsrv\kerneltest\e32utils\group
+..\..\..\kernelhwsrv\kernel\eka
+..\..\..\kernelhwsrv\kernel\eka\compsupp
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\group
+..\..\..\kernelhwsrv\halservices\hal
..\syborg
-..\domain\group
+..\..\..\kernelhwsrv\userlibandfileserver\domainmgr\group
-..\e32\drivers\pbus\mmc\sdcard\sdcard3c
-..\e32\drivers\pbus\mmc\sdcard\sdcard4c
+..\..\..\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c
+..\..\..\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c
-..\e32\drivers\usbho
-..\e32\drivers\usbho\usbd
+..\..\..\kernelhwsrv\kernel\eka\drivers\usbho
+..\..\..\kernelhwsrv\kernel\eka\drivers\usbho\usbd
-..\e32\drivers\bsp
-..\e32\drivers\debug
-..\e32\drivers\ecomm
-..\e32\drivers\esound
-..\e32\drivers\ethernet
-..\e32\drivers\locmedia
-..\e32\drivers\media
-..\e32\drivers\trace
-..\e32\drivers\usbc
-..\e32\euser
-..\e32\ewsrv
+..\..\..\kernelhwsrv\kernel\eka\drivers\bsp
+..\..\..\kernelhwsrv\kernel\eka\drivers\debug
+..\..\..\kernelhwsrv\kernel\eka\drivers\ecomm
+..\..\..\kernelhwsrv\kernel\eka\drivers\esound
+..\..\..\kernelhwsrv\kernel\eka\drivers\ethernet
+..\..\..\kernelhwsrv\kernel\eka\drivers\locmedia
+..\..\..\kernelhwsrv\kernel\eka\drivers\media
+..\..\..\kernelhwsrv\kernel\eka\drivers\trace
+..\..\..\kernelhwsrv\kernel\eka\drivers\usbc
+..\..\..\kernelhwsrv\kernel\eka\euser
+..\..\..\kernelhwsrv\kernel\eka\ewsrv
-..\f32\estart
-..\f32\etshell
-..\f32\iso9660
-..\f32\ntfs
-..\f32\scomp
-..\f32\sfat
-..\f32\sfat32
-..\f32\sftl
-..\f32\slffs
-..\f32\smassstorage
-..\f32\srofs
-..\f32\srom
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\estart
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\etshell
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\iso9660
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\ntfs
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\scomp
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\sfat
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\sfat32
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\sftl
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\slffs
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\smassstorage
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\srofs
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\srom
-..\e32test\group
-..\syborg\test
+..\..\..\kernelhwsrv\kerneltest\e32test\group
+test
--- a/baseport/syborg/armv5test.mbc Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/armv5test.mbc Tue Aug 04 11:50:27 2009 +0100
@@ -37,5 +37,5 @@
abld test -k target armv5
SECTION_DIRS
-..\e32test\group
-..\syborg\test
+..\..\..\kernelhwsrv\kerneltest\e32test\group
+test
--- a/baseport/syborg/bld.inf Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/bld.inf Tue Aug 04 11:50:27 2009 +0100
@@ -30,17 +30,17 @@
PRJ_EXTENSIONS
start extension base/genexec
-option EXTRA_SRC_PATH $(TO_BLDINF)/../e32/kernel
+option EXTRA_SRC_PATH $(TO_BLDINF)/../../../kernelhwsrv/kernel/eka/kernel
end
PRJ_MMPFILES
-..\e32\kernel\ekern
-..\e32\kernel\kc_exe
-..\e32\kernel\exmoncommon
-..\e32\drivers\medint\medint
-..\f32\etshell\eshell
-..\e32\drivers\trace\btracex
-..\e32\euser\variant_euser
+..\..\..\kernelhwsrv\kernel\eka\kernel\ekern
+..\..\..\kernelhwsrv\kernel\eka\kernel\kc_exe
+..\..\..\kernelhwsrv\kernel\eka\kernel\exmoncommon
+..\..\..\kernelhwsrv\kernel\eka\drivers\medint\medint
+..\..\..\kernelhwsrv\userlibandfileserver\fileserver\etshell\eshell
+..\..\..\kernelhwsrv\kernel\eka\drivers\trace\btracex
+..\..\..\kernelhwsrv\kernel\eka\euser\variant_euser
// SYBORG components
kasyborg // Variant library
--- a/baseport/syborg/hal/hal.mmp Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/hal/hal.mmp Tue Aug 04 11:50:27 2009 +0100
@@ -22,7 +22,7 @@
LINKAS hal.dll
NOEXPORTLIBRARY
-SOURCEPATH ..\..\hal\src
+SOURCEPATH ..\..\..\..\kernelhwsrv\halservices\hal\src
SOURCE hal_main.cpp userhal.cpp
SOURCEPATH \epoc32\build\generatedcpp\hal
@@ -31,7 +31,7 @@
SYSTEMINCLUDE \epoc32\include \epoc32\include\kernel
LIBRARY euser.lib
-DEFFILE ..\..\hal\~\hal.def
+DEFFILE ..\..\..\..\kernelhwsrv\halservices\hal\~\hal.def
UID 0x1000008d 0x100039e8
VENDORID 0x70000001
--- a/baseport/syborg/keymap/keymap.mmp Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/keymap/keymap.mmp Tue Aug 04 11:50:27 2009 +0100
@@ -27,7 +27,7 @@
LIBRARY euser.lib
-DEFFILE ..\..\e32\~\ekdata.def
+DEFFILE ..\..\..\..\kernelhwsrv\kernel\eka\~\ekdata.def
NOSTRICTDEF
--- a/baseport/syborg/monitor/monap.mmp Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/monitor/monap.mmp Tue Aug 04 11:50:27 2009 +0100
@@ -18,7 +18,7 @@
#define __MONAP_MMP__
#include <variant.mmh>
-#include "..\..\e32\kernel\exmondebug.mmp"
+#include "..\..\..\..\kernelhwsrv\kernel\eka\kernel\exmondebug.mmp"
TARGET VariantTarget(exmondebug,dll)
--- a/baseport/syborg/svphostfs/svphostfsy.mmp Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/svphostfs/svphostfsy.mmp Tue Aug 04 11:50:27 2009 +0100
@@ -36,5 +36,5 @@
TARGETPATH /sys/bin
//CAPABILITY TCB ProtServ DiskAdmin AllFiles PowerMgmt CommDD
-#include "../../f32/group/f32caps.mmh" // Capabilities of File Server process
-#include "../../f32/group/f32.mmh" // Generic definitions for the whole f32 component
+#include "../../../../kernelhwsrv/userlibandfileserver/fileserver/group/f32caps.mmh" // Capabilities of File Server process
+#include "../../../../kernelhwsrv/userlibandfileserver/fileserver/group/f32.mmh" // Generic definitions for the whole f32 component
--- a/baseport/syborg/test/bld.inf Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/test/bld.inf Tue Aug 04 11:50:27 2009 +0100
@@ -25,16 +25,16 @@
// Drivers
// requires baseport specific definitions for TIMER and TimeDelta in d_mstim.cpp
-..\..\e32test\group\d_mstim support
+..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_mstim support
// requires baseport specific definitions for TIMER and TimeDelta and LongTimeDelta in d_tick.cpp
-..\..\e32test\group\d_tick support
+..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_tick support
// requires definitions for KTickPeriodMs and KTicksPerMillisecond. These are baseport specific and require changes to d_latncy
-..\..\e32test\group\d_latncy support
-..\..\e32test\group\d_shadow support
-..\..\e32test\group\bm_pdd support
-//..\..\e32test\group\d_sharedio support
+..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_latncy support
+..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_shadow support
+..\..\..\..\kernelhwsrv\kerneltest\e32test\group\bm_pdd support
+//..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_sharedio support
// needs dma.dll
-//..\..\e32test\group\d_dma support // DMA kernel-side test harness for real DMA framework
+//..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_dma support // DMA kernel-side test harness for real DMA framework
// needs epbusm.dll
-//..\..\e32test\group\d_medch support
-..\..\e32test\group\d_cache support
+//..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_medch support
+..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_cache support
--- a/baseport/syborg/variant.mmh Tue Aug 04 10:28:23 2009 +0100
+++ b/baseport/syborg/variant.mmh Tue Aug 04 11:50:27 2009 +0100
@@ -107,7 +107,7 @@
macro __EMI_SUPPORT__
#define VariantTarget(name,ext) _syborg_##name##.##ext
-#define AsspNKernIncludePath \..\..\src\cedar\generic\base\syborg\specific
+#define AsspNKernIncludePath \..\..\..\unref\orphan\cedgen\src\cedar\generic\base\syborg\specific
#define VariantMediaDefIncludePath AsspNKernIncludePath
#define PlatformLib kasyborg.lib
@@ -119,7 +119,7 @@
systeminclude \epoc32\include\memmodel\epoc\multiple
systeminclude \epoc32\include\memmodel\epoc\multiple\arm
-systeminclude ..\soc\interface
+systeminclude ..\..\..\kernelhwsrv\driversupport\socassp\interface
// Uncomment for T_USERCOMDEB test
//#define BUILD_TESTS