aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/include/hal_uart.h
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-10-16 09:31:32 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-10-16 09:31:32 +0000
commit6bbfd2126f0cd20c733b78682d322250d8223d93 (patch)
tree9f9856ad4e17aeee3dba156e5211eb0579061844 /os/hal/include/hal_uart.h
parent97442e7faaed76d0da347c96df3da2122e033bd1 (diff)
parent5596d3e69e0d1c7c9a7b07f9bf83416d2c25cd8b (diff)
downloadChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.tar.gz
ChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.tar.bz2
ChibiOS-6bbfd2126f0cd20c733b78682d322250d8223d93.zip
Reintegrated RT5 point1 branch.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10833 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include/hal_uart.h')
-rw-r--r--os/hal/include/hal_uart.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/os/hal/include/hal_uart.h b/os/hal/include/hal_uart.h
index 5523b82f1..01d61df7a 100644
--- a/os/hal/include/hal_uart.h
+++ b/os/hal/include/hal_uart.h
@@ -359,11 +359,11 @@ extern "C" {
size_t uartStopReceiveI(UARTDriver *uartp);
#if UART_USE_WAIT == TRUE
msg_t uartSendTimeout(UARTDriver *uartp, size_t *np,
- const void *txbuf, systime_t timeout);
+ const void *txbuf, sysinterval_t timeout);
msg_t uartSendFullTimeout(UARTDriver *uartp, size_t *np,
- const void *txbuf, systime_t timeout);
+ const void *txbuf, sysinterval_t timeout);
msg_t uartReceiveTimeout(UARTDriver *uartp, size_t *np,
- void *rxbuf, systime_t timeout);
+ void *rxbuf, sysinterval_t timeout);
#endif
#if UART_USE_MUTUAL_EXCLUSION == TRUE
void uartAcquireBus(UARTDriver *uartp);