aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demos/various/RT-Win32-Simulator/Makefile4
-rw-r--r--os/hal/ports/simulator/win32/hal_lld.c2
-rw-r--r--readme.txt2
3 files changed, 5 insertions, 3 deletions
diff --git a/demos/various/RT-Win32-Simulator/Makefile b/demos/various/RT-Win32-Simulator/Makefile
index 578275a2a..8f264c994 100644
--- a/demos/various/RT-Win32-Simulator/Makefile
+++ b/demos/various/RT-Win32-Simulator/Makefile
@@ -61,7 +61,7 @@ endif
#
# Define project name here
-PROJECT = ch
+PROJECT = ch.exe
# Imported source files and paths
CHIBIOS = ../../..
@@ -122,7 +122,7 @@ UINCDIR =
ULIBDIR =
# List all user libraries here
-ULIBS =
+ULIBS = -lws2_32
#
# End of user defines
diff --git a/os/hal/ports/simulator/win32/hal_lld.c b/os/hal/ports/simulator/win32/hal_lld.c
index 6a0220b91..5b50ca5c3 100644
--- a/os/hal/ports/simulator/win32/hal_lld.c
+++ b/os/hal/ports/simulator/win32/hal_lld.c
@@ -80,7 +80,7 @@ void _sim_check_for_interrupts(void) {
#if HAL_USE_SERIAL
if (sd_lld_interrupt_pending()) {
- int_occured = true;
+ int_occurred = true;
}
#endif
diff --git a/readme.txt b/readme.txt
index 37ad3d65e..5df7337ea 100644
--- a/readme.txt
+++ b/readme.txt
@@ -126,6 +126,8 @@
- EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
+- HAL: Fixed win32 simulator HAL broken because a typo (bug #954)(backported
+ to 18.2.2).
- HAL: Fixed race condition in STM32 ADCv3 driver (bug #953)(backported to
18.2.2 and 17.6.5).
- HAL: Fixed wrong registry entries for STM32F030x4 (bug #952)(backported