1.1 --- a/epoc32/include/beagle/mconf.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/beagle/mconf.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,55 +1,54 @@
     1.4 -// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5 -// All rights reserved.
     1.6 -// This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 -// which accompanies this distribution, and is available
     1.9 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.10 -//
    1.11 -// Initial Contributors:
    1.12 -// Nokia Corporation - initial contribution.
    1.13 -//
    1.14 -// Contributors:
    1.15 -//
    1.16 -// Description:
    1.17 -// template\template_variant\inc\mconf.h
    1.18 -// Template Persistent Machine Configuration
    1.19 -// 
    1.20 -//
    1.21 -
    1.22 -
    1.23 -
    1.24 -#ifndef __MCONF_H__
    1.25 -#define __MCONF_H__
    1.26 -#include <kernel.h>
    1.27 -
    1.28 -class TDigitizerCalibrateValues
    1.29 -    {
    1.30 -public:
    1.31 -    TInt iR11;
    1.32 -    TInt iR12;
    1.33 -    TInt iR21;
    1.34 -    TInt iR22;
    1.35 -    TInt iTx;
    1.36 -    TInt iTy;
    1.37 -    };
    1.38 -
    1.39 -class TTemplateMachineConfig : public TMachineConfig
    1.40 -	{
    1.41 -public:
    1.42 -	TSoundInfoV1 iSoundInfo;
    1.43 -    TOnOffInfoV1 iOnOffInfo;
    1.44 -	TTimeK iMainBatteryInsertionTime;
    1.45 -    Int64 iMainBatteryInUseMicroSeconds;
    1.46 -	Int64 iExternalPowerInUseMicroSeconds;
    1.47 -	Int64 iMainBatteryMilliAmpTicks;
    1.48 -	TDigitizerCalibrateValues iCalibration;
    1.49 -	TDigitizerCalibrateValues iCalibrationSaved;
    1.50 -	TDigitizerCalibrateValues iCalibrationFactory;
    1.51 -	};
    1.52 -
    1.53 -typedef TTemplateMachineConfig TActualMachineConfig;
    1.54 -
    1.55 -inline TActualMachineConfig& TheActualMachineConfig()
    1.56 -	{return (TActualMachineConfig&)Kern::MachineConfig();}
    1.57 -
    1.58 -#endif
    1.59 +// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
    1.60 +// All rights reserved.
    1.61 +// This component and the accompanying materials are made available
    1.62 +// under the terms of the License "Eclipse Public License v1.0"
    1.63 +// which accompanies this distribution, and is available
    1.64 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.65 +//
    1.66 +// Initial Contributors:
    1.67 +// Nokia Corporation - initial contribution.
    1.68 +//
    1.69 +// Contributors:
    1.70 +//
    1.71 +// Description:
    1.72 +// omap3530/beagleboard\inc\mconf.h
    1.73 +// Beagle Persistent Machine Configuration
    1.74 +//
    1.75 +
    1.76 +
    1.77 +
    1.78 +#ifndef __MCONF_H__
    1.79 +#define __MCONF_H__
    1.80 +#include <kernel.h>
    1.81 +
    1.82 +class TDigitizerCalibrateValues
    1.83 +    {
    1.84 +public:
    1.85 +    TInt iR11;
    1.86 +    TInt iR12;
    1.87 +    TInt iR21;
    1.88 +    TInt iR22;
    1.89 +    TInt iTx;
    1.90 +    TInt iTy;
    1.91 +    };
    1.92 +
    1.93 +class TBeagleMachineConfig : public TMachineConfig
    1.94 +	{
    1.95 +public:
    1.96 +	TSoundInfoV1 iSoundInfo;
    1.97 +    TOnOffInfoV1 iOnOffInfo;
    1.98 +	TTimeK iMainBatteryInsertionTime;
    1.99 +    Int64 iMainBatteryInUseMicroSeconds;
   1.100 +	Int64 iExternalPowerInUseMicroSeconds;
   1.101 +	Int64 iMainBatteryMilliAmpTicks;
   1.102 +	TDigitizerCalibrateValues iCalibration;
   1.103 +	TDigitizerCalibrateValues iCalibrationSaved;
   1.104 +	TDigitizerCalibrateValues iCalibrationFactory;
   1.105 +	};
   1.106 +
   1.107 +typedef TBeagleMachineConfig TActualMachineConfig;
   1.108 +
   1.109 +inline TActualMachineConfig& TheActualMachineConfig()
   1.110 +	{return (TActualMachineConfig&)Kern::MachineConfig();}
   1.111 +
   1.112 +#endif