diff options
| author | walkerstop <walkerstop@gmail.com> | 2018-05-01 01:00:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 01:00:33 -0700 |
| commit | 40db44f540436398e0840544044154d13eee63b6 (patch) | |
| tree | dad3f1f3b6ac3927484ee22002a947662a8a0173 /demos/various | |
| parent | 4e9f077fb10255dced1da4d5d2ad9f8ae41442a2 (diff) | |
| parent | d4d384557df0e8e7a8071553448b0c42849f98c0 (diff) | |
| download | ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.tar.gz ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.tar.bz2 ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.zip | |
Merge branch 'master' into master
Diffstat (limited to 'demos/various')
| -rw-r--r-- | demos/various/RT-Win32-TriBuf/Makefile | 2 | ||||
| -rw-r--r-- | demos/various/RT-Win32-TriBuf/chconf.h | 3 | ||||
| -rw-r--r-- | demos/various/RT-Win32-TriBuf/main.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/demos/various/RT-Win32-TriBuf/Makefile b/demos/various/RT-Win32-TriBuf/Makefile index 0ed677e..a50f45a 100644 --- a/demos/various/RT-Win32-TriBuf/Makefile +++ b/demos/various/RT-Win32-TriBuf/Makefile @@ -62,7 +62,7 @@ include $(CHIBIOS)/os/hal/boards/simulator/board.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/simulator/win32/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
-include $(CHIBIOS)/os/rt/ports/SIMIA32/compilers/GCC/port.mk
+include $(CHIBIOS)/os/common/ports/SIMIA32/compilers/GCC/port.mk
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/test/rt/test.mk
diff --git a/demos/various/RT-Win32-TriBuf/chconf.h b/demos/various/RT-Win32-TriBuf/chconf.h index 835d59b..75839d3 100644 --- a/demos/various/RT-Win32-TriBuf/chconf.h +++ b/demos/various/RT-Win32-TriBuf/chconf.h @@ -28,6 +28,9 @@ #ifndef _CHCONF_H_
#define _CHCONF_H_
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_5_0_
+
/*===========================================================================*/
/**
* @name System timers settings
diff --git a/demos/various/RT-Win32-TriBuf/main.c b/demos/various/RT-Win32-TriBuf/main.c index bab25cd..e2b2265 100644 --- a/demos/various/RT-Win32-TriBuf/main.c +++ b/demos/various/RT-Win32-TriBuf/main.c @@ -51,7 +51,7 @@ static char read_front(void) { msg_t error;
/* Wait until a new front buffer gets available with prepared data */
- error = tribufWaitReadyTimeout(&tribuf, MS2ST(1000));
+ error = tribufWaitReadyTimeout(&tribuf, TIME_MS2I(1000));
if (error == MSG_TIMEOUT)
chSysHalt("ERROR: read_front() timed out");
|