# HG changeset patch
# User chpeckha
# Date 1239119576 18000
# Node ID 6ebd50a631649c424df8437d86d8332659aa9eab
# Parent  05c4630a6d7301eb83afdbd76dd906cd3a3fd30c
Fix make files and dependencies to fix build

diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.dep
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.dep	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.dep	Tue Apr 07 10:52:56 2009 -0500
@@ -9,6 +9,9 @@
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\ClientManager.h"\
+	".\jdk1.5.0_10\include\jni.h"\
+	".\jdk1.5.0_10\include\win32\jni_md.h"\
+	".\resource.h"\
 	
 
 ..\Common\Source\ErrorMonitorData.cpp : \
@@ -20,6 +23,8 @@
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\ClientManager.h"\
+	".\jdk1.5.0_10\include\jni.h"\
+	".\jdk1.5.0_10\include\win32\jni_md.h"\
 	
 
 ..\Common\Source\InputStream.cpp : \
@@ -29,7 +34,10 @@
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCDebugLog.h"\
+	"..\Common\Headers\TCErrorConstants.h"\
 	".\ClientManager.h"\
+	".\jdk1.5.0_10\include\jni.h"\
+	".\jdk1.5.0_10\include\win32\jni_md.h"\
 	
 
 ..\Common\Source\mutex.cpp : \
@@ -45,6 +53,8 @@
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\ClientManager.h"\
+	".\jdk1.5.0_10\include\jni.h"\
+	".\jdk1.5.0_10\include\win32\jni_md.h"\
 	
 
 ..\Common\Source\shareddata.cpp : \
@@ -82,18 +92,27 @@
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCDebugLog.h"\
+	"..\Common\Headers\TCErrorConstants.h"\
 	".\ClientManager.h"\
+	".\jdk1.5.0_10\include\jni.h"\
+	".\jdk1.5.0_10\include\win32\jni_md.h"\
 	
 
 .\TCFCppApi.cpp : \
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\pn_const.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
+	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\ClientManager.h"\
+	".\jdk1.5.0_10\include\jni.h"\
+	".\jdk1.5.0_10\include\win32\jni_md.h"\
 	".\TCFCppApi.h"\
 	
+
+.\resource.rc : \
+	".\resource.h"\
+	
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.mak
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.mak	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.mak	Tue Apr 07 10:52:56 2009 -0500
@@ -25,10 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "TCFClient - Win32 Release"
 
 OUTDIR=.\Release
@@ -63,8 +59,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MT /W3 /GX /O2 /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /Fp"$(INTDIR)\TCFClient.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\resource.res" /d "NDEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFClient.bsc" 
@@ -154,8 +184,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\TCFClient.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\resource.res" /d "_DEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFClient.bsc" 
@@ -214,36 +278,6 @@
 
 !ENDIF 
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("TCFClient.dep")
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/TCFCommSerial.dep
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/TCFCommSerial.dep	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/TCFCommSerial.dep	Tue Apr 07 10:52:56 2009 -0500
@@ -10,6 +10,7 @@
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\MessageFile.h"\
 	"..\TCFServer\Registry.h"\
@@ -23,14 +24,13 @@
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\pn_const.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\Connection.h"\
 	"..\TCFServer\MessageFile.h"\
@@ -39,7 +39,6 @@
 	
 
 .\StdAfx.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\StdAfx.h"\
 	
 
@@ -58,6 +57,7 @@
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\MessageFile.h"\
 	"..\TCFServer\Registry.h"\
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/TCFCommSerial.mak
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/TCFCommSerial.mak	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/TCFCommSerial.mak	Tue Apr 07 10:52:56 2009 -0500
@@ -25,10 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "TCFCommSerial - Win32 Release"
 
 OUTDIR=.\Release
@@ -57,8 +53,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"$(INTDIR)\TCFCommSerial.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFCommSerial.bsc" 
 BSC32_SBRS= \
@@ -123,8 +153,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"$(INTDIR)\TCFCommSerial.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFCommSerial.bsc" 
 BSC32_SBRS= \
@@ -160,36 +224,6 @@
 
 !ENDIF 
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("TCFCommSerial.dep")
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TCFCommTCP.dep
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TCFCommTCP.dep	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TCFCommTCP.dep	Tue Apr 07 10:52:56 2009 -0500
@@ -10,6 +10,7 @@
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\MessageFile.h"\
 	"..\TCFServer\Registry.h"\
@@ -20,7 +21,6 @@
 	
 
 .\StdAfx.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\StdAfx.h"\
 	
 
@@ -39,6 +39,7 @@
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\MessageFile.h"\
 	"..\TCFServer\Registry.h"\
@@ -50,14 +51,13 @@
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\pn_const.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\Connection.h"\
 	"..\TCFServer\MessageFile.h"\
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TCFCommTCP.mak
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TCFCommTCP.mak	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TCFCommTCP.mak	Tue Apr 07 10:52:56 2009 -0500
@@ -25,10 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "TCFCommTCP - Win32 Release"
 
 OUTDIR=.\Release
@@ -57,8 +53,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /Fp"$(INTDIR)\TCFCommTCP.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFCommTCP.bsc" 
 BSC32_SBRS= \
@@ -130,8 +160,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\TCFCommTCP.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFCommTCP.bsc" 
 BSC32_SBRS= \
@@ -178,36 +242,6 @@
 
 !ENDIF 
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("TCFCommTCP.dep")
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.dep
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.dep	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.dep	Tue Apr 07 10:52:56 2009 -0500
@@ -10,6 +10,7 @@
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\MessageFile.h"\
 	"..\TCFServer\Registry.h"\
@@ -23,8 +24,6 @@
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\pn_const.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
@@ -32,6 +31,7 @@
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFCommSerial\RealSerialComm.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\Connection.h"\
 	"..\TCFServer\MessageFile.h"\
@@ -39,7 +39,6 @@
 	
 
 .\StdAfx.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\StdAfx.h"\
 	
 
@@ -59,6 +58,7 @@
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFCommSerial\RealSerialComm.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\MessageFile.h"\
 	"..\TCFServer\Registry.h"\
@@ -77,6 +77,7 @@
 	"..\Common\Headers\TCErrorConstants.h"\
 	"..\TCFCommSerial\RealSerialComm.h"\
 	"..\TCFServer\BaseCom.h"\
+	"..\TCFServer\BaseProtocol.h"\
 	"..\TCFServer\Client.h"\
 	"..\TCFServer\MessageFile.h"\
 	"..\TCFServer\Registry.h"\
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.mak
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.mak	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.mak	Tue Apr 07 10:52:56 2009 -0500
@@ -25,10 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "TCFCommVirtualSerial - Win32 Release"
 
 OUTDIR=.\Release
@@ -58,8 +54,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"$(INTDIR)\TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFCommVirtualSerial.bsc" 
 BSC32_SBRS= \
@@ -126,8 +156,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"$(INTDIR)\TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFCommVirtualSerial.bsc" 
 BSC32_SBRS= \
@@ -164,36 +228,6 @@
 
 !ENDIF 
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("TCFCommVirtualSerial.dep")
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFNative.ncb
Binary file connectivity/com.nokia.tcf/native/TCFNative/TCFNative.ncb has changed
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFNative.opt
Binary file connectivity/com.nokia.tcf/native/TCFNative/TCFNative.opt has changed
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFProtOST/TCFProtOST.dep
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFProtOST/TCFProtOST.dep	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFProtOST/TCFProtOST.dep	Tue Apr 07 10:52:56 2009 -0500
@@ -10,7 +10,6 @@
 	
 
 .\StdAfx.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\StdAfx.h"\
 	
 
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFProtOST/TCFProtOST.mak
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFProtOST/TCFProtOST.mak	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFProtOST/TCFProtOST.mak	Tue Apr 07 10:52:56 2009 -0500
@@ -25,10 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "TCFProtOST - Win32 Release"
 
 OUTDIR=.\Release
@@ -55,8 +51,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFPROTOST_EXPORTS" /Fp"$(INTDIR)\TCFProtOST.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFProtOST.bsc" 
 BSC32_SBRS= \
@@ -117,8 +147,42 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFPROTOST_EXPORTS" /Fp"$(INTDIR)\TCFProtOST.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFProtOST.bsc" 
 BSC32_SBRS= \
@@ -152,36 +216,6 @@
 
 !ENDIF 
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("TCFProtOST.dep")
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.dep
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.dep	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.dep	Tue Apr 07 10:52:56 2009 -0500
@@ -1,75 +1,100 @@
 # Microsoft Developer Studio Generated Dependency File, included by TCFServer.mak
 
-.\BaseCom.cpp : \
+.\Client.cpp : \
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
+	".\Connection.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
+	".\Registry.h"\
+	".\ServerManager.h"\
+	
+
+.\CommRegistryItem.cpp : \
+	"..\Common\Headers\ErrorMonitorData.h"\
+	"..\Common\Headers\InputStream.h"\
+	"..\Common\Headers\mutex.h"\
+	"..\Common\Headers\ServerClient.h"\
+	"..\Common\Headers\shareddata.h"\
+	"..\Common\Headers\TCConstants.h"\
+	"..\Common\Headers\TCDebugLog.h"\
+	"..\Common\Headers\TCErrorConstants.h"\
+	".\BaseCom.h"\
+	".\BaseProtocol.h"\
+	".\Client.h"\
+	".\CommRegistryItem.h"\
+	".\MessageFile.h"\
 	".\Registry.h"\
 	
 
-.\Client.cpp : \
+.\Connection.cpp : \
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
 	".\Connection.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
 	".\ServerManager.h"\
 	
 
-.\Connection.cpp : \
+.\ConnectionImpl.cpp : \
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
 	".\Connection.h"\
-	".\MustiTcpComm.h"\
-	".\RealSerialComm.h"\
+	".\ConnectionImpl.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
+	".\RegistryImpl.h"\
 	".\ServerManager.h"\
-	".\TcpComm.h"\
-	".\VirtualSerialComm.h"\
 	
 
 ..\Common\Source\ErrorMonitorData.cpp : \
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
 	".\Connection.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
 	".\ServerManager.h"\
 	
@@ -78,91 +103,105 @@
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
 	".\Connection.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
 	".\ServerManager.h"\
 	
 
-.\MustiTcpComm.cpp : \
+.\MessageFile.cpp : \
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
-	".\MustiTcpComm.h"\
+	".\CommRegistryItem.h"\
+	".\Connection.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
-	".\TcpComm.h"\
+	".\ServerManager.h"\
 	
 
 ..\Common\Source\mutex.cpp : \
 	"..\Common\Headers\mutex.h"\
 	
 
-.\RealSerialComm.cpp : \
-	"..\Common\Headers\ErrorMonitorData.h"\
-	"..\Common\Headers\InputStream.h"\
+.\ProtocolRegistryItem.cpp : \
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
-	"..\Common\Headers\TCConstants.h"\
-	"..\Common\Headers\TCDebugLog.h"\
-	"..\Common\Headers\TCErrorConstants.h"\
-	".\BaseCom.h"\
-	".\Client.h"\
-	".\RealSerialComm.h"\
-	".\Registry.h"\
+	".\BaseProtocol.h"\
+	".\ProtocolRegistryItem.h"\
 	
 
 .\Registry.cpp : \
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
 	".\Connection.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
 	".\ServerManager.h"\
 	
 
+.\RegistryImpl.cpp : \
+	"..\Common\Headers\ErrorMonitorData.h"\
+	"..\Common\Headers\InputStream.h"\
+	"..\Common\Headers\mutex.h"\
+	"..\Common\Headers\ServerClient.h"\
+	"..\Common\Headers\shareddata.h"\
+	"..\Common\Headers\TCConstants.h"\
+	"..\Common\Headers\TCDebugLog.h"\
+	"..\Common\Headers\TCErrorConstants.h"\
+	".\Client.h"\
+	".\MessageFile.h"\
+	".\Registry.h"\
+	".\RegistryImpl.h"\
+	
+
 ..\Common\Source\ServerClient.cpp : \
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
 	".\Connection.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
 	".\ServerManager.h"\
 	
@@ -171,17 +210,21 @@
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
 	".\Connection.h"\
+	".\ConnectionImpl.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
+	".\resource.h"\
 	".\ServerManager.h"\
 	
 
@@ -202,51 +245,22 @@
 	"..\Common\Headers\ErrorMonitorData.h"\
 	"..\Common\Headers\InputStream.h"\
 	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
 	"..\Common\Headers\ServerClient.h"\
 	"..\Common\Headers\shareddata.h"\
 	"..\Common\Headers\TCConstants.h"\
 	"..\Common\Headers\TCDebugLog.h"\
 	"..\Common\Headers\TCErrorConstants.h"\
 	".\BaseCom.h"\
+	".\BaseProtocol.h"\
 	".\Client.h"\
+	".\CommRegistryItem.h"\
 	".\Connection.h"\
+	".\MessageFile.h"\
+	".\ProtocolRegistryItem.h"\
 	".\Registry.h"\
 	".\ServerManager.h"\
 	
 
-.\TcpComm.cpp : \
-	"..\Common\Headers\ErrorMonitorData.h"\
-	"..\Common\Headers\InputStream.h"\
-	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
-	"..\Common\Headers\ServerClient.h"\
-	"..\Common\Headers\shareddata.h"\
-	"..\Common\Headers\TCConstants.h"\
-	"..\Common\Headers\TCDebugLog.h"\
-	"..\Common\Headers\TCErrorConstants.h"\
-	".\BaseCom.h"\
-	".\Client.h"\
-	".\Registry.h"\
-	".\TcpComm.h"\
+.\resource.rc : \
+	".\resource.h"\
 	
-
-.\VirtualSerialComm.cpp : \
-	"..\Common\Headers\ErrorMonitorData.h"\
-	"..\Common\Headers\InputStream.h"\
-	"..\Common\Headers\mutex.h"\
-	"..\Common\Headers\OSTConstants.h"\
-	"..\Common\Headers\PNConstants.h"\
-	"..\Common\Headers\ServerClient.h"\
-	"..\Common\Headers\shareddata.h"\
-	"..\Common\Headers\TCConstants.h"\
-	"..\Common\Headers\TCDebugLog.h"\
-	"..\Common\Headers\TCErrorConstants.h"\
-	".\BaseCom.h"\
-	".\Client.h"\
-	".\RealSerialComm.h"\
-	".\Registry.h"\
-	".\VirtualSerialComm.h"\
-	
diff -r 05c4630a6d73 -r 6ebd50a63164 connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.mak
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.mak	Mon Apr 06 15:46:51 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.mak	Tue Apr 07 10:52:56 2009 -0500
@@ -25,9 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "TCFServer - Win32 Release"
 
 OUTDIR=.\Release
@@ -65,7 +62,40 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MT /W3 /GX /O2 /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\TCFServer.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\resource.res" /d "NDEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFServer.bsc" 
@@ -170,7 +200,40 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\TCFServer.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\resource.res" /d "_DEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\TCFServer.bsc" 
@@ -241,36 +304,6 @@
 
 !ENDIF 
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("TCFServer.dep")