Fix mangled msg.h file.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1245 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/app/demo/demo.c b/app/demo/demo.c
index f28576ea2677305c2c30bda4c4d149cb6fa83cd2..c13fdf78cb68d31192f5a484bba89ba75000886e 100644 (file)
--- a/app/demo/demo.c
+++ b/app/demo/demo.c
@@ -39,6 +39,7 @@
 
 #include <emul/emul.h>
 #include <kern/proc.h>
+#include <kern/msg.h>
 #include <drv/timer.h>
 #include <drv/buzzer.h>
 #include <drv/lcd_gfx.h>

diff --git a/bertos/kern/msg.h b/bertos/kern/msg.h
index e4ee21f9b1ab5f2ae7a136aa5f7eaba2953aa257..25b7a4ef06b8079e494ac806c5834b31574bb445 100644 (file)
--- a/bertos/kern/msg.h
+++ b/bertos/kern/msg.h
@@ -175,12 +175,11 @@
  * \endcode
  */
 
- */
 
 #ifndef KERN_MSG_H
 #define KERN_MSG_H
 
-#include "event.h"
+#include <mware/event.h>
 #include <mware/list.h>
 
 
@@ -214,7 +213,7 @@ typedef struct Msg
  *
  * \see msg_unlockPort()
  */
-INLINE void msg_lockPort(MsgPort *port)
+INLINE void msg_lockPort(UNUSED_ARG(MsgPort *, port))
 {
        proc_forbid();
 }
@@ -224,7 +223,7 @@ INLINE void msg_lockPort(MsgPort *port)
  *
  * \see msg_lockPort()
  */
-INLINE void msg_unlockPort(MsgPort *port)
+INLINE void msg_unlockPort(UNUSED_ARG(MsgPort *, port))
 {
        proc_permit();
 }
@@ -240,9 +239,9 @@ INLINE void msg_initPort(MsgPort *port, Event event)
 /** Queue \a msg into \a port, triggering the associated event */
 INLINE void msg_put(MsgPort *port, Msg *msg)
 {
-       msg_portLock(port);
+       msg_lockPort(port);
        ADDTAIL(&port->queue, &msg->link);
-       msg_portUnlock(port);
+       msg_unlockPort(port);
 
        event_do(&port->event);
 }
@@ -256,9 +255,9 @@ INLINE Msg *msg_get(MsgPort *port)
 {
        Msg *msg;
 
-       msg_portLock(port);
-       msg = (Msg *)REMHEAD(&port->queue);
-       msg_portUnlock(port);
+       msg_lockPort(port);
+       msg = (Msg *)list_remHead(&port->queue);
+       msg_unlockPort(port);
 
        return msg;
 }
@@ -268,11 +267,11 @@ INLINE Msg *msg_peek(MsgPort *port)
 {
        Msg *msg;
 
-       msg_portLock(port);
-       msg = (Msg *)port->queue.head;
-       if (ISLISTEMPTY(&port->queue))
+       msg_lockPort(port);
+       msg = (Msg *)port->queue.head.succ;
+       if (LIST_EMPTY(&port->queue))
                msg = NULL;
-       msg_portUnlock(port);
+       msg_unlockPort(port);
 
        return msg;
 }