5 files changed, 15 insertions, 2 deletions
diff --git a/demos/Win32-MSVS/ch.vcproj b/demos/Win32-MSVS/ch.vcproj
index 26dd9557e..3490c810b 100644
--- a/demos/Win32-MSVS/ch.vcproj
+++ b/demos/Win32-MSVS/ch.vcproj
@@ -142,6 +142,9 @@
 				Name="src"
 				Filter="">
 				<File
+					RelativePath="..\..\src\chdebug.c">
+				</File>
+				<File
 					RelativePath="..\..\src\chdelta.c">
 				</File>
 				<File
@@ -210,6 +213,9 @@
 					RelativePath="..\..\src\include\ch.h">
 				</File>
 				<File
+					RelativePath="..\..\src\include\debug.h">
+				</File>
+				<File
 					RelativePath="..\..\src\include\delta.h">
 				</File>
 				<File
diff --git a/demos/Win32-MSVS/chconf.h b/demos/Win32-MSVS/chconf.h
index 1aa089575..be1896046 100644
--- a/demos/Win32-MSVS/chconf.h
+++ b/demos/Win32-MSVS/chconf.h
@@ -161,6 +161,12 @@
  */
 //#define CH_CURRP_REGISTER_CACHE "reg"
 
+/** Configuration option: Includes basic debug support to the kernel.
+ *  @note the debug support is port-dependent, it may be not present on some
+ *       targets. In that case stub functions will be included.
+ */
+//#define CH_USE_DEBUG
+
 #endif  /* _CHCONF_H_ */
 
 /** @} */
diff --git a/demos/Win32-MSVS/chcore.c b/demos/Win32-MSVS/chcore.c
index 01619f9cd..8aedbb465 100644
--- a/demos/Win32-MSVS/chcore.c
+++ b/demos/Win32-MSVS/chcore.c
@@ -47,7 +47,7 @@ void InitCore(void) {
 /*
  * Interrupt simulation.
  */
-static void ChkIntSources(void) {
+void ChkIntSources(void) {
   LARGE_INTEGER n;
 
   if (Com1InInterruptSimCom()   || Com2InInterruptSimCom()  ||
diff --git a/demos/Win32-MSVS/chcore.h b/demos/Win32-MSVS/chcore.h
index 26e0b66bf..58e278fe4 100644
--- a/demos/Win32-MSVS/chcore.h
+++ b/demos/Win32-MSVS/chcore.h
@@ -58,8 +58,8 @@ typedef struct {
 }
 
 #define chSysLock()
-
 #define chSysUnlock()
+#define chSysPuts(msg) {}
 
 #define INT_REQUIRED_STACK 0x0
 
diff --git a/demos/Win32-MSVS/chtypes.h b/demos/Win32-MSVS/chtypes.h
index 6481c22a8..5ab9a06e1 100644
--- a/demos/Win32-MSVS/chtypes.h
+++ b/demos/Win32-MSVS/chtypes.h
@@ -33,6 +33,7 @@
 
 typedef BYTE8       t_tmode;
 typedef BYTE8       t_tstate;
+typedef UWORD16     t_tid;
 typedef ULONG32     t_prio;
 typedef LONG32      t_msg;
 typedef LONG32      t_eventid;