--- a/kerneltest/e32test/digitiser/d_ldddigitisertest.h	Mon Sep 13 15:16:07 2010 +0100
+++ b/kerneltest/e32test/digitiser/d_ldddigitisertest.h	Wed Sep 22 10:53:45 2010 +0100
@@ -20,11 +20,32 @@
 
 #include <e32cmn.h>
 #ifndef __KERNEL_MODE__
-#include <e32std.h>
+#include <e32svr.h>
 #endif
 
 _LIT(KLddName,"D_LDDDIGITISERTEST.LDD");
 
+struct TRawEventInfo
+	{
+
+	TInt iType;
+	TInt iScanCode;
+	TInt iRepeats;
+	TInt iX;
+    TInt iY;	   
+	TInt iZ;
+	TInt iPhi;
+	TInt iTheta;
+	TInt iAlpha;
+	TUint8 iPointerNumber;
+	TUint8 iTip;	
+	};
+
+ typedef TPckgBuf <TRawEventInfo> TUsrEventBuf;	
+ typedef TRawEvent::TType  RawEventType;
+
+
+
 class RLddDigitiserTest : public RBusLogicalChannel
 	{
 public:
@@ -67,49 +88,137 @@
 		ESET_EPOINTER3DMAXPRESSURE,
 
 		EGET_EPOINTER3DPRESSURESTEP,
-		ESET_EPOINTER3DPRESSURESTEP
+		ESET_EPOINTER3DPRESSURESTEP,		
+
+       //TRawEvents Get Set Enums		
+		
+		ESET_TRAWEVENT_EVENTTYPE,
+		EGET_TRAWEVENT_EVENTTYPE,
+
+		ESET_TRAWEVENT_TILT,
+		EGET_TRAWEVENT_TILT,
+
+
+		ESET_TEVENT_DNMBR,
+		EGET_TEVENT_DNMBR,
+
+		ESET_TRAWEVENT_ROTATION,
+		EGET_TRAWEVENT_ROTATION,
+
+		ESET_TRAWEVENT_REPEAT,
+		EGET_TRAWEVENT_REPEAT,
+		
+
+		ESET_TRAWEVENT_SCANCODE,
+		EGET_TRAWEVENT_SCANCODE,
+
+		ESET_TRAWEVENT_POS2D,
+		EGET_TRAWEVENT_POS2D,
+		
+		ESET_TRAWEVENT_POS3D,
+		EGET_TRAWEVENT_POS3D,
+
+	
+
+		
+		ESET_TRAWEVENT_PTRNMBR,
+		ESET_TRAWEVENT_3DNPTRNMBR,
+		EGET_TRAWEVENT_PTRNMBR,
+
+
+		EGET_TRAWEVENT_TICKS,	 
+
+	
+		ESET_TRAWEVENT_TIP,
+		EGET_TRAWEVENT_TIP,
+			
+		ESET_TRAWEVENT_ALL		
 		};
 
+	
+
+
 public:
-	inline TInt Open();
-	inline TInt registerHalHandler();
-	inline TInt removeHalHandler();
-	inline TInt getRegisteredDeviceNumber();
-	inline TInt initialiseHalData();
+	TInt Open();
+	TInt registerHalHandler();
+	TInt removeHalHandler();
+	TInt getRegisteredDeviceNumber();
+	TInt initialiseHalData();
 
-	inline TInt getPointer3D();
-	inline TInt setPointer3D(TUint aPointer3D);
+	TInt getPointer3D();
+	TInt setPointer3D(TUint aPointer3D);
 
-	inline TInt getPointer3DMaxProximity();
-	inline TInt setPointer3DMaxProximity(TUint aPointer3DMaxProximity);
+	TInt getPointer3DMaxProximity();
+	TInt setPointer3DMaxProximity(TUint aPointer3DMaxProximity);
+	
+	TInt getPointer3DThetaSupported();
+	TInt setPointer3DThetaSupported(TUint aPointer3DThetaSupported);
+	
+	TInt getPointer3DPhiSupported();
+	TInt setPointer3DPhiSupported(TUint aPointer3DPhiSupported);
+	
+	TInt getPointer3DRotationSupported();
+	TInt setPointer3DRotationSupported(TUint aPointer3DRotationSupported);
 	
-	inline TInt getPointer3DThetaSupported();
-	inline TInt setPointer3DThetaSupported(TUint aPointer3DThetaSupported);
+	TInt getPointer3DPressureSupported();
+	TInt setPointer3DPressureSupported(TUint aPointer3DPressureSupported);
+
+	TInt getPointer3DProximityStep();
+	TInt setPointer3DProximityStep(TUint aPointer3DProximityStep);
+	
+	TInt getPointerMaxPointers();
+	TInt setPointerMaxPointers(TUint aPointerMaxPointers);
 	
-	inline TInt getPointer3DPhiSupported();
-	inline TInt setPointer3DPhiSupported(TUint aPointer3DPhiSupported);
+	TInt getPointerNumberOfPointers();
+	TInt setPointerNumberOfPointers(TUint aPointerNumberOfPointers);
+	
+	TInt getPointer3DMaxPressure();
+	TInt setPointer3DMaxPressure(TUint aPointer3DMaxPressure);
+	
+	TInt getPointer3DPressureStep();
+	TInt setPointer3DPressureStep(TUint aPointer3DPressureStep);
 	
-	inline TInt getPointer3DRotationSupported();
-	inline TInt setPointer3DRotationSupported(TUint aPointer3DRotationSupported);
-	
-	inline TInt getPointer3DPressureSupported();
-	inline TInt setPointer3DPressureSupported(TUint aPointer3DPressureSupported);
+
+	//TRawEvents
 
-	inline TInt getPointer3DProximityStep();
-	inline TInt setPointer3DProximityStep(TUint aPointer3DProximityStep);
+	TInt setTEvntType(TInt aType);
+	TInt getTEvntType();
+
+	TInt setTEvntDNum(TInt aDNum);
+	TInt getTEvntDNum();
 	
-	inline TInt getPointerMaxPointers();
-	inline TInt setPointerMaxPointers(TUint aPointerMaxPointers);
-	
-	inline TInt getPointerNumberOfPointers();
-	inline TInt setPointerNumberOfPointers(TUint aPointerNumberOfPointers);
+	TInt setTEvnt3DnPntr (TInt aType, TInt aX, TInt aY, TInt aZ, TUint8 aPointerNumber);
+	TInt setTEvntPntr(TInt aPointerNumber);    
+	TInt getTEvntPntr();
+
+	TInt getTEvntTicks();
+	 
+	TInt setTEvntTip(TBool aTip);
+	TBool TEvntTicksIsTip();		
+
+	TInt setTEvntScanCode(TInt aType,TInt aScanCode);
+	TInt getTEvntScanCode();
+
+	TInt setTEvntRotation(TInt aType,TInt aAlpha);	 
+	TInt getTEvntRotation();
+
+
+	TInt setTEvntPos(TInt aType,TInt aX,TInt aY);	 
+	TInt getTEvntPos(TUsrEventBuf& eventBuf);
 	
-	inline TInt getPointer3DMaxPressure();
-	inline TInt setPointer3DMaxPressure(TUint aPointer3DMaxPressure);
-	
-	inline TInt getPointer3DPressureStep();
-	inline TInt setPointer3DPressureStep(TUint aPointer3DPressureStep);
+	TInt setTEvntPos3D(TInt aType,TInt aX,TInt aY,TInt aZ);
+	TInt getTEventPos3D(TUsrEventBuf& eventBuf);
+
+	TInt setTEvntAll(TInt aType,TInt aX,TInt aY,TInt aZ,TInt aPhi,TInt aTheta,TInt aAlpha);
+
+	TInt setTEvntTilt(TInt aType,TInt aPhi,TInt aTheta);										
+	TInt getTEvntTilt(TUsrEventBuf& eventBuf);
+
+	TInt setTEvntRepeat(TInt aType,TInt aScanCode,TInt aRepeats);
+	TInt getTEvntRepeat();										 	
 	};
 
+
+
 #include "d_lddDigitisertest.inl"
 #endif   //__DLDDDIGITISERTEST_H__