Fixed bug #686.

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

2 files changed, 12 insertions, 12 deletions

diff --git a/os/hal/src/hal_buffers.c b/os/hal/src/hal_buffers.c
index 69f303013..2dae9771e 100644
--- a/os/hal/src/hal_buffers.c
+++ b/os/hal/src/hal_buffers.c
@@ -175,9 +175,9 @@ msg_t ibqGetFullBufferTimeout(input_buffers_queue_t *ibqp,
                               systime_t timeout) {

   msg_t msg;

 

-  chSysLock();

+  osalSysLock();

   msg = ibqGetFullBufferTimeoutS(ibqp, timeout);

-  chSysUnlock();

+  osalSysUnlock();

 

   return msg;

 }

@@ -233,9 +233,9 @@ msg_t ibqGetFullBufferTimeout(input_buffers_queue_t *ibqp,
  */

 void ibqReleaseEmptyBuffer(input_buffers_queue_t *ibqp) {

 

-  chSysLock();

+  osalSysLock();

   ibqReleaseEmptyBufferS(ibqp);

-  chSysUnlock();

+  osalSysUnlock();

 }

 

   /**

@@ -545,9 +545,9 @@ msg_t obqGetEmptyBufferTimeout(output_buffers_queue_t *obqp,
                                 systime_t timeout) {

   msg_t msg;

 

-  chSysLock();

+  osalSysLock();

   msg = obqGetEmptyBufferTimeoutS(obqp, timeout);

-  chSysUnlock();

+  osalSysUnlock();

 

   return msg;

 }

diff --git a/os/hal/src/pal.c b/os/hal/src/pal.c
index 820ee1979..ec86996a2 100644
--- a/os/hal/src/pal.c
+++ b/os/hal/src/pal.c
@@ -50,8 +50,8 @@
  * @brief   Read from an I/O bus.

  * @note    The operation is not guaranteed to be atomic on all the

  *          architectures, for atomicity and/or portability reasons you may

- *          need to enclose port I/O operations between @p chSysLock() and

- *          @p chSysUnlock().

+ *          need to enclose port I/O operations between @p osalSysLock() and

+ *          @p osalSysUnlock().

  * @note    The function internally uses the @p palReadGroup() macro. The use

  *          of this function is preferred when you value code size, readability

  *          and error checking over speed.

@@ -73,8 +73,8 @@ ioportmask_t palReadBus(IOBus *bus) {
  * @brief   Write to an I/O bus.

  * @note    The operation is not guaranteed to be atomic on all the

  *          architectures, for atomicity and/or portability reasons you may

- *          need to enclose port I/O operations between @p chSysLock() and

- *          @p chSysUnlock().

+ *          need to enclose port I/O operations between @p osalSysLock() and

+ *          @p osalSysUnlock().

  * @note    The default implementation is non atomic and not necessarily

  *          optimal. Low level drivers may  optimize the function by using

  *          specific hardware or coding.

@@ -98,8 +98,8 @@ void palWriteBus(IOBus *bus, ioportmask_t bits) {
  * @brief   Programs a bus with the specified mode.

  * @note    The operation is not guaranteed to be atomic on all the

  *          architectures, for atomicity and/or portability reasons you may

- *          need to enclose port I/O operations between @p chSysLock() and

- *          @p chSysUnlock().

+ *          need to enclose port I/O operations between @p osalSysLock() and

+ *          @p osalSysUnlock().

  * @note    The default implementation is non atomic and not necessarily

  *          optimal. Low level drivers may  optimize the function by using

  *          specific hardware or coding.