# HG changeset patch # User hgs # Date 1285683252 -3600 # Node ID c7e97f847492f99736e56b249458f24587c7708e # Parent 6a75fa55495fb433b3d3f01ce335809d008cec21 201037_11 diff -r 6a75fa55495f -r c7e97f847492 bsptemplate/asspandvariant/template_assp/bmarm/katemplate.def --- a/bsptemplate/asspandvariant/template_assp/bmarm/katemplate.def Mon Sep 27 10:52:00 2010 +0100 +++ b/bsptemplate/asspandvariant/template_assp/bmarm/katemplate.def Tue Sep 28 15:14:12 2010 +0100 @@ -1,34 +1,35 @@ -EXPORTS - __12TemplateAssp @ 1 NONAME R3UNUSED ; TemplateAssp::TemplateAssp(void) - Bind__9InterruptiPFPv_vPv @ 2 NONAME R3UNUSED ; Interrupt::Bind(int, void (*)(void *), void *) - BootWaitMilliSeconds__9TTemplatei @ 3 NONAME R3UNUSED ; TTemplate::BootWaitMilliSeconds(int) - Clear__9Interrupti @ 4 NONAME R3UNUSED ; Interrupt::Clear(int) - CpuVersionId__9TTemplate @ 5 NONAME R3UNUSED ; TTemplate::CpuVersionId(void) - DebugPortAddr__9TTemplate @ 6 NONAME R3UNUSED ; TTemplate::DebugPortAddr(void) - Disable__9Interrupti @ 7 NONAME R3UNUSED ; Interrupt::Disable(int) - Enable__9Interrupti @ 8 NONAME R3UNUSED ; Interrupt::Enable(int) - Init1__12TemplateAssp @ 9 NONAME R3UNUSED ; TemplateAssp::Init1(void) - Init3__12TemplateAssp @ 10 NONAME R3UNUSED ; TemplateAssp::Init3(void) - IntsPending__9TTemplate @ 11 NONAME R3UNUSED ; TTemplate::IntsPending(void) - ModifyIntMask__9TTemplateUiUi @ 12 NONAME R3UNUSED ; TTemplate::ModifyIntMask(unsigned int, unsigned int) - MsTickPeriod__12TemplateAssp @ 13 NONAME R3UNUSED ; TemplateAssp::MsTickPeriod(void) - NanoWaitCalibration__12TemplateAssp @ 14 NONAME R3UNUSED ; TemplateAssp::NanoWaitCalibration(void) - ProcessorPeriodInPs__9TTemplate @ 15 NONAME R3UNUSED ; TTemplate::ProcessorPeriodInPs(void) - RtcData__9TTemplate @ 16 NONAME R3UNUSED ; TTemplate::RtcData(void) - SetIntMask__9TTemplateUi @ 17 NONAME R3UNUSED ; TTemplate::SetIntMask(unsigned int) - SetPriority__9Interruptii @ 18 NONAME R3UNUSED ; Interrupt::SetPriority(int, int) - SetRtcData__9TTemplateUi @ 19 NONAME R3UNUSED ; TTemplate::SetRtcData(unsigned int) - SetSystemTimeInSecondsFrom2000__12TemplateAsspi @ 20 NONAME R3UNUSED ; TemplateAssp::SetSystemTimeInSecondsFrom2000(int) - StartupReason__12TemplateAssp @ 21 NONAME R3UNUSED ; TemplateAssp::StartupReason(void) - StartupReason__9TTemplate @ 22 NONAME R3UNUSED ; TTemplate::StartupReason(void) - SystemTimeInSecondsFrom2000__12TemplateAsspRi @ 23 NONAME R3UNUSED ; TemplateAssp::SystemTimeInSecondsFrom2000(int &) - Unbind__9Interrupti @ 24 NONAME R3UNUSED ; Interrupt::Unbind(int) - VideoRamPhys__9TTemplate @ 25 NONAME R3UNUSED ; TTemplate::VideoRamPhys(void) - AsicInitialise__Fv @ 26 NONAME R3UNUSED ; AsicInitialise(void) - Modify16__12AsspRegisterUlUsUs @ 27 NONAME R3UNUSED ; AsspRegister::Modify16(unsigned long, unsigned short, unsigned short) - Modify32__12AsspRegisterUlUlUl @ 28 NONAME R3UNUSED ; AsspRegister::Modify32(unsigned long, unsigned long, unsigned long) - Modify64__12AsspRegisterUlUxUx @ 29 NONAME ; AsspRegister::Modify64(unsigned long, unsigned long long, unsigned long long) - Modify8__12AsspRegisterUlUcUc @ 30 NONAME R3UNUSED ; AsspRegister::Modify8(unsigned long, unsigned char, unsigned char) - Read64__12AsspRegisterUl @ 31 NONAME R3UNUSED ; AsspRegister::Read64(unsigned long) - Write64__12AsspRegisterUlUx @ 32 NONAME R3UNUSED ; AsspRegister::Write64(unsigned long) - +EXPORTS + __12TemplateAssp @ 1 NONAME R3UNUSED ; TemplateAssp::TemplateAssp(void) + Bind__9InterruptiPFPv_vPv @ 2 NONAME R3UNUSED ; Interrupt::Bind(int, void (*)(void *), void *) + BootWaitMilliSeconds__9TTemplatei @ 3 NONAME R3UNUSED ; TTemplate::BootWaitMilliSeconds(int) + Clear__9Interrupti @ 4 NONAME R3UNUSED ; Interrupt::Clear(int) + CpuVersionId__9TTemplate @ 5 NONAME R3UNUSED ; TTemplate::CpuVersionId(void) + DebugPortAddr__9TTemplate @ 6 NONAME R3UNUSED ; TTemplate::DebugPortAddr(void) + Disable__9Interrupti @ 7 NONAME R3UNUSED ; Interrupt::Disable(int) + Enable__9Interrupti @ 8 NONAME R3UNUSED ; Interrupt::Enable(int) + Init1__12TemplateAssp @ 9 NONAME R3UNUSED ; TemplateAssp::Init1(void) + Init3__12TemplateAssp @ 10 NONAME R3UNUSED ; TemplateAssp::Init3(void) + IntsPending__9TTemplate @ 11 NONAME R3UNUSED ; TTemplate::IntsPending(void) + ModifyIntMask__9TTemplateUiUi @ 12 NONAME R3UNUSED ; TTemplate::ModifyIntMask(unsigned int, unsigned int) + MsTickPeriod__12TemplateAssp @ 13 NONAME R3UNUSED ; TemplateAssp::MsTickPeriod(void) + NanoWaitCalibration__12TemplateAssp @ 14 NONAME R3UNUSED ; TemplateAssp::NanoWaitCalibration(void) + ProcessorPeriodInPs__9TTemplate @ 15 NONAME R3UNUSED ; TTemplate::ProcessorPeriodInPs(void) + RtcData__9TTemplate @ 16 NONAME R3UNUSED ; TTemplate::RtcData(void) + SetIntMask__9TTemplateUi @ 17 NONAME R3UNUSED ; TTemplate::SetIntMask(unsigned int) + SetPriority__9Interruptii @ 18 NONAME R3UNUSED ; Interrupt::SetPriority(int, int) + SetRtcData__9TTemplateUi @ 19 NONAME R3UNUSED ; TTemplate::SetRtcData(unsigned int) + SetSystemTimeInSecondsFrom2000__12TemplateAsspi @ 20 NONAME R3UNUSED ; TemplateAssp::SetSystemTimeInSecondsFrom2000(int) + StartupReason__12TemplateAssp @ 21 NONAME R3UNUSED ; TemplateAssp::StartupReason(void) + StartupReason__9TTemplate @ 22 NONAME R3UNUSED ; TTemplate::StartupReason(void) + SystemTimeInSecondsFrom2000__12TemplateAsspRi @ 23 NONAME R3UNUSED ; TemplateAssp::SystemTimeInSecondsFrom2000(int &) + Unbind__9Interrupti @ 24 NONAME R3UNUSED ; Interrupt::Unbind(int) + VideoRamPhys__9TTemplate @ 25 NONAME R3UNUSED ; TTemplate::VideoRamPhys(void) + AsicInitialise__Fv @ 26 NONAME R3UNUSED ; AsicInitialise(void) + Modify16__12AsspRegisterUlUsUs @ 27 NONAME R3UNUSED ; AsspRegister::Modify16(unsigned long, unsigned short, unsigned short) + Modify32__12AsspRegisterUlUlUl @ 28 NONAME R3UNUSED ; AsspRegister::Modify32(unsigned long, unsigned long, unsigned long) + Modify64__12AsspRegisterUlUxUx @ 29 NONAME ; AsspRegister::Modify64(unsigned long, unsigned long long, unsigned long long) + Modify8__12AsspRegisterUlUcUc @ 30 NONAME R3UNUSED ; AsspRegister::Modify8(unsigned long, unsigned char, unsigned char) + Read64__12AsspRegisterUl @ 31 NONAME R3UNUSED ; AsspRegister::Read64(unsigned long) + Write64__12AsspRegisterUlUx @ 32 NONAME R3UNUSED ; AsspRegister::Write64(unsigned long) + SetSystemTimeCalibration__15RtClockTemplatei @ 33 NONAME R3UNUSED ; RtClockTemplate::SetSystemTimeCalibration(int) + diff -r 6a75fa55495f -r c7e97f847492 bsptemplate/asspandvariant/template_assp/eabi/katemplate.def --- a/bsptemplate/asspandvariant/template_assp/eabi/katemplate.def Mon Sep 27 10:52:00 2010 +0100 +++ b/bsptemplate/asspandvariant/template_assp/eabi/katemplate.def Tue Sep 28 15:14:12 2010 +0100 @@ -1,36 +1,37 @@ -EXPORTS - _Z14AsicInitialisev @ 1 NONAME - _ZN12TemplateAssp12MsTickPeriodEv @ 2 NONAME - _ZN12TemplateAssp13StartupReasonEv @ 3 NONAME - _ZN12TemplateAssp19NanoWaitCalibrationEv @ 4 NONAME - _ZN12TemplateAssp27SystemTimeInSecondsFrom2000ERi @ 5 NONAME - _ZN12TemplateAssp30SetSystemTimeInSecondsFrom2000Ei @ 6 NONAME - _ZN12TemplateAssp5Init1Ev @ 7 NONAME - _ZN12TemplateAssp5Init3Ev @ 8 NONAME - _ZN12TemplateAsspC2Ev @ 9 NONAME - _ZN9Interrupt11SetPriorityEii @ 10 NONAME - _ZN9Interrupt4BindEiPFvPvES0_ @ 11 NONAME - _ZN9Interrupt5ClearEi @ 12 NONAME - _ZN9Interrupt6EnableEi @ 13 NONAME - _ZN9Interrupt6UnbindEi @ 14 NONAME - _ZN9Interrupt7DisableEi @ 15 NONAME - _ZN9TTemplate10SetIntMaskEj @ 16 NONAME - _ZN9TTemplate10SetRtcDataEj @ 17 NONAME - _ZN9TTemplate11IntsPendingEv @ 18 NONAME - _ZN9TTemplate12CpuVersionIdEv @ 19 NONAME - _ZN9TTemplate12VideoRamPhysEv @ 20 NONAME - _ZN9TTemplate13DebugPortAddrEv @ 21 NONAME - _ZN9TTemplate13ModifyIntMaskEjj @ 22 NONAME - _ZN9TTemplate13StartupReasonEv @ 23 NONAME - _ZN9TTemplate19ProcessorPeriodInPsEv @ 24 NONAME - _ZN9TTemplate20BootWaitMilliSecondsEi @ 25 NONAME - _ZN9TTemplate7RtcDataEv @ 26 NONAME - _ZTI12TemplateAssp @ 27 NONAME ; ## - _ZTV12TemplateAssp @ 28 NONAME ; ## - _ZN12AsspRegister6Read64Em @ 29 NONAME - _ZN12AsspRegister7Modify8Emhh @ 30 NONAME - _ZN12AsspRegister7Write64Emy @ 31 NONAME - _ZN12AsspRegister8Modify16Emtt @ 32 NONAME - _ZN12AsspRegister8Modify32Emmm @ 33 NONAME - _ZN12AsspRegister8Modify64Emyy @ 34 NONAME - +EXPORTS + _Z14AsicInitialisev @ 1 NONAME + _ZN12TemplateAssp12MsTickPeriodEv @ 2 NONAME + _ZN12TemplateAssp13StartupReasonEv @ 3 NONAME + _ZN12TemplateAssp19NanoWaitCalibrationEv @ 4 NONAME + _ZN12TemplateAssp27SystemTimeInSecondsFrom2000ERi @ 5 NONAME + _ZN12TemplateAssp30SetSystemTimeInSecondsFrom2000Ei @ 6 NONAME + _ZN12TemplateAssp5Init1Ev @ 7 NONAME + _ZN12TemplateAssp5Init3Ev @ 8 NONAME + _ZN12TemplateAsspC2Ev @ 9 NONAME + _ZN9Interrupt11SetPriorityEii @ 10 NONAME + _ZN9Interrupt4BindEiPFvPvES0_ @ 11 NONAME + _ZN9Interrupt5ClearEi @ 12 NONAME + _ZN9Interrupt6EnableEi @ 13 NONAME + _ZN9Interrupt6UnbindEi @ 14 NONAME + _ZN9Interrupt7DisableEi @ 15 NONAME + _ZN9TTemplate10SetIntMaskEj @ 16 NONAME + _ZN9TTemplate10SetRtcDataEj @ 17 NONAME + _ZN9TTemplate11IntsPendingEv @ 18 NONAME + _ZN9TTemplate12CpuVersionIdEv @ 19 NONAME + _ZN9TTemplate12VideoRamPhysEv @ 20 NONAME + _ZN9TTemplate13DebugPortAddrEv @ 21 NONAME + _ZN9TTemplate13ModifyIntMaskEjj @ 22 NONAME + _ZN9TTemplate13StartupReasonEv @ 23 NONAME + _ZN9TTemplate19ProcessorPeriodInPsEv @ 24 NONAME + _ZN9TTemplate20BootWaitMilliSecondsEi @ 25 NONAME + _ZN9TTemplate7RtcDataEv @ 26 NONAME + _ZTI12TemplateAssp @ 27 NONAME ; ## + _ZTV12TemplateAssp @ 28 NONAME ; ## + _ZN12AsspRegister6Read64Em @ 29 NONAME + _ZN12AsspRegister7Modify8Emhh @ 30 NONAME + _ZN12AsspRegister7Write64Emy @ 31 NONAME + _ZN12AsspRegister8Modify16Emtt @ 32 NONAME + _ZN12AsspRegister8Modify32Emmm @ 33 NONAME + _ZN12AsspRegister8Modify64Emyy @ 34 NONAME + _ZN15RtClockTemplate24SetSystemTimeCalibrationEi @ 35 NONAME + diff -r 6a75fa55495f -r c7e97f847492 bsptemplate/asspandvariant/template_assp/template_assp.cpp --- a/bsptemplate/asspandvariant/template_assp/template_assp.cpp Mon Sep 27 10:52:00 2010 +0100 +++ b/bsptemplate/asspandvariant/template_assp/template_assp.cpp Tue Sep 28 15:14:12 2010 +0100 @@ -172,4 +172,9 @@ // { return TemplateAssp::VideoRamPhys; + } + +EXPORT_C TInt RtClockTemplate::SetSystemTimeCalibration(TInt aCalibration) + { + return KErrNotSupported; } diff -r 6a75fa55495f -r c7e97f847492 bsptemplate/asspandvariant/template_assp/template_assp.h --- a/bsptemplate/asspandvariant/template_assp/template_assp.h Mon Sep 27 10:52:00 2010 +0100 +++ b/bsptemplate/asspandvariant/template_assp/template_assp.h Tue Sep 28 15:14:12 2010 +0100 @@ -26,6 +26,7 @@ #include #include #include +#include //---------------------------------------------------------------------------- // Constant conventions: diff -r 6a75fa55495f -r c7e97f847492 bsptemplate/asspandvariant/template_assp/template_assp_priv.h --- a/bsptemplate/asspandvariant/template_assp/template_assp_priv.h Mon Sep 27 10:52:00 2010 +0100 +++ b/bsptemplate/asspandvariant/template_assp/template_assp_priv.h Tue Sep 28 15:14:12 2010 +0100 @@ -151,5 +151,11 @@ static TPhysAddr VideoRamPhys; NTimerQ* iTimerQ; }; + +class RtClockTemplate : public RtClock + { + public: + IMPORT_C TInt SetSystemTimeCalibration(TInt aCalibration); + }; #endif diff -r 6a75fa55495f -r c7e97f847492 kernel/eka/bld.inf --- a/kernel/eka/bld.inf Mon Sep 27 10:52:00 2010 +0100 +++ b/kernel/eka/bld.inf Tue Sep 28 15:14:12 2010 +0100 @@ -267,6 +267,9 @@ // include/drivers/display.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/) +// Real Time Clock SHAI API +include/drivers/rtclock.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/) + // Example RTOS personality layer personality/example/personality.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(personality/example/) personality/example/personality_int.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(personality/example/) @@ -406,6 +409,18 @@ include/e32shbufcmn.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32shbufcmn.h) include/e32shbuf_priv.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32shbuf_priv.h) +// Build system extensions +extension/base_rvct_common.mk /epoc32/tools/makefile_templates/base/ +extension/bootstrap.flm /epoc32/tools/makefile_templates/base/ +extension/bootstrap.meta /epoc32/tools/makefile_templates/base/ +extension/bootstrap.mk /epoc32/tools/makefile_templates/base/ +extension/bootstrap.xml /epoc32/tools/makefile_templates/base/ +extension/config.meta /epoc32/tools/makefile_templates/base/ +extension/config.mk /epoc32/tools/makefile_templates/base/ +extension/copy_default.meta /epoc32/tools/makefile_templates/base/ +extension/copy_default.mk /epoc32/tools/makefile_templates/base/ +extension/genexec.meta /epoc32/tools/makefile_templates/base/ +extension/genexec.mk /epoc32/tools/makefile_templates/base/ PRJ_MMPFILES diff -r 6a75fa55495f -r c7e97f847492 kernel/eka/include/drivers/rtclock.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kernel/eka/include/drivers/rtclock.h Tue Sep 28 15:14:12 2010 +0100 @@ -0,0 +1,18 @@ +// Copyright (c) 1995-2010 Nokia Corporation and/or its subsidiary(-ies). +// 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: + +class RtClock + { + public: + virtual TInt SetSystemTimeCalibration(TInt aCalibration) = 0; + }; diff -r 6a75fa55495f -r c7e97f847492 kernel/eka/include/e32ver.h --- a/kernel/eka/include/e32ver.h Mon Sep 27 10:52:00 2010 +0100 +++ b/kernel/eka/include/e32ver.h Tue Sep 28 15:14:12 2010 +0100 @@ -28,7 +28,7 @@ const TInt KE32MajorVersionNumber=2; const TInt KE32MinorVersionNumber=0; -const TInt KE32BuildVersionNumber=4003; +const TInt KE32BuildVersionNumber=4004; const TInt KMachineConfigurationMajorVersionNumber=1; const TInt KMachineConfigurationMinorVersionNumber=0; diff -r 6a75fa55495f -r c7e97f847492 kernel/eka/release.txt --- a/kernel/eka/release.txt Mon Sep 27 10:52:00 2010 +0100 +++ b/kernel/eka/release.txt Tue Sep 28 15:14:12 2010 +0100 @@ -1,3 +1,12 @@ +Version 2.00.4004 +================= +(Made by vfebvre 24/09/2010) + +1. gcochran + 1. RP 536912 SHAI RtClock Interface + REQ 417-64269 SHAI for clock calibration + + Version 2.00.4003 ================= (Made by vfebvre 21/09/2010)