Changeset 46c20c8 in mainline for uspace/lib/c/include/ipc/packet.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/include/ipc/packet.h (moved) (moved from kernel/generic/include/synch/rwlock.h ) (2 diffs)

uspace/lib/c/include/ipc/packet.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2009 Lukas Mejdrech
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup sync
- * @{
- */
-/** @file
+/** @addtogroup libc
+ *  @{
  */
 
-#ifndef KERN_RWLOCK_H_
-#define KERN_RWLOCK_H_
+/** @file
+ *  Packet server module messages.
+ */
 
-#include <arch/types.h>
-#include <synch/mutex.h>
-#include <synch/synch.h>
-#include <synch/spinlock.h>
+#ifndef LIBC_PACKET_MESSAGES_
+#define LIBC_PACKET_MESSAGES_
 
+#include <ipc/ipc.h>
+#include <ipc/net.h>
+
+/** Packet server module messages. */
 typedef enum {
-        RWLOCK_NONE,
-        RWLOCK_READER,
-        RWLOCK_WRITER
-} rwlock_type_t;
+        /** Create packet message with specified content length.
+         * @see packet_get_1()
+         */
+        NET_PACKET_CREATE_1 = NET_PACKET_FIRST,
+        
+        /**
+         * Create packet message with specified address length, prefix, content
+         * and suffix.
+         * @see packet_get_4()
+         */
+        NET_PACKET_CREATE_4,
+        
+        /** Get packet message.
+         * @see packet_return() */
+        NET_PACKET_GET,
+        
+        /** Get packet size message.
+         * @see packet_translate()
+         */
+        NET_PACKET_GET_SIZE,
+        
+        /** Release packet message.
+         * @see pq_release()
+         */
+        NET_PACKET_RELEASE
+} packet_messages;
 
-typedef struct {
-        SPINLOCK_DECLARE(lock);
-        /**
-         * Mutex for writers, readers can bypass it if readers_in is positive.
-         */
-        mutex_t exclusive;
-        /** Number of readers in critical section. */
-        size_t readers_in;
-} rwlock_t;
+/** Returns the protocol service message parameter. */
+#define ARP_GET_PROTO(call)     (services_t) IPC_GET_ARG2(*call)
 
-#define rwlock_write_lock(rwl) \
-        _rwlock_write_lock_timeout((rwl), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
-#define rwlock_read_lock(rwl) \
-        _rwlock_read_lock_timeout((rwl), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
-#define rwlock_write_trylock(rwl) \
-        _rwlock_write_lock_timeout((rwl), SYNCH_NO_TIMEOUT, \
-            SYNCH_FLAGS_NON_BLOCKING)
-#define rwlock_read_trylock(rwl) \
-        _rwlock_read_lock_timeout((rwl), SYNCH_NO_TIMEOUT, \
-            SYNCH_FLAGS_NON_BLOCKING)
-#define rwlock_write_lock_timeout(rwl, usec) \
-        _rwlock_write_lock_timeout((rwl), (usec), SYNCH_FLAGS_NONE)
-#define rwlock_read_lock_timeout(rwl, usec) \
-        _rwlock_read_lock_timeout((rwl), (usec), SYNCH_FLAGS_NONE)
+/** Returns the packet identifier message parameter. */
+#define IPC_GET_ID(call)        (packet_id_t) IPC_GET_ARG1(*call)
 
-extern void rwlock_initialize(rwlock_t *rwl);
-extern void rwlock_read_unlock(rwlock_t *rwl);
-extern void rwlock_write_unlock(rwlock_t *rwl);
-extern int _rwlock_read_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags);
-extern int _rwlock_write_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags);
+/** Returns the maximal content length message parameter. */
+#define IPC_GET_CONTENT(call)   (size_t) IPC_GET_ARG1(*call)
+
+/** Returns the maximal address length message parameter. */
+#define IPC_GET_ADDR_LEN(call)  (size_t) IPC_GET_ARG2(*call)
+
+/** Returns the maximal prefix length message parameter. */
+#define IPC_GET_PREFIX(call)    (size_t) IPC_GET_ARG3(*call)
+
+/** Returns the maximal suffix length message parameter. */
+#define IPC_GET_SUFFIX(call)    (size_t) IPC_GET_ARG4(*call)
 
 #endif