2 files changed, 18 insertions, 5 deletions
diff --git a/demos/Win32-MinGW/chcore.h b/demos/Win32-MinGW/chcore.h
index 70efa7edb..40555df63 100644
--- a/demos/Win32-MinGW/chcore.h
+++ b/demos/Win32-MinGW/chcore.h
@@ -144,6 +144,16 @@ typedef struct {
 #define SYS_IRQ_HANDLER
 
 /**
+ * Simulator initialization.
+ */
+#define sys_init() InitCore()
+
+/**
+ * Does nothing in this simulator.
+ */
+#define sys_disable_all()
+
+/**
  * Does nothing in this simulator.
  */
 #define sys_disable()
@@ -156,17 +166,22 @@ typedef struct {
 /**
  * Does nothing in this simulator.
  */
-#define sys_disable_from_isr()
+#define sys_lock()
 
 /**
  * Does nothing in this simulator.
  */
-#define sys_enable_from_isr()
+#define sys_unlock()
 
 /**
  * Does nothing in this simulator.
  */
-#define sys_disable_all()
+#define sys_lock_from_isr()
+
+/**
+ * Does nothing in this simulator.
+ */
+#define sys_unlock_from_isr()
 
 /**
  * In the simulator this does a polling pass on the simulated interrupt
diff --git a/demos/Win32-MinGW/main.c b/demos/Win32-MinGW/main.c
index eaf2504dd..a72d7b4da 100644
--- a/demos/Win32-MinGW/main.c
+++ b/demos/Win32-MinGW/main.c
@@ -279,8 +279,6 @@ static evhandler_t fhandlers[2] = {
 int main(void) {
   EventListener c1fel, c2fel;
 
-  InitCore();
-
   // Startup ChibiOS/RT.
   chSysInit();