Reintegrated RT5 point1 branch.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10833 35acf78f-673a-0410-8e92-d51de3d6d3f4

8 files changed, 29 insertions, 27 deletions

diff --git a/os/hal/include/hal_buffers.h b/os/hal/include/hal_buffers.h
index 7d776f4a7..ac541d286 100644
--- a/os/hal/include/hal_buffers.h
+++ b/os/hal/include/hal_buffers.h
@@ -284,14 +284,14 @@ extern "C" {
   uint8_t *ibqGetEmptyBufferI(input_buffers_queue_t *ibqp);

   void ibqPostFullBufferI(input_buffers_queue_t *ibqp, size_t size);

   msg_t ibqGetFullBufferTimeout(input_buffers_queue_t *ibqp,

-                                systime_t timeout);

+                                sysinterval_t timeout);

   msg_t ibqGetFullBufferTimeoutS(input_buffers_queue_t *ibqp,

-                                 systime_t timeout);

+                                 sysinterval_t timeout);

   void ibqReleaseEmptyBuffer(input_buffers_queue_t *ibqp);

   void ibqReleaseEmptyBufferS(input_buffers_queue_t *ibqp);

-  msg_t ibqGetTimeout(input_buffers_queue_t *ibqp, systime_t timeout);

+  msg_t ibqGetTimeout(input_buffers_queue_t *ibqp, sysinterval_t timeout);

   size_t ibqReadTimeout(input_buffers_queue_t *ibqp, uint8_t *bp,

-                        size_t n, systime_t timeout);

+                        size_t n, sysinterval_t timeout);

   void obqObjectInit(output_buffers_queue_t *obqp, bool suspended, uint8_t *bp,

                      size_t size, size_t n, bqnotify_t onfy, void *link);

   void obqResetI(output_buffers_queue_t *obqp);

@@ -299,15 +299,15 @@ extern "C" {
                              size_t *sizep);

   void obqReleaseEmptyBufferI(output_buffers_queue_t *obqp);

   msg_t obqGetEmptyBufferTimeout(output_buffers_queue_t *obqp,

-                                 systime_t timeout);

+                                 sysinterval_t timeout);

   msg_t obqGetEmptyBufferTimeoutS(output_buffers_queue_t *obqp,

-                                  systime_t timeout);

+                                  sysinterval_t timeout);

   void obqPostFullBuffer(output_buffers_queue_t *obqp, size_t size);

   void obqPostFullBufferS(output_buffers_queue_t *obqp, size_t size);

   msg_t obqPutTimeout(output_buffers_queue_t *obqp, uint8_t b,

-                      systime_t timeout);

+                      sysinterval_t timeout);

   size_t obqWriteTimeout(output_buffers_queue_t *obqp, const uint8_t *bp,

-                         size_t n, systime_t timeout);

+                         size_t n, sysinterval_t timeout);

   bool obqTryFlushI(output_buffers_queue_t *obqp);

   void obqFlush(output_buffers_queue_t *obqp);

 #ifdef __cplusplus

diff --git a/os/hal/include/hal_can.h b/os/hal/include/hal_can.h
index e91d8bd8b..78bd12a20 100644
--- a/os/hal/include/hal_can.h
+++ b/os/hal/include/hal_can.h
@@ -152,11 +152,11 @@ extern "C" {
   msg_t canTransmitTimeout(CANDriver *canp,

                            canmbx_t mailbox,

                            const CANTxFrame *ctfp,

-                           systime_t timeout);

+                           sysinterval_t timeout);

   msg_t canReceiveTimeout(CANDriver *canp,

                           canmbx_t mailbox,

                           CANRxFrame *crfp,

-                          systime_t timeout);

+                          sysinterval_t timeout);

 #if CAN_USE_SLEEP_MODE

   void canSleep(CANDriver *canp);

   void canWakeup(CANDriver *canp);

diff --git a/os/hal/include/hal_channels.h b/os/hal/include/hal_channels.h
index 748dbe04a..f0d8f4d77 100644
--- a/os/hal/include/hal_channels.h
+++ b/os/hal/include/hal_channels.h
@@ -51,14 +51,15 @@
 #define _base_channel_methods                                               \

   _base_sequential_stream_methods                                           \

   /* Channel put method with timeout specification.*/                       \

-  msg_t (*putt)(void *instance, uint8_t b, systime_t time);                 \

+  msg_t (*putt)(void *instance, uint8_t b, sysinterval_t time);             \

   /* Channel get method with timeout specification.*/                       \

-  msg_t (*gett)(void *instance, systime_t time);                            \

+  msg_t (*gett)(void *instance, sysinterval_t time);                        \

   /* Channel write method with timeout specification.*/                     \

   size_t (*writet)(void *instance, const uint8_t *bp,                       \

-                   size_t n, systime_t time);                               \

+                   size_t n, sysinterval_t time);                           \

   /* Channel read method with timeout specification.*/                      \

-  size_t (*readt)(void *instance, uint8_t *bp, size_t n, systime_t time);   \

+  size_t (*readt)(void *instance, uint8_t *bp, size_t n,                    \

+                  sysinterval_t time);                                      \

   /* Channel put method with timeout specification.*/                       \

   msg_t (*ctl)(void *instance, unsigned int operation, void *arg);

 

diff --git a/os/hal/include/hal_i2c.h b/os/hal/include/hal_i2c.h
index c9c8409cb..379c56308 100644
--- a/os/hal/include/hal_i2c.h
+++ b/os/hal/include/hal_i2c.h
@@ -145,11 +145,11 @@ extern "C" {
                                  i2caddr_t addr,

                                  const uint8_t *txbuf, size_t txbytes,

                                  uint8_t *rxbuf, size_t rxbytes,

-                                 systime_t timeout);

+                                 sysinterval_t timeout);

   msg_t i2cMasterReceiveTimeout(I2CDriver *i2cp,

                                 i2caddr_t addr,

                                 uint8_t *rxbuf, size_t rxbytes,

-                                systime_t timeout);

+                                sysinterval_t timeout);

 #if I2C_USE_MUTUAL_EXCLUSION == TRUE

   void i2cAcquireBus(I2CDriver *i2cp);

   void i2cReleaseBus(I2CDriver *i2cp);

diff --git a/os/hal/include/hal_mac.h b/os/hal/include/hal_mac.h
index 5c7bc82de..0ca5e5fcd 100644
--- a/os/hal/include/hal_mac.h
+++ b/os/hal/include/hal_mac.h
@@ -184,11 +184,11 @@ extern "C" {
   void macSetAddress(MACDriver *macp, const uint8_t *p);

   msg_t macWaitTransmitDescriptor(MACDriver *macp,

                                   MACTransmitDescriptor *tdp,

-                                  systime_t timeout);

+                                  sysinterval_t timeout);

   void macReleaseTransmitDescriptor(MACTransmitDescriptor *tdp);

   msg_t macWaitReceiveDescriptor(MACDriver *macp,

                                  MACReceiveDescriptor *rdp,

-                                 systime_t timeout);

+                                 sysinterval_t timeout);

   void macReleaseReceiveDescriptor(MACReceiveDescriptor *rdp);

   bool macPollLinkStatus(MACDriver *macp);

 #ifdef __cplusplus

diff --git a/os/hal/include/hal_pal.h b/os/hal/include/hal_pal.h
index e2d85f0fe..fdf4e2586 100644
--- a/os/hal/include/hal_pal.h
+++ b/os/hal/include/hal_pal.h
@@ -1006,8 +1006,9 @@ extern "C" {
   void palSetLineCallbackI(ioline_t line, palcallback_t cb, void *arg);

 #endif /* PAL_USE_CALLBACKS */

 #if PAL_USE_WAIT || defined(__DOXYGEN__)

-  msg_t palWaitPadTimeoutS(ioportid_t port, iopadid_t pad, systime_t timeout);

-  msg_t palWaitLineTimeoutS(ioline_t line, systime_t timeout);

+  msg_t palWaitPadTimeoutS(ioportid_t port, iopadid_t pad,

+                           sysinterval_t timeout);

+  msg_t palWaitLineTimeoutS(ioline_t line, sysinterval_t timeout);

 #endif /* PAL_USE_WAIT */

 #ifdef __cplusplus

 }

diff --git a/os/hal/include/hal_queues.h b/os/hal/include/hal_queues.h
index 1f2777e76..ffafc8805 100644
--- a/os/hal/include/hal_queues.h
+++ b/os/hal/include/hal_queues.h
@@ -278,17 +278,17 @@ extern "C" {
                     qnotify_t infy, void *link);

   void iqResetI(input_queue_t *iqp);

   msg_t iqPutI(input_queue_t *iqp, uint8_t b);

-  msg_t iqGetTimeout(input_queue_t *iqp, systime_t timeout);

+  msg_t iqGetTimeout(input_queue_t *iqp, sysinterval_t timeout);

   size_t iqReadTimeout(input_queue_t *iqp, uint8_t *bp,

-                       size_t n, systime_t timeout);

+                       size_t n, sysinterval_t timeout);

 

   void oqObjectInit(output_queue_t *oqp, uint8_t *bp, size_t size,

                     qnotify_t onfy, void *link);

   void oqResetI(output_queue_t *oqp);

-  msg_t oqPutTimeout(output_queue_t *oqp, uint8_t b, systime_t timeout);

+  msg_t oqPutTimeout(output_queue_t *oqp, uint8_t b, sysinterval_t timeout);

   msg_t oqGetI(output_queue_t *oqp);

   size_t oqWriteTimeout(output_queue_t *oqp, const uint8_t *bp,

-                        size_t n, systime_t timeout);

+                        size_t n, sysinterval_t timeout);

 #ifdef __cplusplus

 }

 #endif

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);