# HG changeset patch # User William Roberts # Date 1255031344 -3600 # Node ID 1cf69c2c2bbd49614e24b20deec3179a532af1d4 # Parent ed6428499142a2e49b8213dfc701a5a0ec0b714d Adjust to /sf/adaptation/qemu, add package_definition.xml and syborg.mrp diff -r ed6428499142 -r 1cf69c2c2bbd README.txt --- a/README.txt Mon Aug 10 09:51:31 2009 +0100 +++ b/README.txt Thu Oct 08 20:49:04 2009 +0100 @@ -15,7 +15,7 @@ Some notes; * The source layout for baseport now matches the Symbian Foundation layout, and - will compile correctly if this repository is unpacked to /sf/os/QEMU. Eventually + will compile correctly if this repository is unpacked to /sf/adaptation/qemu. Eventually the baseport could move into the kernelhwsrv or boardsupport packages, but that would imply changing AsspNKernIncludePath in baseport/syborg/variant.mmh diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/armv5.mbc --- a/baseport/syborg/armv5.mbc Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/armv5.mbc Thu Oct 08 20:49:04 2009 +0100 @@ -31,44 +31,44 @@ abld -k target armv5 SECTION_DIRS -..\..\..\kernelhwsrv\kerneltest\e32utils\group -..\..\..\kernelhwsrv\kernel\eka -..\..\..\kernelhwsrv\kernel\eka\compsupp -..\..\..\kernelhwsrv\userlibandfileserver\fileserver\group -..\..\..\kernelhwsrv\halservices\hal +..\..\..\..\os\kernelhwsrv\kerneltest\e32utils\group +..\..\..\..\os\kernelhwsrv\kernel\eka +..\..\..\..\os\kernelhwsrv\kernel\eka\compsupp +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\group +..\..\..\..\os\kernelhwsrv\halservices\hal ..\syborg -..\..\..\kernelhwsrv\userlibandfileserver\domainmgr\group +..\..\..\..\os\kernelhwsrv\userlibandfileserver\domainmgr\group -..\..\..\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c -..\..\..\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c -..\..\..\kernelhwsrv\kernel\eka\drivers\usbho -..\..\..\kernelhwsrv\kernel\eka\drivers\usbho\usbd +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\usbho +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\usbho\usbd -..\..\..\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 +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\bsp +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\debug +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\ecomm +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\esound +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\ethernet +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\locmedia +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\media +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\trace +..\..\..\..\os\kernelhwsrv\kernel\eka\drivers\usbc +..\..\..\..\os\kernelhwsrv\kernel\eka\euser +..\..\..\..\os\kernelhwsrv\kernel\eka\ewsrv -..\..\..\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 +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\estart +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\etshell +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\iso9660 +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\ntfs +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\scomp +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\sfat +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\sfat32 +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\sftl +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\slffs +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\srofs +..\..\..\..\os\kernelhwsrv\userlibandfileserver\fileserver\srom -..\..\..\kernelhwsrv\kerneltest\e32test\group +..\..\..\..\os\kernelhwsrv\kerneltest\e32test\group test diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/armv5test.mbc --- a/baseport/syborg/armv5test.mbc Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/armv5test.mbc Thu Oct 08 20:49:04 2009 +0100 @@ -37,5 +37,5 @@ abld test -k target armv5 SECTION_DIRS -..\..\..\kernelhwsrv\kerneltest\e32test\group +..\..\..\..\os\kernelhwsrv\kerneltest\e32test\group test diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/bld.inf --- a/baseport/syborg/bld.inf Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/bld.inf Thu Oct 08 20:49:04 2009 +0100 @@ -32,17 +32,17 @@ PRJ_EXTENSIONS start extension base/genexec -option EXTRA_SRC_PATH $(EXTENSION_ROOT)/../../../kernelhwsrv/kernel/eka/kernel +option EXTRA_SRC_PATH $(EXTENSION_ROOT)/../../../../os/kernelhwsrv/kernel/eka/kernel end PRJ_MMPFILES -../../../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 +../../../../os/kernelhwsrv/kernel/eka/kernel/ekern +../../../../os/kernelhwsrv/kernel/eka/kernel/kc_exe +../../../../os/kernelhwsrv/kernel/eka/kernel/exmoncommon +../../../../os/kernelhwsrv/kernel/eka/drivers/medint/medint +../../../../os/kernelhwsrv/userlibandfileserver/fileserver/etshell/eshell +../../../../os/kernelhwsrv/kernel/eka/drivers/trace/btracex +../../../../os/kernelhwsrv/kernel/eka/euser/variant_euser // SYBORG components kasyborg // Variant library @@ -70,7 +70,7 @@ PRJ_EXTENSIONS start extension base/config option PREFIX _syborg_ -option HALPATH $(EXTENSION_ROOT)/../../../kernelhwsrv/halservices +option HALPATH $(EXTENSION_ROOT)/../../../../os/kernelhwsrv/halservices option SOURCE $(EXTENSION_ROOT)/hal end @@ -85,7 +85,7 @@ //option MEMMODEL moving option SOURCES syborg.s option INCLUDES config.inc syborg.inc -option E32PATH $(EXTENSION_ROOT)/../../../kernelhwsrv/kernel +option E32PATH $(EXTENSION_ROOT)/../../../../os/kernelhwsrv/kernel option EXTRA_INC_PATH $(EXTENSION_ROOT)/bootstrap option EXTRA_SRC_PATH $(EXTENSION_ROOT)/bootstrap end diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/hal/hal.mmp --- a/baseport/syborg/hal/hal.mmp Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/hal/hal.mmp Thu Oct 08 20:49:04 2009 +0100 @@ -22,7 +22,7 @@ LINKAS hal.dll NOEXPORTLIBRARY -SOURCEPATH ../../../../kernelhwsrv/halservices/hal/src +SOURCEPATH ../../../../../os/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 ../../../../kernelhwsrv/halservices/hal/~/hal.def +DEFFILE ../../../../../os/kernelhwsrv/halservices/hal/~/hal.def UID 0x1000008d 0x100039e8 VENDORID 0x70000001 diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/keymap/keymap.mmp --- a/baseport/syborg/keymap/keymap.mmp Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/keymap/keymap.mmp Thu Oct 08 20:49:04 2009 +0100 @@ -27,7 +27,7 @@ LIBRARY euser.lib -DEFFILE ../../../../kernelhwsrv/kernel/eka/~/ekdata.def +DEFFILE ../../../../../os/kernelhwsrv/kernel/eka/~/ekdata.def NOSTRICTDEF diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/monitor/monap.mmp --- a/baseport/syborg/monitor/monap.mmp Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/monitor/monap.mmp Thu Oct 08 20:49:04 2009 +0100 @@ -18,7 +18,7 @@ #define __MONAP_MMP__ #include -#include "../../../../kernelhwsrv/kernel/eka/kernel/exmondebug.mmp" +#include "../../../../../os/kernelhwsrv/kernel/eka/kernel/exmondebug.mmp" TARGET VariantTarget(exmondebug,dll) diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/svphostfs/svphostfsy.mmp --- a/baseport/syborg/svphostfs/svphostfsy.mmp Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/svphostfs/svphostfsy.mmp Thu Oct 08 20:49:04 2009 +0100 @@ -36,5 +36,5 @@ TARGETPATH /sys/bin //CAPABILITY TCB ProtServ DiskAdmin AllFiles PowerMgmt CommDD -#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 +#include "../../../../../os/kernelhwsrv/userlibandfileserver/fileserver/group/f32caps.mmh" // Capabilities of File Server process +#include "../../../../../os/kernelhwsrv/userlibandfileserver/fileserver/group/f32.mmh" // Generic definitions for the whole f32 component diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/syborg.mrp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/baseport/syborg/syborg.mrp Thu Oct 08 20:49:04 2009 +0100 @@ -0,0 +1,11 @@ +# component name "Syborg baseport" + +component syborg +source \sf\adaptation\qemu\baseport\syborg + +binary \sf\adaptation\qemu\baseport\syborg all +exports \sf\adaptation\qemu\baseport\syborg + +notes_source \component_defs\release.src + +ipr E diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/test/bld.inf --- a/baseport/syborg/test/bld.inf Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/test/bld.inf Thu Oct 08 20:49:04 2009 +0100 @@ -19,22 +19,22 @@ ARMV5 PRJ_TESTEXPORTS -autoexec.bat \epoc32\rom\syborg\ // +autoexec.bat /epoc32/rom/syborg/ // PRJ_TESTMMPFILES // Drivers // requires baseport specific definitions for TIMER and TimeDelta in d_mstim.cpp -..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_mstim support +../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_mstim support // requires baseport specific definitions for TIMER and TimeDelta and LongTimeDelta in d_tick.cpp -..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_tick support +../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_tick support // requires definitions for KTickPeriodMs and KTicksPerMillisecond. These are baseport specific and require changes to d_latncy -..\..\..\..\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 +../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_latncy support +../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_shadow support +../../../../../os/kernelhwsrv/kerneltest/e32test/group/bm_pdd support +//../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_sharedio support // needs dma.dll -//..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_dma support // DMA kernel-side test harness for real DMA framework +//../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_dma support // DMA kernel-side test harness for real DMA framework // needs epbusm.dll -//..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_medch support -..\..\..\..\kernelhwsrv\kerneltest\e32test\group\d_cache support +//../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_medch support +../../../../../os/kernelhwsrv/kerneltest/e32test/group/d_cache support diff -r ed6428499142 -r 1cf69c2c2bbd baseport/syborg/variant.mmh --- a/baseport/syborg/variant.mmh Mon Aug 10 09:51:31 2009 +0100 +++ b/baseport/syborg/variant.mmh Thu Oct 08 20:49:04 2009 +0100 @@ -107,7 +107,7 @@ macro __EMI_SUPPORT__ #define VariantTarget(name,ext) _syborg_##name##.##ext -#define AsspNKernIncludePath /sf/os/QEMU/baseport/syborg/specific +#define AsspNKernIncludePath /sf/adaptation/qemu/baseport/syborg/specific #define VariantMediaDefIncludePath /epoc32/include/syborg #define PlatformLib kasyborg.lib @@ -119,7 +119,7 @@ systeminclude /epoc32/include/memmodel/epoc/multiple systeminclude /epoc32/include/memmodel/epoc/multiple/arm -systeminclude ../../../kernelhwsrv/driversupport/socassp/interface +systeminclude ../../../../os/kernelhwsrv/driversupport/socassp/interface // Uncomment for T_USERCOMDEB test //#define BUILD_TESTS diff -r ed6428499142 -r 1cf69c2c2bbd package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Thu Oct 08 20:49:04 2009 +0100 @@ -0,0 +1,10 @@ + + + + + + + + + +