From 17f0815d52977bd1e3e9e662d2ffdccbaf77a6bd Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 21 Feb 2011 18:00:06 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2756
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/src/chevents.c | 26 ++++++++++-----
 os/kernel/src/chmboxes.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 8 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chevents.c b/os/kernel/src/chevents.c
index a0ef2d1bb..a64f59bdc 100644
--- a/os/kernel/src/chevents.c
+++ b/os/kernel/src/chevents.c
@@ -160,12 +160,12 @@ eventmask_t chEvtAddFlags(eventmask_t mask) {
  *
  * @api
  */
-void chEvtSignal(Thread *tp, eventmask_t mask) {
+void chEvtSignalFlags(Thread *tp, eventmask_t mask) {
 
   chDbgCheck(tp != NULL, "chEvtSignal");
 
   chSysLock();
-  chEvtSignalI(tp, mask);
+  chEvtSignalFlagsI(tp, mask);
   chSchRescheduleS();
   chSysUnlock();
 }
@@ -182,7 +182,7 @@ void chEvtSignal(Thread *tp, eventmask_t mask) {
  *
  * @iclass
  */
-void chEvtSignalI(Thread *tp, eventmask_t mask) {
+void chEvtSignalFlagsI(Thread *tp, eventmask_t mask) {
 
   chDbgCheck(tp != NULL, "chEvtSignalI");
 
@@ -198,15 +198,20 @@ void chEvtSignalI(Thread *tp, eventmask_t mask) {
 /**
  * @brief   Signals all the Event Listeners registered on the specified Event
  *          Source.
+ * @details This function variants ORs the specified event flags to all the
+ *          threads registered on the @p EventSource in addition to the event
+ *          flags specified by the threads themselves in the
+ *          @p EventListener objects.
  *
  * @param[in] esp       pointer to the @p EventSource structure
+ * @param[in] mask      the event flags set to be ORed
  *
  * @api
  */
-void chEvtBroadcast(EventSource *esp) {
+void chEvtBroadcastFlags(EventSource *esp, eventmask_t mask) {
 
   chSysLock();
-  chEvtBroadcastI(esp);
+  chEvtBroadcastFlagsI(esp, mask);
   chSchRescheduleS();
   chSysUnlock();
 }
@@ -214,23 +219,28 @@ void chEvtBroadcast(EventSource *esp) {
 /**
  * @brief   Signals all the Event Listeners registered on the specified Event
  *          Source.
+ * @details This function variants ORs the specified event flags to all the
+ *          threads registered on the @p EventSource in addition to the event
+ *          flags specified by the threads themselves in the
+ *          @p EventListener objects.
  * @post    This function does not reschedule so a call to a rescheduling
  *          function must be performed before unlocking the kernel. Note that
  *          interrupt handlers always reschedule on exit so an explicit
  *          reschedule must not be performed in ISRs.
  *
  * @param[in] esp       pointer to the @p EventSource structure
+ * @param[in] mask      the event flags set to be ORed
  *
  * @iclass
  */
-void chEvtBroadcastI(EventSource *esp) {
+void chEvtBroadcastFlagsI(EventSource *esp, eventmask_t mask) {
   EventListener *elp;
 
-  chDbgCheck(esp != NULL, "chEvtBroadcastI");
+  chDbgCheck(esp != NULL, "chEvtBroadcastMaskI");
 
   elp = esp->es_next;
   while (elp != (EventListener *)esp) {
-    chEvtSignalI(elp->el_listener, elp->el_mask);
+    chEvtSignalFlagsI(elp->el_listener, elp->el_mask | mask);
     elp = elp->el_next;
   }
 }
diff --git a/os/kernel/src/chmboxes.c b/os/kernel/src/chmboxes.c
index b2cef2470..e0b6ca014 100644
--- a/os/kernel/src/chmboxes.c
+++ b/os/kernel/src/chmboxes.c
@@ -155,6 +155,34 @@ msg_t chMBPostS(Mailbox *mbp, msg_t msg, systime_t time) {
   return rdymsg;
 }
 
+/**
+ * @brief   Posts a message into a mailbox.
+ * @details This variant is non-blocking, the function returns a timeout
+ *          condition if the queue is full.
+ *
+ * @param[in] mbp       the pointer to an initialized Mailbox object
+ * @param[in] msg       the message to be posted on the mailbox
+ * @return              The operation status.
+ * @retval RDY_OK       if a message has been correctly posted.
+ * @retval RDY_TIMEOUT  if the mailbox is full and the message cannot be
+ *                      posted.
+ *
+ * @iclass
+ */
+msg_t chMBPostI(Mailbox *mbp, msg_t msg) {
+
+  chDbgCheck(mbp != NULL, "chMBPostI");
+
+  if (chSemGetCounterI(&mbp->mb_emptysem) <= 0)
+    return RDY_TIMEOUT;
+  chSemFastWaitI(&mbp->mb_emptysem);
+  *mbp->mb_wrptr++ = msg;
+  if (mbp->mb_wrptr >= mbp->mb_top)
+    mbp->mb_wrptr = mbp->mb_buffer;
+  chSemSignalI(&mbp->mb_fullsem);
+  return RDY_OK;
+}
+
 /**
  * @brief   Posts an high priority message into a mailbox.
  * @details The invoking thread waits until a empty slot in the mailbox becomes
@@ -218,6 +246,34 @@ msg_t chMBPostAheadS(Mailbox *mbp, msg_t msg, systime_t time) {
   return rdymsg;
 }
 
+/**
+ * @brief   Posts an high priority message into a mailbox.
+ * @details This variant is non-blocking, the function returns a timeout
+ *          condition if the queue is full.
+ *
+ * @param[in] mbp       the pointer to an initialized Mailbox object
+ * @param[in] msg       the message to be posted on the mailbox
+ * @return              The operation status.
+ * @retval RDY_OK       if a message has been correctly posted.
+ * @retval RDY_TIMEOUT  if the mailbox is full and the message cannot be
+ *                      posted.
+ *
+ * @iclass
+ */
+msg_t chMBPostAheadI(Mailbox *mbp, msg_t msg) {
+
+  chDbgCheck(mbp != NULL, "chMBPostAheadI");
+
+  if (chSemGetCounterI(&mbp->mb_emptysem) <= 0)
+    return RDY_TIMEOUT;
+  chSemFastWaitI(&mbp->mb_emptysem);
+  if (--mbp->mb_rdptr < mbp->mb_buffer)
+    mbp->mb_rdptr = mbp->mb_top - 1;
+  *mbp->mb_rdptr = msg;
+  chSemSignalI(&mbp->mb_fullsem);
+  return RDY_OK;
+}
+
 /**
  * @brief   Retrieves a message from a mailbox.
  * @details The invoking thread waits until a message is posted in the mailbox
@@ -280,6 +336,33 @@ msg_t chMBFetchS(Mailbox *mbp, msg_t *msgp, systime_t time) {
   }
   return rdymsg;
 }
+
+/**
+ * @brief   Retrieves a message from a mailbox.
+ * @details This variant is non-blocking, the function returns a timeout
+ *          condition if the queue is full.
+ *
+ * @param[in] mbp       the pointer to an initialized Mailbox object
+ * @param[out] msgp     pointer to a message variable for the received message
+ * @return              The operation status.
+ * @retval RDY_OK       if a message has been correctly fetched.
+ * @retval RDY_TIMEOUT  if the mailbox is empty and a message cannot be
+ *                      fetched.
+ *
+ * @iclass
+ */
+msg_t chMBFetchI(Mailbox *mbp, msg_t *msgp) {
+
+  chDbgCheck((mbp != NULL) && (msgp != NULL), "chMBFetchI");
+
+  if (chSemGetCounterI(&mbp->mb_fullsem) <= 0)
+    return RDY_TIMEOUT;
+  *msgp = *mbp->mb_rdptr++;
+  if (mbp->mb_rdptr >= mbp->mb_top)
+    mbp->mb_rdptr = mbp->mb_buffer;
+  chSemSignalI(&mbp->mb_emptysem);
+  return RDY_OK;
+}
 #endif /* CH_USE_MAILBOXES */
 
 /** @} */
-- 
cgit v1.2.3


From b3b1028036a2f18327fb97f2126192a2ace62bb2 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 21 Feb 2011 19:06:46 +0000
Subject: TIME_IMMEDIATE and TIME_INFINITE values swapped.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2757 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chcond.c    | 22 +++++++++++-----------
 os/kernel/src/chschd.c    |  4 +---
 os/kernel/src/chthreads.c |  6 ++----
 os/kernel/src/chvt.c      | 12 +++++++-----
 4 files changed, 21 insertions(+), 23 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chcond.c b/os/kernel/src/chcond.c
index 0ad9d459d..a6534eabc 100644
--- a/os/kernel/src/chcond.c
+++ b/os/kernel/src/chcond.c
@@ -203,11 +203,11 @@ msg_t chCondWaitS(CondVar *cp) {
  *          mutex, the mutex ownership is lost.
  *
  * @param[in] cp        pointer to the @p CondVar structure
- * @param[in] time      the number of ticks before the operation timeouts,
- *                      the special value @p TIME_INFINITE is allowed.
- *                      It is not possible to specify zero @p TIME_IMMEDIATE
- *                      as timeout specification because it would make no sense
- *                      in this function.
+ * @param[in] time      the number of ticks before the operation timeouts, the
+ *                      special values are handled as follow:
+ *                      - @a TIME_INFINITE no timeout.
+ *                      - @a TIME_IMMEDIATE this value is not allowed.
+ *                      .
  * @return              A message specifying how the invoking thread has been
  *                      released from the condition variable.
  * @retval RDY_OK       if the condvar has been signaled using
@@ -240,11 +240,11 @@ msg_t chCondWaitTimeout(CondVar *cp, systime_t time) {
  *          mutex, the mutex ownership is lost.
  *
  * @param[in] cp        pointer to the @p CondVar structure
- * @param[in] time      the number of ticks before the operation timeouts,
- *                      the special value @p TIME_INFINITE is allowed.
- *                      It is not possible to specify zero @p TIME_IMMEDIATE
- *                      as timeout specification because it would make no sense
- *                      in this function.
+ * @param[in] time      the number of ticks before the operation timeouts, the
+ *                      special values are handled as follow:
+ *                      - @a TIME_INFINITE no timeout.
+ *                      - @a TIME_IMMEDIATE this value is not allowed.
+ *                      .
  * @return              A message specifying how the invoking thread has been
  *                      released from the condition variable.
  * @retval RDY_OK       if the condvar has been signaled using
@@ -260,7 +260,7 @@ msg_t chCondWaitTimeoutS(CondVar *cp, systime_t time) {
   Mutex *mp;
   msg_t msg;
 
-  chDbgCheck(cp != NULL, "chCondWaitTimeoutS");
+  chDbgCheck((cp != NULL) && (time != TIME_IMMEDIATE), "chCondWaitTimeoutS");
   chDbgAssert(currp->p_mtxlist != NULL,
               "chCondWaitTimeoutS(), #1",
               "not owning a mutex");
diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c
index 5b04c1f3d..85e968904 100644
--- a/os/kernel/src/chschd.c
+++ b/os/kernel/src/chschd.c
@@ -160,9 +160,7 @@ static void wakeup(void *p) {
  *                      - @a TIME_INFINITE the thread enters an infinite sleep
  *                        state, this is equivalent to invoking
  *                        @p chSchGoSleepS() but, of course, less efficient.
- *                      - @a TIME_IMMEDIATE this value is accepted but
- *                        interpreted as a normal time specification not as an
- *                        immediate timeout specification.
+ *                      - @a TIME_IMMEDIATE this value is not allowed.
  *                      .
  * @return              The wakeup message.
  * @retval RDY_TIMEOUT if a timeout occurs.
diff --git a/os/kernel/src/chthreads.c b/os/kernel/src/chthreads.c
index 51efc20d1..a00b5d3db 100644
--- a/os/kernel/src/chthreads.c
+++ b/os/kernel/src/chthreads.c
@@ -273,16 +273,14 @@ void chThdTerminate(Thread *tp) {
  *                      handled as follow:
  *                      - @a TIME_INFINITE the thread enters an infinite sleep
  *                        state.
- *                      - @a TIME_IMMEDIATE this value is accepted but
- *                        interpreted as a normal time specification not as an
- *                        immediate timeout specification.
+ *                      - @a TIME_IMMEDIATE this value is not allowed.
  *                      .
  *
  * @api
  */
 void chThdSleep(systime_t time) {
 
-  chDbgCheck(time != TIME_INFINITE, "chThdSleep");
+  chDbgCheck(time != TIME_IMMEDIATE, "chThdSleep");
 
   chSysLock();
   chThdSleepS(time);
diff --git a/os/kernel/src/chvt.c b/os/kernel/src/chvt.c
index b622bb493..016849186 100644
--- a/os/kernel/src/chvt.c
+++ b/os/kernel/src/chvt.c
@@ -52,10 +52,12 @@ void vt_init(void) {
  *          the I-Locked state, see @ref system_states.
  *
  * @param[out] vtp      the @p VirtualTimer structure pointer
- * @param[in] time      the number of time ticks, the value @p TIME_INFINITE
- *                      is notallowed. The value @p TIME_IMMEDIATE is allowed
- *                      but interpreted as a normal time specification not as
- *                      an immediate timeout specification.
+ * @param[in] time      the number of ticks before the operation timeouts, the
+ *                      special values are handled as follow:
+ *                      - @a TIME_INFINITE is allowed but interpreted as a
+ *                        normal time specification.
+ *                      - @a TIME_IMMEDIATE this value is not allowed.
+ *                      .
  * @param[in] vtfunc    the timer callback function. After invoking the
  *                      callback the timer is disabled and the structure can
  *                      be disposed or reused.
@@ -67,7 +69,7 @@ void vt_init(void) {
 void chVTSetI(VirtualTimer *vtp, systime_t time, vtfunc_t vtfunc, void *par) {
   VirtualTimer *p;
 
-  chDbgCheck((vtp != NULL) && (vtfunc != NULL) && (time != TIME_INFINITE),
+  chDbgCheck((vtp != NULL) && (vtfunc != NULL) && (time != TIME_IMMEDIATE),
              "chVTSetI");
 
   vtp->vt_par = par;
-- 
cgit v1.2.3


From 6f6e1a6401eda000dce198150937c7919b4c9855 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 23 Feb 2011 18:59:39 +0000
Subject: Improved messages subsystem.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2759 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chmsg.c | 59 ++++++++++++++++-----------------------------------
 os/kernel/src/chmtx.c |  2 +-
 2 files changed, 19 insertions(+), 42 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chmsg.c b/os/kernel/src/chmsg.c
index c3b4848b0..d4199bbb0 100644
--- a/os/kernel/src/chmsg.c
+++ b/os/kernel/src/chmsg.c
@@ -75,7 +75,7 @@ msg_t chMsgSend(Thread *tp, msg_t msg) {
   msg_insert(ctp, &tp->p_msgqueue);
   if (tp->p_state == THD_STATE_WTMSG)
     chSchReadyI(tp);
-  chSchGoSleepS(THD_STATE_SNDMSG);
+  chSchGoSleepS(THD_STATE_SNDMSGQ);
   msg = ctp->p_u.rdymsg;
   chSysUnlock();
   return msg;
@@ -83,69 +83,46 @@ msg_t chMsgSend(Thread *tp, msg_t msg) {
 
 /**
  * @brief   Suspends the thread and waits for an incoming message.
- * @post    After receiving a message the function @p chMsgRelease() must be
- *          invoked in order to acknowledge the reception and send the answer.
+ * @post    After receiving a message the function @p chMsgGet() must be
+ *          called in order to retrieve the message and then @p chMsgRelease()
+ *          must be invoked in order to acknowledge the reception and send
+ *          the answer.
  * @note    If the message is a pointer then you can assume that the data
  *          pointed by the message is stable until you invoke @p chMsgRelease()
  *          because the sending thread is suspended until then.
  *
- * @return              The message.
+ * @return              A reference to the thread carrying the message.
  *
  * @api
  */
-msg_t chMsgWait(void) {
-  msg_t msg;
+Thread *chMsgWait(void) {
+  Thread *tp;
 
   chSysLock();
   if (!chMsgIsPendingI(currp))
     chSchGoSleepS(THD_STATE_WTMSG);
-#if defined(CH_ARCHITECTURE_STM8)
-  msg = chMsgGetI((volatile Thread *)currp); /* Temporary hack.*/
-#else
-  msg = chMsgGetI(currp);
-#endif
+  tp = fifo_remove(&currp->p_msgqueue);
+  tp->p_state = THD_STATE_SNDMSG;
   chSysUnlock();
-  return msg;
-}
-
-/**
- * @brief   Returns the next message in the queue.
- * @post    After receiving a message the function @p chMsgRelease() must be
- *          invoked in order to acknowledge the reception and send the answer.
- * @note    If the message is a pointer then you can assume that the data
- *          pointed by the message is stable until you invoke @p chMsgRelease()
- *          because the sending thread is suspended until then.
- *
- * @return              The message.
- * @retval 0            if the queue is empty.
- *
- * @api
- */
-msg_t chMsgGet(void) {
-  msg_t msg;
-
-  chSysLock();
-  msg = chMsgIsPendingI(currp) ? chMsgGetI(currp) : (msg_t)NULL;
-  chSysUnlock();
-  return msg;
+  return tp;
 }
 
 /**
  * @brief   Releases the thread waiting on top of the messages queue.
  * @pre     Invoke this function only after a message has been received
- *          using @p chMsgWait() or @p chMsgGet().
+ *          using @p chMsgWait().
  *
- * @param[in] msg       the message returned to the message sender
+ * @param[in] tp        pointer to the thread
+ * @param[in] msg       message to be returned to the sender
  *
  * @api
  */
-void chMsgRelease(msg_t msg) {
+void chMsgRelease(Thread *tp, msg_t msg) {
 
   chSysLock();
-  chDbgAssert(chMsgIsPendingI(currp),
-              "chMsgRelease(), #1",
-              "no message pending");
-  chSchWakeupS(fifo_remove(&currp->p_msgqueue), msg);
+  chDbgAssert(tp->p_state == THD_STATE_SNDMSG,
+              "chMsgRelease(), #1", "invalid state");
+  chMsgReleaseS(tp, msg);
   chSysUnlock();
 }
 
diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c
index b84c4d57e..826ef27fe 100644
--- a/os/kernel/src/chmtx.c
+++ b/os/kernel/src/chmtx.c
@@ -141,7 +141,7 @@ void chMtxLockS(Mutex *mp) {
       case THD_STATE_WTSEM:
 #endif
 #if CH_USE_MESSAGES_PRIORITY
-      case THD_STATE_SNDMSG:
+      case THD_STATE_SNDMSGQ:
 #endif
         /* Re-enqueues tp with its new priority on the queue.*/
         prio_insert(dequeue(tp), (ThreadsQueue *)tp->p_u.wtobjp);
-- 
cgit v1.2.3


From a55d3c6e6b8d14d6310382f149593df231925c17 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 23 Feb 2011 20:24:05 +0000
Subject: Fixed bug 3190512.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2761 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chmempools.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chmempools.c b/os/kernel/src/chmempools.c
index 092944b59..054823af0 100644
--- a/os/kernel/src/chmempools.c
+++ b/os/kernel/src/chmempools.c
@@ -75,10 +75,8 @@ void *chPoolAllocI(MemoryPool *mp) {
 
   if ((objp = mp->mp_next) != NULL)
     mp->mp_next = mp->mp_next->ph_next;
-#if CH_USE_MEMCORE
   else if (mp->mp_provider != NULL)
     objp = mp->mp_provider(mp->mp_object_size);
-#endif
   return objp;
 }
 
-- 
cgit v1.2.3


From 24594525990ee1769ee933261b821211b4c299e8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 24 Feb 2011 14:57:38 +0000
Subject: Fixed bugs 3191107 and 3191112.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2762 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chheap.c     |  2 +-
 os/kernel/src/chmemcore.c  | 38 +++++++++++++++++++-------------------
 os/kernel/src/chmempools.c |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chheap.c b/os/kernel/src/chheap.c
index 13db7cf6b..c655e3852 100644
--- a/os/kernel/src/chheap.c
+++ b/os/kernel/src/chheap.c
@@ -125,7 +125,7 @@ void *chHeapAlloc(MemoryHeap *heapp, size_t size) {
   if (heapp == NULL)
     heapp = &default_heap;
 
-  size = MEM_ALIGN_SIZE(size);
+  size = MEM_ALIGN_NEXT(size);
   qp = &heapp->h_free;
   H_LOCK(heapp);
 
diff --git a/os/kernel/src/chmemcore.c b/os/kernel/src/chmemcore.c
index 69d3014a5..1fed481c5 100644
--- a/os/kernel/src/chmemcore.c
+++ b/os/kernel/src/chmemcore.c
@@ -24,18 +24,20 @@
  * @addtogroup memcore
  * @details Core Memory Manager related APIs and services.
  *          <h2>Operation mode</h2>
- *          The core memory manager is a simplified allocator that only allows
- *          to allocate memory blocks without the possibility to free them.<br>
- *          This allocator is meant as a memory blocks provider for the other
- *          allocators such as:
+ *          The core memory manager is a simplified allocator that only
+ *          allows to allocate memory blocks without the possibility to
+ *          free them.<br>
+ *          This allocator is meant as a memory blocks provider for the
+ *          other allocators such as:
  *          - C-Runtime allocator (through a compiler specific adapter module).
  *          - Heap allocator (see @ref heaps).
  *          - Memory pools allocator (see @ref pools).
  *          .
- *          By having a centralized memory provider the various allocators can
- *          coexist and share the main memory.<br>
- *          This allocator, alone, is also useful for very simple applications
- *          that just require a simple way to get memory blocks.
+ *          By having a centralized memory provider the various allocators
+ *          can coexist and share the main memory.<br>
+ *          This allocator, alone, is also useful for very simple
+ *          applications that just require a simple way to get memory
+ *          blocks.
  * @pre     In order to use the core memory manager APIs the @p CH_USE_MEMCORE
  *          option must be enabled in @p chconf.h.
  * @{
@@ -57,22 +59,20 @@ void core_init(void) {
 #if CH_MEMCORE_SIZE == 0
   extern uint8_t __heap_base__;
   extern uint8_t __heap_end__;
-  nextmem = &__heap_base__;
-  endmem = &__heap_end__;
+  nextmem = (uint8_t *)MEM_ALIGN_NEXT(&__heap_base__);
+  endmem = (uint8_t *)MEM_ALIGN_PREV(&__heap_end__);
 #else
-  static stkalign_t buffer[MEM_ALIGN_SIZE(CH_MEMCORE_SIZE) /
-                           sizeof(stkalign_t)];
+  static stkalign_t buffer[MEM_ALIGN_NEXT(CH_MEMCORE_SIZE)/MEM_ALIGN_SIZE];
   nextmem = (uint8_t *)&buffer[0];
-  endmem = (uint8_t *)&buffer[MEM_ALIGN_SIZE(CH_MEMCORE_SIZE) /
-                              sizeof(stkalign_t)];
+  endmem = (uint8_t *)&buffer[MEM_ALIGN_NEXT(CH_MEMCORE_SIZE)/MEM_ALIGN_SIZE];
 #endif
 }
 
 /**
  * @brief   Allocates a memory block.
  * @details The size of the returned block is aligned to the alignment
- *          type @p stkalign_t so it is not possible to allocate less
- *          than <code>sizeof(stkalign_t)</code>.
+ *          type so it is not possible to allocate less
+ *          than <code>MEM_ALIGN_SIZE</code>.
  *
  * @param[in] size      the size of the block to be allocated
  * @return              A pointer to the allocated memory block.
@@ -92,8 +92,8 @@ void *chCoreAlloc(size_t size) {
 /**
  * @brief   Allocates a memory block.
  * @details The size of the returned block is aligned to the alignment
- *          type @p align_t so it is not possible to allocate less than
- *          <code>sizeof(align_t)</code>.
+ *          type so it is not possible to allocate less than
+ *          <code>MEM_ALIGN_SIZE</code>.
  *
  * @param[in] size      the size of the block to be allocated.
  * @return              A pointer to the allocated memory block.
@@ -104,7 +104,7 @@ void *chCoreAlloc(size_t size) {
 void *chCoreAllocI(size_t size) {
   void *p;
 
-  size = MEM_ALIGN_SIZE(size);
+  size = MEM_ALIGN_NEXT(size);
   if ((size_t)(endmem - nextmem) < size)
     return NULL;
   p = nextmem;
diff --git a/os/kernel/src/chmempools.c b/os/kernel/src/chmempools.c
index 054823af0..83e6366f4 100644
--- a/os/kernel/src/chmempools.c
+++ b/os/kernel/src/chmempools.c
@@ -55,7 +55,7 @@ void chPoolInit(MemoryPool *mp, size_t size, memgetfunc_t provider) {
   chDbgCheck((mp != NULL) && (size >= sizeof(void *)), "chPoolInit");
 
   mp->mp_next = NULL;
-  mp->mp_object_size = MEM_ALIGN_SIZE(size);
+  mp->mp_object_size = MEM_ALIGN_NEXT(size);
   mp->mp_provider = provider;
 }
 
-- 
cgit v1.2.3


From 1d00697fe4f8bbe42e0c0d59f76879bd1e575883 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 26 Feb 2011 13:43:07 +0000
Subject: Fixed bug 3193062 (RVCT).

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2766 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chmemcore.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chmemcore.c b/os/kernel/src/chmemcore.c
index 1fed481c5..c28d150fa 100644
--- a/os/kernel/src/chmemcore.c
+++ b/os/kernel/src/chmemcore.c
@@ -57,10 +57,10 @@ static uint8_t *endmem;
  */
 void core_init(void) {
 #if CH_MEMCORE_SIZE == 0
-  extern uint8_t __heap_base__;
-  extern uint8_t __heap_end__;
-  nextmem = (uint8_t *)MEM_ALIGN_NEXT(&__heap_base__);
-  endmem = (uint8_t *)MEM_ALIGN_PREV(&__heap_end__);
+  extern uint8_t __heap_base__[];
+  extern uint8_t __heap_end__[];
+  nextmem = (uint8_t *)MEM_ALIGN_NEXT(__heap_base__);
+  endmem = (uint8_t *)MEM_ALIGN_PREV(__heap_end__);
 #else
   static stkalign_t buffer[MEM_ALIGN_NEXT(CH_MEMCORE_SIZE)/MEM_ALIGN_SIZE];
   nextmem = (uint8_t *)&buffer[0];
-- 
cgit v1.2.3


From e7e79a6ccb4f3e320b2b8b7bad1b14d65218641d Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 18 Mar 2011 18:38:08 +0000
Subject: License updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2827 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chcond.c     | 3 ++-
 os/kernel/src/chdebug.c    | 3 ++-
 os/kernel/src/chdynamic.c  | 3 ++-
 os/kernel/src/chevents.c   | 3 ++-
 os/kernel/src/chheap.c     | 3 ++-
 os/kernel/src/chlists.c    | 3 ++-
 os/kernel/src/chmboxes.c   | 3 ++-
 os/kernel/src/chmemcore.c  | 3 ++-
 os/kernel/src/chmempools.c | 3 ++-
 os/kernel/src/chmsg.c      | 3 ++-
 os/kernel/src/chmtx.c      | 3 ++-
 os/kernel/src/chqueues.c   | 3 ++-
 os/kernel/src/chregistry.c | 3 ++-
 os/kernel/src/chschd.c     | 3 ++-
 os/kernel/src/chsem.c      | 3 ++-
 os/kernel/src/chsys.c      | 3 ++-
 os/kernel/src/chthreads.c  | 3 ++-
 os/kernel/src/chvt.c       | 3 ++-
 18 files changed, 36 insertions(+), 18 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chcond.c b/os/kernel/src/chcond.c
index a6534eabc..456fc454f 100644
--- a/os/kernel/src/chcond.c
+++ b/os/kernel/src/chcond.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chdebug.c b/os/kernel/src/chdebug.c
index 80323e183..be98cd40b 100644
--- a/os/kernel/src/chdebug.c
+++ b/os/kernel/src/chdebug.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chdynamic.c b/os/kernel/src/chdynamic.c
index 5f1fc3401..acd23c244 100644
--- a/os/kernel/src/chdynamic.c
+++ b/os/kernel/src/chdynamic.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chevents.c b/os/kernel/src/chevents.c
index a64f59bdc..d74ad2dc4 100644
--- a/os/kernel/src/chevents.c
+++ b/os/kernel/src/chevents.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chheap.c b/os/kernel/src/chheap.c
index c655e3852..a04646bcf 100644
--- a/os/kernel/src/chheap.c
+++ b/os/kernel/src/chheap.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chlists.c b/os/kernel/src/chlists.c
index 878f1360c..c3168eafe 100644
--- a/os/kernel/src/chlists.c
+++ b/os/kernel/src/chlists.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chmboxes.c b/os/kernel/src/chmboxes.c
index e0b6ca014..af6ee5ea8 100644
--- a/os/kernel/src/chmboxes.c
+++ b/os/kernel/src/chmboxes.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chmemcore.c b/os/kernel/src/chmemcore.c
index c28d150fa..d66ef5f1c 100644
--- a/os/kernel/src/chmemcore.c
+++ b/os/kernel/src/chmemcore.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chmempools.c b/os/kernel/src/chmempools.c
index 83e6366f4..38adc3d49 100644
--- a/os/kernel/src/chmempools.c
+++ b/os/kernel/src/chmempools.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chmsg.c b/os/kernel/src/chmsg.c
index d4199bbb0..5002a892a 100644
--- a/os/kernel/src/chmsg.c
+++ b/os/kernel/src/chmsg.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c
index 826ef27fe..af2b7f347 100644
--- a/os/kernel/src/chmtx.c
+++ b/os/kernel/src/chmtx.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chqueues.c b/os/kernel/src/chqueues.c
index 8d459a7e8..05fbddfb9 100644
--- a/os/kernel/src/chqueues.c
+++ b/os/kernel/src/chqueues.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chregistry.c b/os/kernel/src/chregistry.c
index e95ad21a8..9eabe71c0 100644
--- a/os/kernel/src/chregistry.c
+++ b/os/kernel/src/chregistry.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c
index 85e968904..210dbfdc1 100644
--- a/os/kernel/src/chschd.c
+++ b/os/kernel/src/chschd.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chsem.c b/os/kernel/src/chsem.c
index 18ea9e996..3e0fcd0e8 100644
--- a/os/kernel/src/chsem.c
+++ b/os/kernel/src/chsem.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c
index 0051985ba..db6521b87 100644
--- a/os/kernel/src/chsys.c
+++ b/os/kernel/src/chsys.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chthreads.c b/os/kernel/src/chthreads.c
index a00b5d3db..234cd6ae1 100644
--- a/os/kernel/src/chthreads.c
+++ b/os/kernel/src/chthreads.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
diff --git a/os/kernel/src/chvt.c b/os/kernel/src/chvt.c
index 016849186..b98396a3a 100644
--- a/os/kernel/src/chvt.c
+++ b/os/kernel/src/chvt.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
-- 
cgit v1.2.3


From f5ae2552307f20f3fa3d987591fa60576981ce3d Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 29 Mar 2011 14:51:08 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2850
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/src/chdebug.c   |  2 +-
 os/kernel/src/chheap.c    |  2 +-
 os/kernel/src/chmemcore.c |  2 +-
 os/kernel/src/chschd.c    |  2 +-
 os/kernel/src/chsys.c     | 10 +++++-----
 os/kernel/src/chvt.c      |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chdebug.c b/os/kernel/src/chdebug.c
index be98cd40b..3c3c34c70 100644
--- a/os/kernel/src/chdebug.c
+++ b/os/kernel/src/chdebug.c
@@ -46,7 +46,7 @@ TraceBuffer trace_buffer;
  * @brief   Trace circular buffer subsystem initialization.
  * @note    Internal use only.
  */
-void trace_init(void) {
+void _trace_init(void) {
 
   trace_buffer.tb_size = TRACE_BUFFER_SIZE;
   trace_buffer.tb_ptr = &trace_buffer.tb_buffer[0];
diff --git a/os/kernel/src/chheap.c b/os/kernel/src/chheap.c
index a04646bcf..bcfca9b77 100644
--- a/os/kernel/src/chheap.c
+++ b/os/kernel/src/chheap.c
@@ -65,7 +65,7 @@ static MemoryHeap default_heap;
  *
  * @notapi
  */
-void heap_init(void) {
+void _heap_init(void) {
   default_heap.h_provider = chCoreAlloc;
   default_heap.h_free.h.u.next = (union heap_header *)NULL;
   default_heap.h_free.h.size = 0;
diff --git a/os/kernel/src/chmemcore.c b/os/kernel/src/chmemcore.c
index d66ef5f1c..311d170c5 100644
--- a/os/kernel/src/chmemcore.c
+++ b/os/kernel/src/chmemcore.c
@@ -56,7 +56,7 @@ static uint8_t *endmem;
  *
  * @notapi
  */
-void core_init(void) {
+void _core_init(void) {
 #if CH_MEMCORE_SIZE == 0
   extern uint8_t __heap_base__[];
   extern uint8_t __heap_end__[];
diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c
index 210dbfdc1..54e7918b1 100644
--- a/os/kernel/src/chschd.c
+++ b/os/kernel/src/chschd.c
@@ -45,7 +45,7 @@ ReadyList rlist;
  *
  * @notapi
  */
-void scheduler_init(void) {
+void _scheduler_init(void) {
 
   queue_init(&rlist.r_queue);
   rlist.r_prio = NOPRIO;
diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c
index db6521b87..29f4bdc7e 100644
--- a/os/kernel/src/chsys.c
+++ b/os/kernel/src/chsys.c
@@ -76,16 +76,16 @@ void chSysInit(void) {
   static Thread mainthread;
 
   port_init();
-  scheduler_init();
-  vt_init();
+  _scheduler_init();
+  _vt_init();
 #if CH_USE_MEMCORE
-  core_init();
+  _core_init();
 #endif
 #if CH_USE_HEAP
-  heap_init();
+  _heap_init();
 #endif
 #if CH_DBG_ENABLE_TRACE
-  trace_init();
+  _trace_init();
 #endif
 
   /* Now this instructions flow becomes the main thread.*/
diff --git a/os/kernel/src/chvt.c b/os/kernel/src/chvt.c
index b98396a3a..4674c728e 100644
--- a/os/kernel/src/chvt.c
+++ b/os/kernel/src/chvt.c
@@ -40,7 +40,7 @@ VTList vtlist;
  *
  * @notapi
  */
-void vt_init(void) {
+void _vt_init(void) {
 
   vtlist.vt_next = vtlist.vt_prev = (void *)&vtlist;
   vtlist.vt_time = (systime_t)-1;
-- 
cgit v1.2.3


From de877486efb49378065f769ff423eef19ceb12e6 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 9 Apr 2011 15:10:15 +0000
Subject: Fixed bug 3276379.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2872 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chsem.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chsem.c b/os/kernel/src/chsem.c
index 3e0fcd0e8..c22a568ea 100644
--- a/os/kernel/src/chsem.c
+++ b/os/kernel/src/chsem.c
@@ -313,35 +313,32 @@ void chSemSignalI(Semaphore *sp) {
 }
 
 /**
- * @brief   Sets the semaphore counter to the specified value.
- * @post    After invoking this function all the threads waiting on the
- *          semaphore, if any, are released and the semaphore counter is set
- *          to the specified, non negative, value.
+ * @brief   Adds the specified value to the semaphore counter.
  * @post    This function does not reschedule so a call to a rescheduling
  *          function must be performed before unlocking the kernel. Note that
  *          interrupt handlers always reschedule on exit so an explicit
  *          reschedule must not be performed in ISRs.
  *
  * @param[in] sp        pointer to a @p Semaphore structure
- * @param[in] n         the new value of the semaphore counter. The value must
- *                      be non-negative.
+ * @param[in] n         value to be added to the semaphore counter. The value
+ *                      must be positive.
  *
  * @iclass
  */
-void chSemSetCounterI(Semaphore *sp, cnt_t n) {
-  cnt_t cnt;
+void chSemAddCounterI(Semaphore *sp, cnt_t n) {
 
-  chDbgCheck((sp != NULL) && (n >= 0), "chSemSetCounterI");
+  chDbgCheck((sp != NULL) && (n > 0), "chSemAddCounterI");
 
   chDbgAssert(((sp->s_cnt >= 0) && isempty(&sp->s_queue)) ||
               ((sp->s_cnt < 0) && notempty(&sp->s_queue)),
-              "chSemSetCounterI(), #1",
+              "chSemAddCounterI(), #1",
               "inconsistent semaphore");
 
-  cnt = sp->s_cnt;
-  sp->s_cnt = n;
-  while (++cnt <= 0)
-    chSchReadyI(lifo_remove(&sp->s_queue))->p_u.rdymsg = RDY_OK;
+  while (n > 0) {
+    if (++sp->s_cnt <= 0)
+      chSchReadyI(fifo_remove(&sp->s_queue))->p_u.rdymsg = RDY_OK;
+    n--;
+  }
 }
 
 #if CH_USE_SEMSW
-- 
cgit v1.2.3


From 85f17ebe017f0ef2a42d96eb3525346db5b9c65e Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 13 May 2011 17:20:39 +0000
Subject: Customer CR.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2951 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chsys.c     | 4 ++++
 os/kernel/src/chthreads.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c
index 29f4bdc7e..5d3c0bcf4 100644
--- a/os/kernel/src/chsys.c
+++ b/os/kernel/src/chsys.c
@@ -35,6 +35,7 @@
 
 #include "ch.h"
 
+#if !CH_NO_IDLE_THREAD || defined(__DOXYGEN__)
 /**
  * @brief   Idle thread working area.
  * @see     IDLE_THREAD_STACK_SIZE
@@ -59,6 +60,7 @@ void _idle_thread(void *p) {
     IDLE_LOOP_HOOK();
   }
 }
+#endif /* CH_NO_IDLE_THREAD */
 
 /**
  * @brief   ChibiOS/RT initialization.
@@ -93,11 +95,13 @@ void chSysInit(void) {
   currp->p_state = THD_STATE_CURRENT;
   chSysEnable();
 
+#if !CH_NO_IDLE_THREAD
   /* This thread has the lowest priority in the system, its role is just to
      serve interrupts in its context while keeping the lowest energy saving
      mode compatible with the system status.*/
   chThdCreateStatic(_idle_thread_wa, sizeof(_idle_thread_wa), IDLEPRIO,
                     (tfunc_t)_idle_thread, NULL);
+#endif
 }
 
 /**
diff --git a/os/kernel/src/chthreads.c b/os/kernel/src/chthreads.c
index 234cd6ae1..7df276bea 100644
--- a/os/kernel/src/chthreads.c
+++ b/os/kernel/src/chthreads.c
@@ -206,8 +206,7 @@ Thread *chThdCreateStatic(void *wsp, size_t size,
 tprio_t chThdSetPriority(tprio_t newprio) {
   tprio_t oldprio;
 
-  chDbgCheck((newprio >= LOWPRIO) && (newprio <= HIGHPRIO),
-              "chThdSetPriority");
+  chDbgCheck(newprio <= HIGHPRIO, "chThdSetPriority");
 
   chSysLock();
 #if CH_USE_MUTEXES
-- 
cgit v1.2.3


From e0b53350156cef01da9b83e46127f7322e967909 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 17 May 2011 14:49:51 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2966
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/src/chsys.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c
index 5d3c0bcf4..13a1a53fa 100644
--- a/os/kernel/src/chsys.c
+++ b/os/kernel/src/chsys.c
@@ -40,7 +40,7 @@
  * @brief   Idle thread working area.
  * @see     IDLE_THREAD_STACK_SIZE
  */
-WORKING_AREA(_idle_thread_wa, IDLE_THREAD_STACK_SIZE);
+WORKING_AREA(_idle_thread_wa, PORT_IDLE_THREAD_STACK_SIZE);
 
 /**
  * @brief   This function implements the idle thread infinite loop.
-- 
cgit v1.2.3


From b4aa14e88c9e28a16a5f9c0c220fac6cc36750ad Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 18 May 2011 09:03:50 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2971
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/src/chsys.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c
index 13a1a53fa..6892ec73a 100644
--- a/os/kernel/src/chsys.c
+++ b/os/kernel/src/chsys.c
@@ -38,7 +38,7 @@
 #if !CH_NO_IDLE_THREAD || defined(__DOXYGEN__)
 /**
  * @brief   Idle thread working area.
- * @see     IDLE_THREAD_STACK_SIZE
+ * @see     PORT_IDLE_THREAD_STACK_SIZE
  */
 WORKING_AREA(_idle_thread_wa, PORT_IDLE_THREAD_STACK_SIZE);
 
-- 
cgit v1.2.3


From 807c5f1882224c2afd471a44889b83c2adf80589 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 18 May 2011 17:54:55 +0000
Subject: Fixed bug 3303908.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2972 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chmtx.c    |   8 +--
 os/kernel/src/chqueues.c | 124 +++++++++++++++++++++++++----------------------
 os/kernel/src/chschd.c   |   6 ++-
 3 files changed, 75 insertions(+), 63 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c
index af2b7f347..df71d1cc6 100644
--- a/os/kernel/src/chmtx.c
+++ b/os/kernel/src/chmtx.c
@@ -134,14 +134,16 @@ void chMtxLockS(Mutex *mp) {
         prio_insert(dequeue(tp), (ThreadsQueue *)tp->p_u.wtobjp);
         tp = ((Mutex *)tp->p_u.wtobjp)->m_owner;
         continue;
-#if CH_USE_CONDVARS | CH_USE_SEMAPHORES_PRIORITY | CH_USE_MESSAGES_PRIORITY
+#if CH_USE_CONDVARS |                                                       \
+    (CH_USE_SEMAPHORES && CH_USE_SEMAPHORES_PRIORITY) |                     \
+    (CH_USE_MESSAGES && CH_USE_MESSAGES_PRIORITY)
 #if CH_USE_CONDVARS
       case THD_STATE_WTCOND:
 #endif
-#if CH_USE_SEMAPHORES_PRIORITY
+#if CH_USE_SEMAPHORES && CH_USE_SEMAPHORES_PRIORITY
       case THD_STATE_WTSEM:
 #endif
-#if CH_USE_MESSAGES_PRIORITY
+#if CH_USE_MESSAGES && CH_USE_MESSAGES_PRIORITY
       case THD_STATE_SNDMSGQ:
 #endif
         /* Re-enqueues tp with its new priority on the queue.*/
diff --git a/os/kernel/src/chqueues.c b/os/kernel/src/chqueues.c
index 05fbddfb9..f6ae10257 100644
--- a/os/kernel/src/chqueues.c
+++ b/os/kernel/src/chqueues.c
@@ -47,6 +47,30 @@
 
 #if CH_USE_QUEUES || defined(__DOXYGEN__)
 
+/**
+ * @brief   Puts the invoking thread into the queue's threads queue.
+ *
+ * @param[out] qp       pointer to an @p GenericQueue structure
+ * @param[in] time      the number of ticks before the operation timeouts,
+ *                      the following special values are allowed:
+ *                      - @a TIME_IMMEDIATE immediate timeout.
+ *                      - @a TIME_INFINITE no timeout.
+ *                      .
+ * @return              A message specifying how the invoking thread has been
+ *                      released from threads queue.
+ * @retval RDY_OK       is the normal exit, thread signaled.
+ * @retval RDY_RESET    if the queue has been reset.
+ * @retval RDY_TIMEOUT  if the queue operation timed out.
+ */
+static msg_t qwait(GenericQueue *qp, systime_t time) {
+
+  if (TIME_IMMEDIATE == time)
+    return RDY_TIMEOUT;
+  currp->p_u.wtobjp = qp;
+  queue_insert(currp, &qp->q_waiting);
+  return chSchGoSleepTimeoutS(THD_STATE_WTQUEUE, time);
+}
+
 /**
  * @brief   Initializes an input queue.
  * @details A Semaphore is internally initialized and works as a counter of
@@ -64,28 +88,11 @@
  */
 void chIQInit(InputQueue *iqp, uint8_t *bp, size_t size, qnotify_t infy) {
 
+  queue_init(&iqp->q_waiting);
+  iqp->q_counter = 0;
   iqp->q_buffer = iqp->q_rdptr = iqp->q_wrptr = bp;
   iqp->q_top = bp + size;
   iqp->q_notify = infy;
-  chSemInit(&iqp->q_sem, 0);
-}
-
-/**
- * @brief   Returns the filled space into an input queue.
- *
- * @param[in] iqp       pointer to an @p InputQueue structure
- * @return              The number of bytes in the queue.
- * @retval 0            if the queue is empty.
- *
- * @iclass
- */
-size_t chIQGetFullI(InputQueue *iqp) {
-  cnt_t cnt;
-
-  cnt = chQSpaceI(iqp);
-  if (cnt < 0)
-    return 0;
-  return (size_t)cnt;
 }
 
 /**
@@ -102,7 +109,9 @@ size_t chIQGetFullI(InputQueue *iqp) {
 void chIQResetI(InputQueue *iqp) {
 
   iqp->q_rdptr = iqp->q_wrptr = iqp->q_buffer;
-  chSemResetI(&iqp->q_sem, 0);
+  iqp->q_counter = 0;
+  while (notempty(&iqp->q_waiting))
+    chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = RDY_RESET;
 }
 
 /**
@@ -123,10 +132,12 @@ msg_t chIQPutI(InputQueue *iqp, uint8_t b) {
   if (chIQIsFullI(iqp))
     return Q_FULL;
 
+  iqp->q_counter++;
   *iqp->q_wrptr++ = b;
   if (iqp->q_wrptr >= iqp->q_top)
     iqp->q_wrptr = iqp->q_buffer;
-  chSemSignalI(&iqp->q_sem);
+  if (notempty(&iqp->q_waiting))
+    chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = RDY_OK;
   return Q_OK;
 }
 
@@ -150,17 +161,21 @@ msg_t chIQPutI(InputQueue *iqp, uint8_t b) {
  */
 msg_t chIQGetTimeout(InputQueue *iqp, systime_t time) {
   uint8_t b;
-  msg_t msg;
 
   chSysLock();
-
   if (iqp->q_notify)
     iqp->q_notify(iqp);
 
-  if ((msg = chSemWaitTimeoutS(&iqp->q_sem, time)) < RDY_OK) {
-    chSysUnlock();
-    return msg;
+  while (chIQIsEmptyI(iqp)) {
+    msg_t msg;
+
+    if ((msg = qwait((GenericQueue *)iqp, time)) < RDY_OK) {
+      chSysUnlock();
+      return msg;
+    }
   }
+
+  iqp->q_counter--;
   b = *iqp->q_rdptr++;
   if (iqp->q_rdptr >= iqp->q_top)
     iqp->q_rdptr = iqp->q_buffer;
@@ -202,16 +217,16 @@ size_t chIQReadTimeout(InputQueue *iqp, uint8_t *bp,
 
   chSysLock();
   while (TRUE) {
-    if (chIQIsEmptyI(iqp)) {
+    while (chIQIsEmptyI(iqp)) {
       if (nfy)
         nfy(iqp);
-      if ((chSemWaitTimeoutS(&iqp->q_sem, time) != RDY_OK)) {
+      if (qwait((GenericQueue *)iqp, time) != RDY_OK) {
         chSysUnlock();
         return r;
       }
     }
-    else
-      chSemFastWaitI(&iqp->q_sem);
+
+    iqp->q_counter--;
     *bp++ = *iqp->q_rdptr++;
     if (iqp->q_rdptr >= iqp->q_top)
       iqp->q_rdptr = iqp->q_buffer;
@@ -245,28 +260,11 @@ size_t chIQReadTimeout(InputQueue *iqp, uint8_t *bp,
  */
 void chOQInit(OutputQueue *oqp, uint8_t *bp, size_t size, qnotify_t onfy) {
 
+  queue_init(&oqp->q_waiting);
+  oqp->q_counter = size;
   oqp->q_buffer = oqp->q_rdptr = oqp->q_wrptr = bp;
   oqp->q_top = bp + size;
   oqp->q_notify = onfy;
-  chSemInit(&oqp->q_sem, (cnt_t)size);
-}
-
-/**
- * @brief   Returns the filled space into an output queue.
- *
- * @param[in] oqp       pointer to an @p OutputQueue structure
- * @return              The number of bytes in the queue.
- * @retval 0            if the queue is empty.
- *
- * @iclass
- */
-size_t chOQGetFullI(OutputQueue *oqp) {
-  cnt_t cnt;
-
-  cnt = chQSpaceI(oqp);
-  if (cnt < 0)
-    return chQSizeI(oqp);
-  return chQSizeI(oqp) - (size_t)cnt;
 }
 
 /**
@@ -283,7 +281,9 @@ size_t chOQGetFullI(OutputQueue *oqp) {
 void chOQResetI(OutputQueue *oqp) {
 
   oqp->q_rdptr = oqp->q_wrptr = oqp->q_buffer;
-  chSemResetI(&oqp->q_sem, (cnt_t)(oqp->q_top - oqp->q_buffer));
+  oqp->q_counter = chQSizeI(oqp);
+  while (notempty(&oqp->q_waiting))
+    chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = RDY_RESET;
 }
 
 /**
@@ -307,13 +307,18 @@ void chOQResetI(OutputQueue *oqp) {
  * @api
  */
 msg_t chOQPutTimeout(OutputQueue *oqp, uint8_t b, systime_t time) {
-  msg_t msg;
 
   chSysLock();
-  if ((msg = chSemWaitTimeoutS(&oqp->q_sem, time)) < RDY_OK) {
-    chSysUnlock();
-    return msg;
+  while (chOQIsFullI(oqp)) {
+    msg_t msg;
+
+    if ((msg = qwait((GenericQueue *)oqp, time)) < RDY_OK) {
+      chSysUnlock();
+      return msg;
+    }
   }
+
+  oqp->q_counter--;
   *oqp->q_wrptr++ = b;
   if (oqp->q_wrptr >= oqp->q_top)
     oqp->q_wrptr = oqp->q_buffer;
@@ -341,10 +346,12 @@ msg_t chOQGetI(OutputQueue *oqp) {
   if (chOQIsEmptyI(oqp))
     return Q_EMPTY;
 
+  oqp->q_counter++;
   b = *oqp->q_rdptr++;
   if (oqp->q_rdptr >= oqp->q_top)
     oqp->q_rdptr = oqp->q_buffer;
-  chSemSignalI(&oqp->q_sem);
+  if (notempty(&oqp->q_waiting))
+    chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = RDY_OK;
   return b;
 }
 
@@ -381,16 +388,15 @@ size_t chOQWriteTimeout(OutputQueue *oqp, const uint8_t *bp,
 
   chSysLock();
   while (TRUE) {
-    if (chOQIsFullI(oqp)) {
+    while (chOQIsFullI(oqp)) {
       if (nfy)
         nfy(oqp);
-      if ((chSemWaitTimeoutS(&oqp->q_sem, time) != RDY_OK)) {
+      if (qwait((GenericQueue *)oqp, time) != RDY_OK) {
         chSysUnlock();
         return w;
       }
     }
-    else
-      chSemFastWaitI(&oqp->q_sem);
+    oqp->q_counter--;
     *oqp->q_wrptr++ = *bp++;
     if (oqp->q_wrptr >= oqp->q_top)
       oqp->q_wrptr = oqp->q_buffer;
diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c
index 54e7918b1..d41649b4c 100644
--- a/os/kernel/src/chschd.c
+++ b/os/kernel/src/chschd.c
@@ -130,12 +130,16 @@ static void wakeup(void *p) {
     /* Handling the special case where the thread has been made ready by
        another thread with higher priority.*/
     return;
-#if CH_USE_SEMAPHORES || (CH_USE_CONDVARS && CH_USE_CONDVARS_TIMEOUT)
+#if CH_USE_SEMAPHORES || CH_USE_QUEUES ||                                   \
+    (CH_USE_CONDVARS && CH_USE_CONDVARS_TIMEOUT)
 #if CH_USE_SEMAPHORES
   case THD_STATE_WTSEM:
     chSemFastSignalI((Semaphore *)tp->p_u.wtobjp);
     /* Falls into, intentional. */
 #endif
+#if CH_USE_QUEUES
+  case THD_STATE_WTQUEUE:
+#endif
 #if CH_USE_CONDVARS && CH_USE_CONDVARS_TIMEOUT
   case THD_STATE_WTCOND:
 #endif
-- 
cgit v1.2.3


From 5e1249af266c9688ec575e5a2f14ecfe6084de49 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 19 May 2011 09:13:24 +0000
Subject: Fixed bug 3303841.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2973 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chheap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chheap.c b/os/kernel/src/chheap.c
index bcfca9b77..b90b21909 100644
--- a/os/kernel/src/chheap.c
+++ b/os/kernel/src/chheap.c
@@ -80,6 +80,8 @@ void _heap_init(void) {
  * @brief   Initializes a memory heap from a static memory area.
  * @pre     Both the heap buffer base and the heap size must be aligned to
  *          the @p stkalign_t type size.
+ * @pre     In order to use this function the option @p CH_USE_MALLOC_HEAP
+ *          must be disabled.
  *
  * @param[out] heapp    pointer to the memory heap descriptor to be initialized
  * @param[in] buf       heap buffer base
@@ -271,7 +273,7 @@ static Mutex            hmtx;
 static Semaphore        hsem;
 #endif
 
-void heap_init(void) {
+void _heap_init(void) {
 
 #if CH_USE_MUTEXES
   chMtxInit(&hmtx);
-- 
cgit v1.2.3


From 3495905f51318549a2bd6764360a4812aac869fa Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 19 May 2011 17:46:52 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2974
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/src/chqueues.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chqueues.c b/os/kernel/src/chqueues.c
index f6ae10257..767a36e63 100644
--- a/os/kernel/src/chqueues.c
+++ b/os/kernel/src/chqueues.c
@@ -58,14 +58,14 @@
  *                      .
  * @return              A message specifying how the invoking thread has been
  *                      released from threads queue.
- * @retval RDY_OK       is the normal exit, thread signaled.
- * @retval RDY_RESET    if the queue has been reset.
- * @retval RDY_TIMEOUT  if the queue operation timed out.
+ * @retval Q_OK         is the normal exit, thread signaled.
+ * @retval Q_RESET      if the queue has been reset.
+ * @retval Q_TIMEOUT    if the queue operation timed out.
  */
 static msg_t qwait(GenericQueue *qp, systime_t time) {
 
   if (TIME_IMMEDIATE == time)
-    return RDY_TIMEOUT;
+    return Q_TIMEOUT;
   currp->p_u.wtobjp = qp;
   queue_insert(currp, &qp->q_waiting);
   return chSchGoSleepTimeoutS(THD_STATE_WTQUEUE, time);
@@ -111,7 +111,7 @@ void chIQResetI(InputQueue *iqp) {
   iqp->q_rdptr = iqp->q_wrptr = iqp->q_buffer;
   iqp->q_counter = 0;
   while (notempty(&iqp->q_waiting))
-    chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = RDY_RESET;
+    chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = Q_RESET;
 }
 
 /**
@@ -137,7 +137,7 @@ msg_t chIQPutI(InputQueue *iqp, uint8_t b) {
   if (iqp->q_wrptr >= iqp->q_top)
     iqp->q_wrptr = iqp->q_buffer;
   if (notempty(&iqp->q_waiting))
-    chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = RDY_OK;
+    chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = Q_OK;
   return Q_OK;
 }
 
@@ -155,7 +155,7 @@ msg_t chIQPutI(InputQueue *iqp, uint8_t b) {
  *                      .
  * @return              A byte value from the queue.
  * @retval Q_TIMEOUT    if the specified time expired.
- * @retval Q_RESET      if the queue was reset.
+ * @retval Q_RESET      if the queue has been reset.
  *
  * @api
  */
@@ -163,13 +163,13 @@ msg_t chIQGetTimeout(InputQueue *iqp, systime_t time) {
   uint8_t b;
 
   chSysLock();
-  if (iqp->q_notify)
-    iqp->q_notify(iqp);
-
   while (chIQIsEmptyI(iqp)) {
     msg_t msg;
 
-    if ((msg = qwait((GenericQueue *)iqp, time)) < RDY_OK) {
+    if (iqp->q_notify)
+      iqp->q_notify(iqp);
+
+    if ((msg = qwait((GenericQueue *)iqp, time)) < Q_OK) {
       chSysUnlock();
       return msg;
     }
@@ -220,7 +220,7 @@ size_t chIQReadTimeout(InputQueue *iqp, uint8_t *bp,
     while (chIQIsEmptyI(iqp)) {
       if (nfy)
         nfy(iqp);
-      if (qwait((GenericQueue *)iqp, time) != RDY_OK) {
+      if (qwait((GenericQueue *)iqp, time) != Q_OK) {
         chSysUnlock();
         return r;
       }
@@ -283,7 +283,7 @@ void chOQResetI(OutputQueue *oqp) {
   oqp->q_rdptr = oqp->q_wrptr = oqp->q_buffer;
   oqp->q_counter = chQSizeI(oqp);
   while (notempty(&oqp->q_waiting))
-    chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = RDY_RESET;
+    chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = Q_RESET;
 }
 
 /**
@@ -302,7 +302,7 @@ void chOQResetI(OutputQueue *oqp) {
  * @return              The operation status.
  * @retval Q_OK         if the operation succeeded.
  * @retval Q_TIMEOUT    if the specified time expired.
- * @retval Q_RESET      if the queue was reset.
+ * @retval Q_RESET      if the queue has been reset.
  *
  * @api
  */
@@ -312,7 +312,7 @@ msg_t chOQPutTimeout(OutputQueue *oqp, uint8_t b, systime_t time) {
   while (chOQIsFullI(oqp)) {
     msg_t msg;
 
-    if ((msg = qwait((GenericQueue *)oqp, time)) < RDY_OK) {
+    if ((msg = qwait((GenericQueue *)oqp, time)) < Q_OK) {
       chSysUnlock();
       return msg;
     }
@@ -351,7 +351,7 @@ msg_t chOQGetI(OutputQueue *oqp) {
   if (oqp->q_rdptr >= oqp->q_top)
     oqp->q_rdptr = oqp->q_buffer;
   if (notempty(&oqp->q_waiting))
-    chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = RDY_OK;
+    chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = Q_OK;
   return b;
 }
 
@@ -391,7 +391,7 @@ size_t chOQWriteTimeout(OutputQueue *oqp, const uint8_t *bp,
     while (chOQIsFullI(oqp)) {
       if (nfy)
         nfy(oqp);
-      if (qwait((GenericQueue *)oqp, time) != RDY_OK) {
+      if (qwait((GenericQueue *)oqp, time) != Q_OK) {
         chSysUnlock();
         return w;
       }
-- 
cgit v1.2.3


From f4ec81ae144ef2ae7ddd9a0e56082970420c0464 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 20 May 2011 12:46:24 +0000
Subject: USB CDC functionality restored, more improvements to the I/O queues.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2983 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chqueues.c | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

(limited to 'os/kernel/src')

diff --git a/os/kernel/src/chqueues.c b/os/kernel/src/chqueues.c
index 767a36e63..8532f8307 100644
--- a/os/kernel/src/chqueues.c
+++ b/os/kernel/src/chqueues.c
@@ -136,8 +136,10 @@ msg_t chIQPutI(InputQueue *iqp, uint8_t b) {
   *iqp->q_wrptr++ = b;
   if (iqp->q_wrptr >= iqp->q_top)
     iqp->q_wrptr = iqp->q_buffer;
+
   if (notempty(&iqp->q_waiting))
     chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = Q_OK;
+
   return Q_OK;
 }
 
@@ -146,6 +148,9 @@ msg_t chIQPutI(InputQueue *iqp, uint8_t b) {
  * @details This function reads a byte value from an input queue. If the queue
  *          is empty then the calling thread is suspended until a byte arrives
  *          in the queue or a timeout occurs.
+ * @note    The callback is invoked if the queue is empty before entering the
+ *          @p THD_STATE_WTQUEUE state in order to solicit the low level to
+ *          start queue filling.
  *
  * @param[in] iqp       pointer to an @p InputQueue structure
  * @param[in] time      the number of ticks before the operation timeouts,
@@ -192,8 +197,9 @@ msg_t chIQGetTimeout(InputQueue *iqp, systime_t time) {
  *          been reset.
  * @note    The function is not atomic, if you need atomicity it is suggested
  *          to use a semaphore or a mutex for mutual exclusion.
- * @note    The queue callback is invoked before entering a sleep state and at
- *          the end of the transfer.
+ * @note    The callback is invoked if the queue is empty before entering the
+ *          @p THD_STATE_WTQUEUE state in order to solicit the low level to
+ *          start queue filling.
  *
  * @param[in] iqp       pointer to an @p InputQueue structure
  * @param[out] bp       pointer to the data buffer
@@ -220,6 +226,7 @@ size_t chIQReadTimeout(InputQueue *iqp, uint8_t *bp,
     while (chIQIsEmptyI(iqp)) {
       if (nfy)
         nfy(iqp);
+
       if (qwait((GenericQueue *)iqp, time) != Q_OK) {
         chSysUnlock();
         return r;
@@ -230,15 +237,12 @@ size_t chIQReadTimeout(InputQueue *iqp, uint8_t *bp,
     *bp++ = *iqp->q_rdptr++;
     if (iqp->q_rdptr >= iqp->q_top)
       iqp->q_rdptr = iqp->q_buffer;
+
     chSysUnlock(); /* Gives a preemption chance in a controlled point.*/
     r++;
-    if (--n == 0) {
-      chSysLock();
-      if (nfy)
-        nfy(iqp);
-      chSysUnlock();
+    if (--n == 0)
       return r;
-    }
+
     chSysLock();
   }
 }
@@ -291,6 +295,8 @@ void chOQResetI(OutputQueue *oqp) {
  * @details This function writes a byte value to an output queue. If the queue
  *          is full then the calling thread is suspended until there is space
  *          in the queue or a timeout occurs.
+ * @note    The callback is invoked after writing the character into the
+ *          buffer.
  *
  * @param[in] oqp       pointer to an @p OutputQueue structure
  * @param[in] b         the byte value to be written in the queue
@@ -350,8 +356,10 @@ msg_t chOQGetI(OutputQueue *oqp) {
   b = *oqp->q_rdptr++;
   if (oqp->q_rdptr >= oqp->q_top)
     oqp->q_rdptr = oqp->q_buffer;
+
   if (notempty(&oqp->q_waiting))
     chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = Q_OK;
+
   return b;
 }
 
@@ -363,8 +371,8 @@ msg_t chOQGetI(OutputQueue *oqp) {
  *          been reset.
  * @note    The function is not atomic, if you need atomicity it is suggested
  *          to use a semaphore or a mutex for mutual exclusion.
- * @note    The queue callback is invoked before entering a sleep state and at
- *          the end of the transfer.
+ * @note    The callback is invoked after writing each character into the
+ *          buffer.
  *
  * @param[in] oqp       pointer to an @p OutputQueue structure
  * @param[out] bp       pointer to the data buffer
@@ -389,8 +397,6 @@ size_t chOQWriteTimeout(OutputQueue *oqp, const uint8_t *bp,
   chSysLock();
   while (TRUE) {
     while (chOQIsFullI(oqp)) {
-      if (nfy)
-        nfy(oqp);
       if (qwait((GenericQueue *)oqp, time) != Q_OK) {
         chSysUnlock();
         return w;
@@ -400,15 +406,14 @@ size_t chOQWriteTimeout(OutputQueue *oqp, const uint8_t *bp,
     *oqp->q_wrptr++ = *bp++;
     if (oqp->q_wrptr >= oqp->q_top)
       oqp->q_wrptr = oqp->q_buffer;
+
+    if (nfy)
+      nfy(oqp);
+
     chSysUnlock(); /* Gives a preemption chance in a controlled point.*/
     w++;
-    if (--n == 0) {
-      chSysLock();
-      if (nfy)
-        nfy(oqp);
-      chSysUnlock();
+    if (--n == 0)
       return w;
-    }
     chSysLock();
   }
 }
-- 
cgit v1.2.3