diff options
author | Fabien Poussin <fabien.poussin@gmail.com> | 2018-03-15 12:51:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-15 12:51:14 +0100 |
commit | 3add406135c78d44ebc38d810b22af5da19cd296 (patch) | |
tree | fd42297388ca04dc8ff202e40d491b73ff4c21d6 /os/hal/include | |
parent | 345e218afd4f8009729dddc6eb541d8ec6a91565 (diff) | |
parent | dabdfca04e5f470d1eb83f72f18269bd294031b6 (diff) | |
download | ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.gz ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.bz2 ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.zip |
Merge branch 'master' into update_tests
Diffstat (limited to 'os/hal/include')
-rw-r--r-- | os/hal/include/hal_community.h | 2 | ||||
-rw-r--r-- | os/hal/include/usbh/dev/uvc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/os/hal/include/hal_community.h b/os/hal/include/hal_community.h index cdedad6..83b1f02 100644 --- a/os/hal/include/hal_community.h +++ b/os/hal/include/hal_community.h @@ -48,7 +48,7 @@ #endif
#if !defined(HAL_USE_QEI)
-#define HAL_USE_QEI FALSE
+#define HAL_USE_QEI FALSE
#endif
#if !defined(HAL_USE_RNG)
diff --git a/os/hal/include/usbh/dev/uvc.h b/os/hal/include/usbh/dev/uvc.h index 817d465..0477312 100644 --- a/os/hal/include/usbh/dev/uvc.h +++ b/os/hal/include/usbh/dev/uvc.h @@ -430,7 +430,7 @@ extern "C" { static inline msg_t usbhuvcLockAndFetchS(USBHUVCDriver *uvcdp, msg_t *msg, systime_t timeout) { chMtxLockS(&uvcdp->mtx); - msg_t ret = chMBFetchS(&uvcdp->mb, msg, timeout); + msg_t ret = chMBFetchTimeoutS(&uvcdp->mb, msg, timeout); if (ret != MSG_OK) chMtxUnlockS(&uvcdp->mtx); return ret; |