--- a/targets/Win32/plc_Win32_main.c	Thu Aug 28 15:08:41 2008 +0200
+++ b/targets/Win32/plc_Win32_main.c	Thu Aug 28 16:34:48 2008 +0200
@@ -31,7 +31,7 @@
 HANDLE PLC_timer = NULL;
 void PLC_SetTimer(long long next, long long period)
 {
-	LARGE_INTEGER liDueTime;		
+	LARGE_INTEGER liDueTime;
 	/* arg 2 of SetWaitableTimer take 100 ns interval*/
 	liDueTime.QuadPart =  next / (-100);
 	
@@ -43,18 +43,45 @@
     {
         printf("SetWaitableTimer failed (%d)\n", GetLastError());
     }
+}
+
+/* Variable used to stop plcloop thread */
+int runplcloop;
+void PlcLoop()
+{
+	runplcloop = 1;
+	while(runplcloop)
+	{
+	// Set a timer
+	PLC_SetTimer(Ttick,Ttick);
 	if (WaitForSingleObject(PLC_timer, INFINITE) != WAIT_OBJECT_0)
 	{
 		printf("WaitForSingleObject failed (%d)\n", GetLastError());
 	}
 	PLC_timer_notify();
+	}
 }
 
-int main(int argc,char **argv)
+HANDLE DebugLock;
+HANDLE PLC_thread;
+
+int startPLC(int argc,char **argv)
 {
+	unsigned long thread_id = 0;
 	/* Translate PLC's microseconds to Ttick nanoseconds */
 	Ttick = 1000000 * maxval(common_ticktime__,1);
 
+	DebugLock = CreateMutex( 
+	        	NULL,              // default security attributes
+	        	FALSE,             // initially not owned
+	        	NULL);             // unnamed mutex
+
+    if (DebugLock == NULL) 
+    {
+        printf("CreateMutex error: %d\n", GetLastError());
+        return;
+    }
+	
 	/* Create a waitable timer */
     PLC_timer = CreateWaitableTimer(NULL, FALSE, "WaitableTimer");
     if(NULL == PLC_timer)
@@ -62,24 +89,40 @@
         printf("CreateWaitableTimer failed (%d)\n", GetLastError());
         return 1;
     }
-
     if( __init(argc,argv) == 0 )
     {
     	printf("Tick Time : %d ms\n", common_ticktime__);
-    	while(1)
-    	{
-    		// Set a timer
-    		PLC_SetTimer(Ttick,Ttick);
-    		if (kbhit())
-    		{
-    			printf("Finishing\n");
-    		    break;
-            }
-    	}
-    	PLC_SetTimer(0,0);
+    	PLC_thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)PlcLoop, NULL, 0, &thread_id);
     }
-    __cleanup();
-    CloseHandle(PLC_timer);
-    		
+    else{
+    	return 1;
+    }
     return 0;
 }
+
+int stopPLC()
+{
+	runplcloop = 0;
+	WaitForSingleObject(PLC_thread, INFINITE);
+	CloseHandle(PLC_thread);
+	CloseHandle(DebugLock);
+    CloseHandle(PLC_timer);
+    __cleanup();
+}
+
+/* from plc_debugger.c */
+void WaitDebugData()
+{
+	DWORD dwWaitResult;
+	dwWaitResult = WaitForSingleObject( 
+					DebugLock,  // handle to mutex
+					INFINITE);  // no time-out interval
+}
+ 
+/* Called by PLC thread when debug_publish finished
+ * This is supposed to unlock debugger thread in WaitDebugData*/
+void InitiateDebugTransfer()
+{
+    /* signal debugger thread to continue*/
+	ReleaseMutex(DebugLock);
+}