projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add type include. Fix semicolon.
[bertos.git]
/
bertos
/
kern
/
msg.h
diff --git
a/bertos/kern/msg.h
b/bertos/kern/msg.h
index e4ee21f9b1ab5f2ae7a136aa5f7eaba2953aa257..ba584b764ba7d20e9629c01833f0efb90ebeed1e 100644
(file)
--- a/
bertos/kern/msg.h
+++ b/
bertos/kern/msg.h
@@
-175,14
+175,13
@@
* \endcode
*/
* \endcode
*/
- */
#ifndef KERN_MSG_H
#define KERN_MSG_H
#ifndef KERN_MSG_H
#define KERN_MSG_H
-#include
"event.h"
+#include
<mware/event.h>
#include <mware/list.h>
#include <mware/list.h>
-
+#include <kern/proc.h>
typedef struct MsgPort
{
typedef struct MsgPort
{
@@
-214,7
+213,7
@@
typedef struct Msg
*
* \see msg_unlockPort()
*/
*
* \see msg_unlockPort()
*/
-INLINE void msg_lockPort(
MsgPort *port
)
+INLINE void msg_lockPort(
UNUSED_ARG(MsgPort *, port)
)
{
proc_forbid();
}
{
proc_forbid();
}
@@
-224,7
+223,7
@@
INLINE void msg_lockPort(MsgPort *port)
*
* \see msg_lockPort()
*/
*
* \see msg_lockPort()
*/
-INLINE void msg_unlockPort(
MsgPort *port
)
+INLINE void msg_unlockPort(
UNUSED_ARG(MsgPort *, port)
)
{
proc_permit();
}
{
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)
{
/** 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);
ADDTAIL(&port->queue, &msg->link);
- msg_
portUnlock
(port);
+ msg_
unlockPort
(port);
event_do(&port->event);
}
event_do(&port->event);
}
@@
-256,9
+255,9
@@
INLINE Msg *msg_get(MsgPort *port)
{
Msg *msg;
{
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;
}
return msg;
}
@@
-268,11
+267,11
@@
INLINE Msg *msg_peek(MsgPort *port)
{
Msg *msg;
{
Msg *msg;
- msg_
portLock
(port);
- msg = (Msg *)port->queue.head;
- if (
ISLIST
EMPTY(&port->queue))
+ msg_
lockPort
(port);
+ msg = (Msg *)port->queue.head
.succ
;
+ if (
LIST_
EMPTY(&port->queue))
msg = NULL;
msg = NULL;
- msg_
portUnlock
(port);
+ msg_
unlockPort
(port);
return msg;
}
return msg;
}