diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/hal_data.h --- a/epoc32/include/hal_data.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/hal_data.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,9 +1,9 @@ // Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available -// 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 +// under the terms of the License "Eclipse Public License v1.0" // which accompanies this distribution, and is available -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html". +// at the URL "http://www.eclipse.org/legal/epl-v10.html". // // Initial Contributors: // Nokia Corporation - initial contribution. @@ -15,14 +15,11 @@ // // + #ifndef __HAL_DATA_H__ #define __HAL_DATA_H__ - #define bitmask enum - - - class HALData /** @publishedPartner @@ -75,7 +72,7 @@ /** - This is device specific model number, as defined by + The device specific model number, as defined by the device manufacturer. */ EModel, @@ -100,7 +97,7 @@ /** - The Symbian OS specified device family version + The Symbian OS specified device family version. */ EDeviceFamilyRev, @@ -217,7 +214,7 @@ /** - The power level for backup power + The power level for backup power. It has the values enumerated by TPowerBackupStatus. @@ -287,11 +284,11 @@ /** The keyboard click volume level. - It can take a value in the range 0 to EkeyboardClickVolumeMax. + It can take a value in the range 0 to EKeyboardClickVolumeMax. This is dynamic and writeable. - @see HALData::EkeyboardClickVolumeMax + @see HALData::EKeyboardClickVolumeMax @capability WriteDeviceData needed to Set this attribute */ @@ -301,7 +298,7 @@ /** The maximum value for EKeyboardClickVolume. - @see HALData::EkeyboardClickVolume + @see HALData::EKeyboardClickVolume */ EKeyboardClickVolumeMax, @@ -413,7 +410,7 @@ /** - The is the pen/digitizer vertical resolution, in pixels. + The pen/digitizer vertical resolution, in pixels. */ EPenY, @@ -425,7 +422,7 @@ 0 = a pen tap has no effect; 1 = a pent tap or press enables the display. - The is dynamic and writeable + This is dynamic and writeable. @capability WriteDeviceData needed to Set this attribute */ @@ -458,7 +455,7 @@ /** - This pen click volume level. + The pen click volume level. It can take a value in the range 0 to EPenClickVolumeMax. This value is dynamic and writable. @@ -482,7 +479,7 @@ Indicates whether a mouse is available for input. It has the values: - 0 = there is no mouse availablea pen/digitizeris present; + 0 = there is no mouse available pen/digitizer is present; 1 = a mouse is available for input. */ EMouse, @@ -534,7 +531,7 @@ /** - A bitmask defining the state of each button . + A bitmask defining the state of each button. For each bit, it has values: 0 = up; @@ -636,7 +633,7 @@ /** - Inidcates the state of the keyboard backlight. + Indicates the state of the keyboard backlight. It has the values: 0 = keyboard backlight is off; @@ -910,29 +907,25 @@ */ EFastCounterCountsUp, - /** - @prototype - - Indicates whether a 3 dimensional pointing device is available for input. + /** + Indicates whether a 3 dimensional pointing device is available for input and Z coordinate + is provided in appropriate pointer-related TRawEvents generated by the driver. It has the values: - 0 = a 3D pointer is not available for input; - 1 = a 3D pointer is present. + 0 = a 3D pointer is not available for input and Z coordinate is not provided in TRawEvents; + 1 = a 3D pointer is present and Z coordinate is provided in TRawEvents. */ EPointer3D, - /** - @prototype - - The 3D pointing device detection range, in units of distance above the screen. + /** + The furthest detectable 3D pointing device's proximity above the screen. + As proximity values above the screen are negative, this will be a negative value. This is dynamic and writeable. */ - EPointer3DZ, + EPointer3DMaxProximity, - /** - @prototype - + /** Indicates whether a 3 dimensional pointing device supports Theta polar angle reading. It has the values: @@ -942,8 +935,6 @@ EPointer3DThetaSupported, /** - @prototype - Indicates whether a 3 dimensional pointing device supports Phi polar angle reading. It has the values: @@ -953,8 +944,6 @@ EPointer3DPhiSupported, /** - @prototype - Indicates whether a 3 dimensional pointing device supports rotation angle along its main axis reading. It has the values: @@ -964,8 +953,6 @@ EPointer3DRotationSupported, /** - @prototype - Indicates whether a 3 dimensional pointing device supports readings of pressure applied on screen. It has the values: @@ -1014,7 +1001,7 @@ /** Defines the custom resource drive. - This drive attribute should be set if an aditional drive is required for use in the search + This drive attribute should be set if an additional drive is required for use in the search algorithm for language files. @see TDriveNumber @@ -1024,11 +1011,111 @@ ECustomResourceDrive, /** + Step size of Z distance data. + + Returns the minimum size of the step between two resolvable z positions + */ + EPointer3DProximityStep, + + /** + Maximum Number of Pointers supported by hardware/driver + + Returns the maximum number of pointers for a multi-touch configuration (or KErrNotSupported or 0 or 1 for single-touch legacy configuration) + */ + EPointerMaxPointers, + + /** + Maximum Number of Pointers + + Sets and reads back the number of pointers as requested by the UI (<=EPointerMaxPointers) + */ + EPointerNumberOfPointers, + + /** + Maximum Pressure Value + + Returns the maximum pressure value + */ + EPointer3DMaxPressure, + + /** + Step size of pressure data. + + Returns the minimum size of the step between two resolvable pressure readings + */ + EPointer3DPressureStep, + + /** + The threshold on pointer's Z coordinate above which EEnterHighPressure pointer event is sent to WSERV's clients. + This value is intended to be preconfigured in build time and modified by Window Server only + + @prototype 9.5 + */ + EPointer3DEnterHighPressureThreshold, + + /** + The threshold on pointer's Z coordinate below which EExitHighPressure pointer event is sent to WSERV's clients. + This value is intended to be preconfigured in build time and modified by Window Server only + + @prototype 9.5 + */ + EPointer3DExitHighPressureThreshold, + + /** + The threshold on pointer's Z coordinate above which EEnterCloseProximity pointer event is sent to WSERV's clients. + This value is intended to be preconfigured in build time and modified by Window Server only + + @prototype 9.5 + */ + EPointer3DEnterCloseProximityThreshold, + + + /** + The threshold on pointer's Z coordinate below which EExitCloseProximity pointer event is sent to WSERV's clients. + This value is intended to be preconfigured in build time and modified by Window Server only + + @prototype 9.5 + */ + EPointer3DExitCloseProximityThreshold, + + /** + A Handle to the display memory. + + @prototype 9.5 + */ + EDisplayMemoryHandle, + + /** + Serial number of this board + */ + ESerialNumber, + + + /** + Interrupt used by sampling profiler - applicable for SMP only. Each CPU_i is interrupted by interrupt number ECpuProfilingInterrupt + i + */ + ECpuProfilingDefaultInterruptBase, + + + /** + Number of processors present on the device. Returns 1 on unicore. This number is constant and does not take account of power management + */ + ENumCpus, + + + /* + * NOTE: + * When updating this list, please also update hal/rom/hal.hby and hal/tsrc/t_newhal.cpp. + */ + + /** + The number of HAL attributes per screen. It is simply defined by its position in the enumeration. */ - ENumHalAttributes + ENumHalAttributes + }; @@ -1196,6 +1283,11 @@ EMachineUid_X86PC=0x100000ad, EMachineUid_OmapH2=0x1020601C, EMachineUid_OmapH4=0x102734E3, + EMachineUid_NE1_TB=0x102864F7, + EMachineUid_EmuBoard=0x1200afed, + EMachineUid_OmapH6=0x10286564, + EMachineUid_OmapZoom=0x10286565, + EMachineUid_STE8500=0x101FF810, }; @@ -1227,6 +1319,7 @@ EPowerBackupStatus_Low, EPowerBackupStatus_Good, }; + }; #endif