Changeset 5882487 in mainline for uspace/lib/c/include/bd_srv.h

Timestamp:

2012-08-16T09:43:13Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8cbd39

Parents:

b52dd1de (diff), c8444d8 (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/bd_srv.h (modified) (3 diffs)

uspace/lib/c/include/bd_srv.h

@@ -36 +36 @@
 #define LIBC_BD_SRV_H_
 
+#include <adt/list.h>
 #include <async.h>
 #include <fibril_synch.h>
@@ -43 +44 @@
 typedef struct bd_ops bd_ops_t;
 
+/** Service setup (per sevice) */
 typedef struct {
-        fibril_mutex_t lock;
-        bool connected;
         bd_ops_t *ops;
-        void *arg;
+        void *sarg;
+} bd_srvs_t;
+
+/** Server structure (per client session) */
+typedef struct {
+        bd_srvs_t *srvs;
         async_sess_t *client_sess;
+        void *carg;
 } bd_srv_t;
 
 typedef struct bd_ops {
-        int (*open)(bd_srv_t *);
+        int (*open)(bd_srvs_t *, bd_srv_t *);
         int (*close)(bd_srv_t *);
         int (*read_blocks)(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -61 +67 @@
 } bd_ops_t;
 
-extern void bd_srv_init(bd_srv_t *);
+extern void bd_srvs_init(bd_srvs_t *);
 
-extern int bd_conn(ipc_callid_t, ipc_call_t *, void *);
+extern int bd_conn(ipc_callid_t, ipc_call_t *, bd_srvs_t *);
 
 #endif