--- a/omap3530/assp/inc/assp.mmh Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/assp/inc/assp.mmh Sun Nov 21 00:54:40 2010 +0000
@@ -139,3 +139,7 @@
library AsspTarget(kaomap3530,lib)
#endif
+// Enable VFP3
+#define USE_VFP_MATH
+macro __CPU_HAS_VFP
+macro __VFP_V3
--- a/omap3530/beagle_drivers/hal/bld.inf Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagle_drivers/hal/bld.inf Sun Nov 21 00:54:40 2010 +0000
@@ -21,7 +21,7 @@
PRJ_EXTENSIONS
start extension base/config
-option HALPATH $(EXTENSION_ROOT)/../../../../../../../sf/os/kernelhwsrv/halservices
+option HALPATH $(EXTENSION_ROOT)/../../../../../../sf/os/kernelhwsrv/halservices
option PREFIX _beagle_
option SOURCE $(EXTENSION_ROOT)/.
--- a/omap3530/beagle_drivers/hal/config.hcf Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagle_drivers/hal/config.hcf Sun Nov 21 00:54:40 2010 +0000
@@ -97,3 +97,4 @@
EMaximumRestartStartupModes = GetMaximumRestartStartupModes
ECustomResourceDrive : set = 0
EDisplayNumberOfScreens=0
+EHardwareFloatingPoint = GetHardwareFloatingPoint
--- a/omap3530/beagle_drivers/hal/hal.mmp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagle_drivers/hal/hal.mmp Sun Nov 21 00:54:40 2010 +0000
@@ -20,7 +20,7 @@
linkas hal.dll
noexportlibrary
-sourcepath ../../../../../../../sf/os/kernelhwsrv/halservices/hal/src
+sourcepath ../../../../../../sf/os/kernelhwsrv/halservices/hal/src
source hal_main.cpp userhal.cpp
sourcepath +/build/generatedcpp/hal
@@ -30,7 +30,7 @@
library euser.lib
-deffile ../../../../../../../sf/os/kernelhwsrv/halservices/hal/~/hal.def
+deffile ../../../../../../sf/os/kernelhwsrv/halservices/hal/~/hal.def
uid 0x1000008d 0x100039e8
--- a/omap3530/beagle_drivers/keytran/keymap.mmp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagle_drivers/keytran/keymap.mmp Sun Nov 21 00:54:40 2010 +0000
@@ -37,7 +37,7 @@
library euser.lib
-deffile ../../../../../../../sf/os/kernelhwsrv/kernel/eka/~/ekdata.def
+deffile ../../../../../../sf/os/kernelhwsrv/kernel/eka/~/ekdata.def
nostrictdef
noexportlibrary
--- a/omap3530/beagle_drivers/medstaticrd/beagle_medstaticrd.cpp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagle_drivers/medstaticrd/beagle_medstaticrd.cpp Sun Nov 21 00:54:40 2010 +0000
@@ -19,7 +19,7 @@
#include "locmedia.h"
#include "platform.h"
-#include "../../beagleboard/inc/variantmediadef.h"
+#include "variantmediadef.h"
#include "beagle_medstaticrd.h"
//#include "syborg.h"
@@ -522,7 +522,9 @@
memcpy( iTransferBufferLin, (TAny *)(iDiscBufferLin+(aTransactionSectorOffset<<9)), aTransactionSectorCount*512 );
}
iLatestTransferSectorCount = aTransactionSectorCount;
- Isr(this); // terrible hack, we've yransferred all the sectors and now we pretend to generate an interrupt
+
+ // Isr(this); // terrible hack, we've yransferred all the sectors and now we pretend to generate an interrupt
+ iSessionEndDfc.Enque();
}
else
{
--- a/omap3530/beagle_drivers/medstaticrd/medstaticrd.mmp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagle_drivers/medstaticrd/medstaticrd.mmp Sun Nov 21 00:54:40 2010 +0000
@@ -27,6 +27,7 @@
systeminclude +/include/drivers
SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
SYSTEMINCLUDE AsspNKernIncludePath
+USERINCLUDE ../../beagleboard/inc
SOURCEPATH .
SOURCE beagle_medstaticrd.cpp
--- a/omap3530/beagle_drivers/medwb/medwb.cpp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagle_drivers/medwb/medwb.cpp Sun Nov 21 00:54:40 2010 +0000
@@ -22,7 +22,7 @@
#include "locmedia.h"
#include "platform.h"
//#include "variantmediadef.h"
-#include <assp\omap3530_assp\CyAsSymbianStorageDriver.h>
+#include <assp/omap3530_assp/CyAsSymbianStorageDriver.h>
//#define REGIST_MEDIA_USE_MMC
#define _MEDWB_DEBUG_1_
--- a/omap3530/beagleboard/bld.inf Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagleboard/bld.inf Sun Nov 21 00:54:40 2010 +0000
@@ -38,7 +38,7 @@
src/vbeagle
// Build MEDINT.PDD - this depends on our variantmediadef.h
-../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/medint/medint
+../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/medint/medint
//
@@ -66,7 +66,7 @@
option EXTRA_SRC_PATH $(EXTENSION_ROOT)/bootstrap
option EXTRA_INC_PATH $(EXTENSION_ROOT)/bootstrap
option INCLUDES config.inc
-option E32PATH $(EXTENSION_ROOT)/../../../../../../sf/os/kernelhwsrv/kernel
+option E32PATH $(EXTENSION_ROOT)/../../../../../sf/os/kernelhwsrv/kernel
end
--- a/omap3530/beagleboard/rom/base_beagle.iby Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagleboard/rom/base_beagle.iby Sun Nov 21 00:54:40 2010 +0000
@@ -149,4 +149,7 @@
//extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll \sys\bin\ekeyb.dll
+// VFP support
+extension[VARID]= \epoc32\release\ARMV5\BUILD_DIR\EVFP.DLL \sys\bin\evfp.dll
+
#endif
\ No newline at end of file
--- a/omap3530/beagleboard/rom/beagle.oby Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagleboard/rom/beagle.oby Sun Nov 21 00:54:40 2010 +0000
@@ -73,4 +73,9 @@
REM Define whether or not to include USB client support:
#define EUSBC
+#ifdef SYMBIAN_EXCLUDE_KEYMAP
+#undef SYMBIAN_EXCLUDE_KEYMAP
+#warning("SYMBIAN_EXCLUDE_KEYMAP should not be defined for miniGUI")
+#endif
+
#endif //__BEAGLE_OBY__
--- a/omap3530/beagleboard/rom/header.iby Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagleboard/rom/header.iby Sun Nov 21 00:54:40 2010 +0000
@@ -64,3 +64,5 @@
#ifdef UNICODE
unicode
#endif
+
+#define VFPHELPERS
--- a/omap3530/beagleboard/rom/kernel.iby Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/beagleboard/rom/kernel.iby Sun Nov 21 00:54:40 2010 +0000
@@ -21,7 +21,7 @@
primary[VARID]= \Epoc32\Release\ARMV5\##BUILD##\_omap3530_EKERN.EXE \sys\bin\ekern.exe
extension[VARID]= \Epoc32\Release\ARMV5\##BUILD##\_omap3530_KAOMAP3530.DLL \sys\bin\kaomap3530.dll
-#include <rom\omapshared\mstick.iby>
+#include <rom/omapshared/mstick.iby>
// Removed BTRACEX
//extension[VARID]= \Epoc32\Release\ARMV5\##BUILD##\_omap3530_BTRACEX.LDD \sys\bin\btracex.ldd
@@ -93,6 +93,9 @@
#define EUSER_DLL ../../ARMV5/##BUILD##/_omap3530_euser.dll
+// VFP support
+extension[VARID]= \Epoc32\Release\##KMAIN##\##BUILD##\EVFP.DLL \sys\bin\evfp.dll
+
#ifdef TEST_ROM
#include <rom\##VARIANT##\test.iby>
#endif
--- a/omap3530/kernel/bld.inf Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/kernel/bld.inf Sun Nov 21 00:54:40 2010 +0000
@@ -27,9 +27,10 @@
//../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/trace/btracex
//../../../../../../sf/os/kernelhwsrv/kernel/eka/euser/variant_euser
-../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/ekern
-../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/kc_exe
+../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/ekern
+../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/kc_exe
//../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/medint/medint
-../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/exmoncommon
-../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/trace/btracex
-../../../../../../sf/os/kernelhwsrv/kernel/eka/euser/variant_euser
\ No newline at end of file
+../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/exmoncommon
+../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/trace/btracex
+../../../../../sf/os/kernelhwsrv/kernel/eka/euser/variant_euser
+
--- a/omap3530/omap3530_drivers/euart/euart.cpp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/omap3530_drivers/euart/euart.cpp Sun Nov 21 00:54:40 2010 +0000
@@ -16,7 +16,7 @@
//
#include <d32comm.h>
-#include <beagle\variant.h>
+#include <beagle/variant.h>
#include "euart.h"
#define TX_POLLING_HACK
--- a/omap3530/omap3530_drivers/usbcc/usbcc.mmp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/omap3530_drivers/usbcc/usbcc.mmp Sun Nov 21 00:54:40 2010 +0000
@@ -27,7 +27,7 @@
linkas usbcc.dll
noexportlibrary
-sourcepath ../../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/usbcc
+sourcepath ../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/usbcc
source chapter9.cpp
source descriptors.cpp
source misc.cpp
@@ -42,7 +42,7 @@
library AsspTarget(kaomap3530,lib)
library AsspTarget(usbv,lib)
-deffile ../../../../../../../sf/os/kernelhwsrv/kernel/eka/~/usbcc.def
+deffile ../../../../../../sf/os/kernelhwsrv/kernel/eka/~/usbcc.def
epocallowdlldata
--- a/omap3530/shared/monitor/monitor.mmp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/shared/monitor/monitor.mmp Sun Nov 21 00:54:40 2010 +0000
@@ -19,7 +19,7 @@
#define __USING_ASSP_INTERRUPT_API__
#include "assp/omap3530_assp/assp.mmh"
-#include "../../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/exmondebug.mmp"
+#include "../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/exmondebug.mmp"
target AsspTarget(exmondebug,dll)
--- a/omap3530/shared/serialkeyb/serialkeyboard.cpp Fri Nov 19 00:43:42 2010 +0000
+++ b/omap3530/shared/serialkeyb/serialkeyboard.cpp Sun Nov 21 00:54:40 2010 +0000
@@ -360,7 +360,7 @@
// Register with the power resource manager
_LIT( KName, "serkey" );
r = PowerResourceManager::RegisterClient( iPrmClientId, KName );
- __KTRACE_OPT(KBOOT,Kern::Printf("+TSerialKeyboardl::Create:PRM client ID=%x, err=%d", iPrmClientId, r));
+ __KTRACE_OPT(KEXTENSION,Kern::Printf("+TSerialKeyboardl::Create:PRM client ID=%x, err=%d", iPrmClientId, r));
if( r != KErrNone )
{
return r;
@@ -373,10 +373,11 @@
r = Interrupt::Bind( iUart.InterruptId(), UartIsr, this );
if ( r < 0 )
{
- Kern::Printf("TSerialKeyboard Bind r=%d", r);
+ __KTRACE_OPT(KBOOT,Kern::Printf("TSerialKeyboard Bind r=%d", r));
return r;
}
+ __KTRACE_OPT(KEXTENSION,Kern::Printf("+TSerialKeyboard::Create bound to interrupt" ));
#ifdef USE_SYMBIAN_PRM
// Ask power resource manager to turn on clocks to the UART
// (this could take some time but we're not in any hurry)