Changeset affaf2e in mainline for uspace/lib

Timestamp:

2012-08-15T15:13:20Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

b546231

Parents:

f66ca57f (diff), 135486d (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.

Location:

uspace/lib

Files:

• block/libblock.c (modified) (29 diffs)
• block/libblock.h (modified) (1 diff)
• c/Makefile (modified) (1 diff)
• c/generic/async.c (modified) (5 diffs)
• c/generic/bd.c (added)
• c/generic/bd_srv.c (added)
• c/generic/ipc.c (modified) (4 diffs)
• c/generic/iplink_srv.c (modified) (1 diff)
• c/include/bd.h (added)
• c/include/bd_srv.h (added)
• c/include/ipc/ipc.h (modified) (3 diffs)
• ext4/Makefile (added)
• ext4/libext4.h (added)
• ext4/libext4_balloc.c (added)
• ext4/libext4_balloc.h (added)
• ext4/libext4_bitmap.c (added)
• ext4/libext4_bitmap.h (added)
• ext4/libext4_block_group.c (added)
• ext4/libext4_block_group.h (added)
• ext4/libext4_crc.c (added)
• ext4/libext4_crc.h (added)
• ext4/libext4_directory.c (added)
• ext4/libext4_directory.h (added)
• ext4/libext4_directory_index.c (added)
• ext4/libext4_directory_index.h (added)
• ext4/libext4_extent.c (added)
• ext4/libext4_extent.h (added)
• ext4/libext4_filesystem.c (added)
• ext4/libext4_filesystem.h (added)
• ext4/libext4_hash.c (added)
• ext4/libext4_hash.h (added)
• ext4/libext4_ialloc.c (added)
• ext4/libext4_ialloc.h (added)
• ext4/libext4_inode.c (added)
• ext4/libext4_inode.h (added)
• ext4/libext4_superblock.c (added)
• ext4/libext4_superblock.h (added)
• ext4/libext4_types.h (added)

uspace/lib/block/libblock.c

@@ -40 +40 @@
 #include "../../srv/vfs/vfs.h"
 #include <ipc/loc.h>
-#include <ipc/bd.h>
 #include <ipc/services.h>
 #include <errno.h>
@@ -47 +46 @@
 #include <as.h>
 #include <assert.h>
+#include <bd.h>
 #include <fibril_synch.h>
 #include <adt/list.h>
@@ -80 +80 @@
         service_id_t service_id;
         async_sess_t *sess;
-        fibril_mutex_t comm_area_lock;
-        void *comm_area;
-        size_t comm_size;
+        bd_t *bd;
         void *bb_buf;
         aoff64_t bb_addr;
@@ -89 +87 @@
 } devcon_t;
 
-static int read_blocks(devcon_t *, aoff64_t, size_t);
-static int write_blocks(devcon_t *, aoff64_t, size_t);
-static int get_block_size(async_sess_t *, size_t *);
-static int get_num_blocks(async_sess_t *, aoff64_t *);
+static int read_blocks(devcon_t *, aoff64_t, size_t, void *, size_t);
+static int write_blocks(devcon_t *, aoff64_t, size_t, void *, size_t);
 static aoff64_t ba_ltop(devcon_t *, aoff64_t);
 
@@ -112 +108 @@
 
 static int devcon_add(service_id_t service_id, async_sess_t *sess,
-    size_t bsize, void *comm_area, size_t comm_size)
+    size_t bsize, bd_t *bd)
 {
         devcon_t *devcon;
-        
-        if (comm_size < bsize)
-                return EINVAL;
         
         devcon = malloc(sizeof(devcon_t));
@@ -126 +119 @@
         devcon->service_id = service_id;
         devcon->sess = sess;
-        fibril_mutex_initialize(&devcon->comm_area_lock);
-        devcon->comm_area = comm_area;
-        devcon->comm_size = comm_size;
+        devcon->bd = bd;
         devcon->bb_buf = NULL;
         devcon->bb_addr = 0;
@@ -158 +149 @@
     size_t comm_size)
 {
-        void *comm_area = mmap(NULL, comm_size, PROTO_READ | PROTO_WRITE,
-            MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
-        if (!comm_area)
-                return ENOMEM;
-        
+        bd_t *bd;
+
         async_sess_t *sess = loc_service_connect(mgmt, service_id,
             IPC_FLAG_BLOCKING);
         if (!sess) {
-                munmap(comm_area, comm_size);
                 return ENOENT;
         }
         
-        async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_share_out_start(exch, comm_area,
-            AS_AREA_READ | AS_AREA_WRITE);
-        async_exchange_end(exch);
-        
+        int rc = bd_open(sess, &bd);
         if (rc != EOK) {
-                munmap(comm_area, comm_size);
                 async_hangup(sess);
                 return rc;
@@ -182 +164 @@
         
         size_t bsize;
-        rc = get_block_size(sess, &bsize);
-        
+        rc = bd_get_block_size(bd, &bsize);
         if (rc != EOK) {
-                munmap(comm_area, comm_size);
+                bd_close(bd);
                 async_hangup(sess);
                 return rc;
         }
         
-        rc = devcon_add(service_id, sess, bsize, comm_area, comm_size);
+        rc = devcon_add(service_id, sess, bsize, bd);
         if (rc != EOK) {
-                munmap(comm_area, comm_size);
+                bd_close(bd);
                 async_hangup(sess);
                 return rc;
@@ -213 +194 @@
                 free(devcon->bb_buf);
         
-        munmap(devcon->comm_area, devcon->comm_size);
+        bd_close(devcon->bd);
         async_hangup(devcon->sess);
         
@@ -233 +214 @@
                 return ENOMEM;
 
-        fibril_mutex_lock(&devcon->comm_area_lock);
-        rc = read_blocks(devcon, 0, 1);
+        rc = read_blocks(devcon, 0, 1, bb_buf, devcon->pblock_size);
         if (rc != EOK) {
-                fibril_mutex_unlock(&devcon->comm_area_lock);
                 free(bb_buf);
                 return rc;
         }
-        memcpy(bb_buf, devcon->comm_area, devcon->pblock_size);
-        fibril_mutex_unlock(&devcon->comm_area_lock);
 
         devcon->bb_buf = bb_buf;
@@ -338 +315 @@
                 list_remove(&b->free_link);
                 if (b->dirty) {
-                        memcpy(devcon->comm_area, b->data, b->size);
-                        rc = write_blocks(devcon, b->pba, cache->blocks_cluster);
+                        rc = write_blocks(devcon, b->pba, cache->blocks_cluster,
+                            b->data, b->size);
                         if (rc != EOK)
                                 return rc;
@@ -481 +458 @@
                                 list_append(&b->free_link, &cache->free_list);
                                 fibril_mutex_unlock(&cache->lock);
-                                fibril_mutex_lock(&devcon->comm_area_lock);
-                                memcpy(devcon->comm_area, b->data, b->size);
                                 rc = write_blocks(devcon, b->pba,
-                                    cache->blocks_cluster);
-                                fibril_mutex_unlock(&devcon->comm_area_lock);
+                                    cache->blocks_cluster, b->data, b->size);
                                 if (rc != EOK) {
                                         /*
@@ -555 +529 @@
                          * the new contents from the device.
                          */
-                        fibril_mutex_lock(&devcon->comm_area_lock);
-                        rc = read_blocks(devcon, b->pba, cache->blocks_cluster);
-                        memcpy(b->data, devcon->comm_area, cache->lblock_size);
-                        fibril_mutex_unlock(&devcon->comm_area_lock);
+                        rc = read_blocks(devcon, b->pba, cache->blocks_cluster,
+                            b->data, cache->lblock_size);
                         if (rc != EOK) 
                                 b->toxic = true;
@@ -616 +588 @@
         if (block->dirty && (block->refcnt == 1) &&
             (blocks_cached > CACHE_HI_WATERMARK || mode != CACHE_MODE_WB)) {
-                fibril_mutex_lock(&devcon->comm_area_lock);
-                memcpy(devcon->comm_area, block->data, block->size);
-                rc = write_blocks(devcon, block->pba, cache->blocks_cluster);
-                fibril_mutex_unlock(&devcon->comm_area_lock);
+                rc = write_blocks(devcon, block->pba, cache->blocks_cluster,
+                    block->data, block->size);
                 block->dirty = false;
         }
@@ -688 +658 @@
  *
  * @param service_id    Service ID of the block device.
+ * @param buf           Buffer for holding one block
  * @param bufpos        Pointer to the first unread valid offset within the
  *                      communication buffer.
@@ -699 +670 @@
  * @return              EOK on success or a negative return code on failure.
  */
-int block_seqread(service_id_t service_id, size_t *bufpos, size_t *buflen,
-    aoff64_t *pos, void *dst, size_t size)
+int block_seqread(service_id_t service_id, void *buf, size_t *bufpos,
+    size_t *buflen, aoff64_t *pos, void *dst, size_t size)
 {
         size_t offset = 0;
@@ -711 +682 @@
         block_size = devcon->pblock_size;
         
-        fibril_mutex_lock(&devcon->comm_area_lock);
         while (left > 0) {
                 size_t rd;
@@ -725 +695 @@
                          * destination buffer.
                          */
-                        memcpy(dst + offset, devcon->comm_area + *bufpos, rd);
+                        memcpy(dst + offset, buf + *bufpos, rd);
                         offset += rd;
                         *bufpos += rd;
@@ -736 +706 @@
                         int rc;
 
-                        rc = read_blocks(devcon, *pos / block_size, 1);
+                        rc = read_blocks(devcon, *pos / block_size, 1, buf,
+                            devcon->pblock_size);
                         if (rc != EOK) {
-                                fibril_mutex_unlock(&devcon->comm_area_lock);
                                 return rc;
                         }
@@ -746 +716 @@
                 }
         }
-        fibril_mutex_unlock(&devcon->comm_area_lock);
         
         return EOK;
@@ -763 +732 @@
 {
         devcon_t *devcon;
-        int rc;
 
         devcon = devcon_search(service_id);
         assert(devcon);
-        
-        fibril_mutex_lock(&devcon->comm_area_lock);
-
-        rc = read_blocks(devcon, ba, cnt);
-        if (rc == EOK)
-                memcpy(buf, devcon->comm_area, devcon->pblock_size * cnt);
-
-        fibril_mutex_unlock(&devcon->comm_area_lock);
-
-        return rc;
+
+        return read_blocks(devcon, ba, cnt, buf, devcon->pblock_size * cnt);
 }
 
@@ -792 +752 @@
 {
         devcon_t *devcon;
-        int rc;
 
         devcon = devcon_search(service_id);
         assert(devcon);
-        
-        fibril_mutex_lock(&devcon->comm_area_lock);
-
-        memcpy(devcon->comm_area, data, devcon->pblock_size * cnt);
-        rc = write_blocks(devcon, ba, cnt);
-
-        fibril_mutex_unlock(&devcon->comm_area_lock);
-
-        return rc;
+
+        return write_blocks(devcon, ba, cnt, (void *)data, devcon->pblock_size * cnt);
 }
 
@@ -820 +772 @@
         devcon = devcon_search(service_id);
         assert(devcon);
-        
-        return get_block_size(devcon->sess, bsize);
+
+        return bd_get_block_size(devcon->bd, bsize);
 }
 
@@ -836 +788 @@
         assert(devcon);
         
-        return get_num_blocks(devcon->sess, nblocks);
+        return bd_get_num_blocks(devcon->bd, nblocks);
 }
 
@@ -887 +839 @@
         memcpy(data, buffer + offset, bytes);
         free(buffer);
-        
+
         return EOK;
 }
@@ -903 +855 @@
 {
         devcon_t *devcon = devcon_search(service_id);
-        assert(devcon);
-        
         toc_block_t *toc = NULL;
-        
-        fibril_mutex_lock(&devcon->comm_area_lock);
-        
-        async_exch_t *exch = async_exchange_begin(devcon->sess);
-        int rc = async_req_1_0(exch, BD_READ_TOC, session);
-        async_exchange_end(exch);
-        
-        if (rc == EOK) {
-                toc = (toc_block_t *) malloc(sizeof(toc_block_t));
-                if (toc != NULL) {
-                        memset(toc, 0, sizeof(toc_block_t));
-                        memcpy(toc, devcon->comm_area,
-                            min(devcon->pblock_size, sizeof(toc_block_t)));
-                }
-        }
-        
-        
-        fibril_mutex_unlock(&devcon->comm_area_lock);
+        int rc;
+        
+        assert(devcon);
+        
+        toc = (toc_block_t *) malloc(sizeof(toc_block_t));
+        if (toc == NULL)
+                return NULL;
+        
+        rc = bd_read_toc(devcon->bd, session, toc, sizeof(toc_block_t));
+        if (rc != EOK) {
+                free(toc);
+                return NULL;
+        }
         
         return toc;
@@ -937 +882 @@
  * @return              EOK on success or negative error code on failure.
  */
-static int read_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt)
-{
-        assert(devcon);
-        
-        async_exch_t *exch = async_exchange_begin(devcon->sess);
-        int rc = async_req_3_0(exch, BD_READ_BLOCKS, LOWER32(ba),
-            UPPER32(ba), cnt);
-        async_exchange_end(exch);
-        
+static int read_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt, void *buf,
+    size_t size)
+{
+        assert(devcon);
+        
+        int rc = bd_read_blocks(devcon->bd, ba, cnt, buf, size);
         if (rc != EOK) {
                 printf("Error %d reading %zu blocks starting at block %" PRIuOFF64
@@ -967 +909 @@
  * @return              EOK on success or negative error code on failure.
  */
-static int write_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt)
-{
-        assert(devcon);
-        
-        async_exch_t *exch = async_exchange_begin(devcon->sess);
-        int rc = async_req_3_0(exch, BD_WRITE_BLOCKS, LOWER32(ba),
-            UPPER32(ba), cnt);
-        async_exchange_end(exch);
-        
+static int write_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt, void *data,
+    size_t size)
+{
+        assert(devcon);
+        
+        int rc = bd_write_blocks(devcon->bd, ba, cnt, data, size);
         if (rc != EOK) {
                 printf("Error %d writing %zu blocks starting at block %" PRIuOFF64
@@ -987 +926 @@
 }
 
-/** Get block size used by the device. */
-static int get_block_size(async_sess_t *sess, size_t *bsize)
-{
-        sysarg_t bs;
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_req_0_1(exch, BD_GET_BLOCK_SIZE, &bs);
-        async_exchange_end(exch);
-        
-        if (rc == EOK)
-                *bsize = (size_t) bs;
-        
-        return rc;
-}
-
-/** Get total number of blocks on block device. */
-static int get_num_blocks(async_sess_t *sess, aoff64_t *nblocks)
-{
-        sysarg_t nb_l;
-        sysarg_t nb_h;
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_req_0_2(exch, BD_GET_NUM_BLOCKS, &nb_l, &nb_h);
-        async_exchange_end(exch);
-        
-        if (rc == EOK)
-                *nblocks = (aoff64_t) MERGE_LOUP32(nb_l, nb_h);
-        
-        return rc;
-}
-
 /** Convert logical block address to physical block address. */
 static aoff64_t ba_ltop(devcon_t *devcon, aoff64_t lba)

uspace/lib/block/libblock.h

@@ -122 +122 @@
 extern int block_put(block_t *);
 
-extern int block_seqread(service_id_t, size_t *, size_t *, aoff64_t *, void *,
-    size_t);
+extern int block_seqread(service_id_t, void *, size_t *, size_t *, aoff64_t *,
+    void *, size_t);
 
 extern int block_get_bsize(service_id_t, size_t *);

uspace/lib/c/Makefile

@@ -62 +62 @@
         generic/ddi.c \
         generic/as.c \
+        generic/bd.c \
+        generic/bd_srv.c \
         generic/cap.c \
         generic/cfg.c \

uspace/lib/c/generic/async.c

@@ -114 +114 @@
 #include <stdlib.h>
 #include <macros.h>
+#include "private/libc.h"
 
 #define CLIENT_HASH_TABLE_BUCKETS  32
@@ -2166 +2167 @@
 int async_share_in_finalize(ipc_callid_t callid, void *src, unsigned int flags)
 {
-        return ipc_share_in_finalize(callid, src, flags);
+        return ipc_answer_3(callid, EOK, (sysarg_t) src, (sysarg_t) flags,
+            (sysarg_t) __entry);
 }
 
@@ -2233 +2235 @@
 int async_share_out_finalize(ipc_callid_t callid, void **dst)
 {
-        return ipc_share_out_finalize(callid, dst);
+        return ipc_answer_2(callid, EOK, (sysarg_t) __entry, (sysarg_t) dst);
 }
 
@@ -2317 +2319 @@
 int async_data_read_finalize(ipc_callid_t callid, const void *src, size_t size)
 {
-        return ipc_data_read_finalize(callid, src, size);
+        return ipc_answer_2(callid, EOK, (sysarg_t) src, (sysarg_t) size);
 }
 
@@ -2420 +2422 @@
 int async_data_write_finalize(ipc_callid_t callid, void *dst, size_t size)
 {
-        return ipc_data_write_finalize(callid, dst, size);
+        return ipc_answer_2(callid, EOK, (sysarg_t) dst, (sysarg_t) size);
 }
 

uspace/lib/c/generic/ipc.c

@@ -48 +48 @@
 #include <fibril.h>
 #include <macros.h>
-#include "private/libc.h"
 
 /**
@@ -83 +82 @@
 
 static atomic_t ipc_futex = FUTEX_INITIALIZER;
-
-/** Fast synchronous call.
- *
- * Only three payload arguments can be passed using this function. However,
- * this function is faster than the generic ipc_call_sync_slow() because
- * the payload is passed directly in registers.
- *
- * @param phoneid Phone handle for the call.
- * @param method  Requested method.
- * @param arg1    Service-defined payload argument.
- * @param arg2    Service-defined payload argument.
- * @param arg3    Service-defined payload argument.
- * @param result1 If non-NULL, the return ARG1 will be stored there.
- * @param result2 If non-NULL, the return ARG2 will be stored there.
- * @param result3 If non-NULL, the return ARG3 will be stored there.
- * @param result4 If non-NULL, the return ARG4 will be stored there.
- * @param result5 If non-NULL, the return ARG5 will be stored there.
- *
- * @return Negative values representing IPC errors.
- * @return Otherwise the RETVAL of the answer.
- *
- */
-int ipc_call_sync_fast(int phoneid, sysarg_t method, sysarg_t arg1,
-    sysarg_t arg2, sysarg_t arg3, sysarg_t *result1, sysarg_t *result2,
-    sysarg_t *result3, sysarg_t *result4, sysarg_t *result5)
-{
-        ipc_call_t resdata;
-        int callres = __SYSCALL6(SYS_IPC_CALL_SYNC_FAST, phoneid, method, arg1,
-            arg2, arg3, (sysarg_t) &resdata);
-        if (callres)
-                return callres;
-        
-        if (result1)
-                *result1 = IPC_GET_ARG1(resdata);
-        if (result2)
-                *result2 = IPC_GET_ARG2(resdata);
-        if (result3)
-                *result3 = IPC_GET_ARG3(resdata);
-        if (result4)
-                *result4 = IPC_GET_ARG4(resdata);
-        if (result5)
-                *result5 = IPC_GET_ARG5(resdata);
-        
-        return IPC_GET_RETVAL(resdata);
-}
-
-/** Synchronous call transmitting 5 arguments of payload.
- *
- * @param phoneid Phone handle for the call.
- * @param imethod Requested interface and method.
- * @param arg1    Service-defined payload argument.
- * @param arg2    Service-defined payload argument.
- * @param arg3    Service-defined payload argument.
- * @param arg4    Service-defined payload argument.
- * @param arg5    Service-defined payload argument.
- * @param result1 If non-NULL, storage for the first return argument.
- * @param result2 If non-NULL, storage for the second return argument.
- * @param result3 If non-NULL, storage for the third return argument.
- * @param result4 If non-NULL, storage for the fourth return argument.
- * @param result5 If non-NULL, storage for the fifth return argument.
- *
- * @return Negative values representing IPC errors.
- * @return Otherwise the RETVAL of the answer.
- *
- */
-int ipc_call_sync_slow(int phoneid, sysarg_t imethod, sysarg_t arg1,
-    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
-    sysarg_t *result1, sysarg_t *result2, sysarg_t *result3, sysarg_t *result4,
-    sysarg_t *result5)
-{
-        ipc_call_t data;
-        
-        IPC_SET_IMETHOD(data, imethod);
-        IPC_SET_ARG1(data, arg1);
-        IPC_SET_ARG2(data, arg2);
-        IPC_SET_ARG3(data, arg3);
-        IPC_SET_ARG4(data, arg4);
-        IPC_SET_ARG5(data, arg5);
-        
-        int callres = __SYSCALL3(SYS_IPC_CALL_SYNC_SLOW, phoneid,
-            (sysarg_t) &data, (sysarg_t) &data);
-        if (callres)
-                return callres;
-        
-        if (result1)
-                *result1 = IPC_GET_ARG1(data);
-        if (result2)
-                *result2 = IPC_GET_ARG2(data);
-        if (result3)
-                *result3 = IPC_GET_ARG3(data);
-        if (result4)
-                *result4 = IPC_GET_ARG4(data);
-        if (result5)
-                *result5 = IPC_GET_ARG5(data);
-        
-        return IPC_GET_RETVAL(data);
-}
 
 /** Send asynchronous message via syscall.
@@ -611 +513 @@
 }
 
-/** Request callback connection.
- *
- * The @a task_id and @a phonehash identifiers returned
- * by the kernel can be used for connection tracking.
- *
- * @param phoneid   Phone handle used for contacting the other side.
- * @param arg1      User defined argument.
- * @param arg2      User defined argument.
- * @param arg3      User defined argument.
- * @param task_id   Identifier of the client task.
- * @param phonehash Opaque identifier of the phone that will
- *                  be used for incoming calls.
- *
- * @return Zero on success or a negative error code.
- *
- */
-int ipc_connect_to_me(int phoneid, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
-    task_id_t *task_id, sysarg_t *phonehash)
-{
-        ipc_call_t data;
-        int rc = __SYSCALL6(SYS_IPC_CALL_SYNC_FAST, phoneid,
-            IPC_M_CONNECT_TO_ME, arg1, arg2, arg3, (sysarg_t) &data);
-        if (rc == EOK) {
-                *task_id = data.in_task_id;
-                *phonehash = IPC_GET_ARG5(data);
-        }       
-        return rc;
-}
-
-/** Request cloned connection.
- *
- * @param phoneid Phone handle used for contacting the other side.
- *
- * @return Cloned phone handle on success or a negative error code.
- *
- */
-int ipc_clone_establish(int phoneid)
-{
-        sysarg_t newphid;
-        int res = ipc_call_sync_0_5(phoneid, IPC_M_CLONE_ESTABLISH, NULL,
-            NULL, NULL, NULL, &newphid);
-        if (res)
-                return res;
-        
-        return newphid;
-}
-
-/** Request new connection.
- *
- * @param phoneid Phone handle used for contacting the other side.
- * @param arg1    User defined argument.
- * @param arg2    User defined argument.
- * @param arg3    User defined argument.
- *
- * @return New phone handle on success or a negative error code.
- *
- */
-int ipc_connect_me_to(int phoneid, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3)
-{
-        sysarg_t newphid;
-        int res = ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
-            NULL, NULL, NULL, NULL, &newphid);
-        if (res)
-                return res;
-        
-        return newphid;
-}
-
-/** Request new connection (blocking)
- *
- * If the connection is not available at the moment, the
- * call should block. This has to be, however, implemented
- * on the server side.
- *
- * @param phoneid Phone handle used for contacting the other side.
- * @param arg1    User defined argument.
- * @param arg2    User defined argument.
- * @param arg3    User defined argument.
- *
- * @return New phone handle on success or a negative error code.
- *
- */
-int ipc_connect_me_to_blocking(int phoneid, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3)
-{
-        sysarg_t newphid;
-        int res = ipc_call_sync_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
-            IPC_FLAG_BLOCKING, NULL, NULL, NULL, NULL, &newphid);
-        if (res)
-                return res;
-        
-        return newphid;
-}
-
 /** Hang up a phone.
  *
@@ -758 +566 @@
 }
 
-/** Wrapper for IPC_M_SHARE_IN calls.
- *
- * @param phoneid Phone that will be used to contact the receiving side.
- * @param size    Size of the destination address space area.
- * @param arg     User defined argument.
- * @param flags   Storage for received flags. Can be NULL.
- * @param dst     Destination address space area base. Cannot be NULL.
- *
- * @return Zero on success or a negative error code from errno.h.
- *
- */
-int ipc_share_in_start(int phoneid, size_t size, sysarg_t arg,
-    unsigned int *flags, void **dst)
-{
-        sysarg_t _flags = 0;
-        sysarg_t _dst = (sysarg_t) -1;
-        int res = ipc_call_sync_2_4(phoneid, IPC_M_SHARE_IN, (sysarg_t) size,
-            arg, NULL, &_flags, NULL, &_dst);
-        
-        if (flags)
-                *flags = (unsigned int) _flags;
-        
-        *dst = (void *) _dst;
-        return res;
-}
-
-/** Wrapper for answering the IPC_M_SHARE_IN calls.
- *
- * This wrapper only makes it more comfortable to answer IPC_M_SHARE_IN
- * calls so that the user doesn't have to remember the meaning of each
- * IPC argument.
- *
- * @param callid Hash of the IPC_M_DATA_READ call to answer.
- * @param src    Source address space base.
- * @param flags Flags to be used for sharing. Bits can be only cleared.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
- */
-int ipc_share_in_finalize(ipc_callid_t callid, void *src, unsigned int flags)
-{
-        return ipc_answer_3(callid, EOK, (sysarg_t) src, (sysarg_t) flags,
-            (sysarg_t) __entry);
-}
-
-/** Wrapper for IPC_M_SHARE_OUT calls.
- *
- * @param phoneid Phone that will be used to contact the receiving side.
- * @param src     Source address space area base address.
- * @param flags   Flags to be used for sharing. Bits can be only cleared.
- *
- * @return Zero on success or a negative error code from errno.h.
- *
- */
-int ipc_share_out_start(int phoneid, void *src, unsigned int flags)
-{
-        return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (sysarg_t) src, 0,
-            (sysarg_t) flags);
-}
-
-/** Wrapper for answering the IPC_M_SHARE_OUT calls.
- *
- * This wrapper only makes it more comfortable to answer IPC_M_SHARE_OUT
- * calls so that the user doesn't have to remember the meaning of each
- * IPC argument.
- *
- * @param callid Hash of the IPC_M_DATA_WRITE call to answer.
- * @param dst    Destination address space area base address.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
- */
-int ipc_share_out_finalize(ipc_callid_t callid, void **dst)
-{
-        return ipc_answer_2(callid, EOK, (sysarg_t) __entry, (sysarg_t) dst);
-}
-
-/** Wrapper for IPC_M_DATA_READ calls.
- *
- * @param phoneid Phone that will be used to contact the receiving side.
- * @param dst     Address of the beginning of the destination buffer.
- * @param size    Size of the destination buffer.
- *
- * @return Zero on success or a negative error code from errno.h.
- *
- */
-int ipc_data_read_start(int phoneid, void *dst, size_t size)
-{
-        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,
-            (sysarg_t) size);
-}
-
-/** Wrapper for answering the IPC_M_DATA_READ calls.
- *
- * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ
- * calls so that the user doesn't have to remember the meaning of each
- * IPC argument.
- *
- * @param callid Hash of the IPC_M_DATA_READ call to answer.
- * @param src    Source address for the IPC_M_DATA_READ call.
- * @param size   Size for the IPC_M_DATA_READ call. Can be smaller than
- *               the maximum size announced by the sender.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
- */
-int ipc_data_read_finalize(ipc_callid_t callid, const void *src, size_t size)
-{
-        return ipc_answer_2(callid, EOK, (sysarg_t) src, (sysarg_t) size);
-}
-
-/** Wrapper for IPC_M_DATA_WRITE calls.
- *
- * @param phoneid Phone that will be used to contact the receiving side.
- * @param src     Address of the beginning of the source buffer.
- * @param size    Size of the source buffer.
- *
- * @return Zero on success or a negative error code from errno.h.
- *
- */
-int ipc_data_write_start(int phoneid, const void *src, size_t size)
-{
-        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (sysarg_t) src,
-            (sysarg_t) size);
-}
-
-/** Wrapper for answering the IPC_M_DATA_WRITE calls.
- *
- * This wrapper only makes it more comfortable to answer IPC_M_DATA_WRITE
- * calls so that the user doesn't have to remember the meaning of each
- * IPC argument.
- *
- * @param callid Hash of the IPC_M_DATA_WRITE call to answer.
- * @param dst    Final destination address for the IPC_M_DATA_WRITE call.
- * @param size   Final size for the IPC_M_DATA_WRITE call.
- *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
- */
-int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size)
-{
-        return ipc_answer_2(callid, EOK, (sysarg_t) dst, (sysarg_t) size);
-}
-
 /** Connect to a task specified by id.
  *

uspace/lib/c/generic/iplink_srv.c

@@ -139 +139 @@
                 if (!method) {
                         /* The other side has hung up */
+                        fibril_mutex_lock(&srv->lock);
+                        srv->connected = false;
+                        fibril_mutex_unlock(&srv->lock);
                         async_answer_0(callid, EOK);
                         break;

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

@@ -47 +47 @@
 
 typedef void (*ipc_async_callback_t)(void *, int, ipc_call_t *);
-
-/*
- * User-friendly wrappers for ipc_call_sync_fast() and ipc_call_sync_slow().
- * They are in the form ipc_call_sync_m_n(), where m denotes the number of
- * arguments of payload and n denotes number of return values. Whenever
- * possible, the fast version is used.
- */
-
-#define ipc_call_sync_0_0(phoneid, method) \
-        ipc_call_sync_fast((phoneid), (method), 0, 0, 0, 0, 0, 0, 0, 0)
-#define ipc_call_sync_0_1(phoneid, method, res1) \
-        ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), 0, 0, 0, 0)
-#define ipc_call_sync_0_2(phoneid, method, res1, res2) \
-        ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), 0, 0, 0)
-#define ipc_call_sync_0_3(phoneid, method, res1, res2, res3) \
-        ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
-            0, 0)
-#define ipc_call_sync_0_4(phoneid, method, res1, res2, res3, res4) \
-        ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
-            (res4), 0)
-#define ipc_call_sync_0_5(phoneid, method, res1, res2, res3, res4, res5) \
-        ipc_call_sync_fast((phoneid), (method), 0, 0, 0, (res1), (res2), (res3), \
-            (res4), (res5))
-
-#define ipc_call_sync_1_0(phoneid, method, arg1) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, 0, 0, 0, 0, 0)
-#define ipc_call_sync_1_1(phoneid, method, arg1, res1) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), 0, 0, 0, 0)
-#define ipc_call_sync_1_2(phoneid, method, arg1, res1, res2) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), 0, \
-            0, 0)
-#define ipc_call_sync_1_3(phoneid, method, arg1, res1, res2, res3) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \
-            (res3), 0, 0)
-#define ipc_call_sync_1_4(phoneid, method, arg1, res1, res2, res3, res4) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \
-            (res3), (res4), 0)
-#define ipc_call_sync_1_5(phoneid, method, arg1, res1, res2, res3, res4, \
-    res5) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), 0, 0, (res1), (res2), \
-            (res3), (res4), (res5))
-
-#define ipc_call_sync_2_0(phoneid, method, arg1, arg2) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, 0, 0, 0, \
-            0, 0)
-#define ipc_call_sync_2_1(phoneid, method, arg1, arg2, res1) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), 0, 0, \
-            0, 0)
-#define ipc_call_sync_2_2(phoneid, method, arg1, arg2, res1, res2) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
-            (res2), 0, 0, 0)
-#define ipc_call_sync_2_3(phoneid, method, arg1, arg2, res1, res2, res3) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
-            (res2), (res3), 0, 0)
-#define ipc_call_sync_2_4(phoneid, method, arg1, arg2, res1, res2, res3, \
-    res4) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
-            (res2), (res3), (res4), 0)
-#define ipc_call_sync_2_5(phoneid, method, arg1, arg2, res1, res2, res3, \
-    res4, res5)\
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), 0, (res1), \
-            (res2), (res3), (res4), (res5))
-
-#define ipc_call_sync_3_0(phoneid, method, arg1, arg2, arg3) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, 0, 0, \
-            0, 0)
-#define ipc_call_sync_3_1(phoneid, method, arg1, arg2, arg3, res1) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), (res1), \
-            0, 0, 0, 0)
-#define ipc_call_sync_3_2(phoneid, method, arg1, arg2, arg3, res1, res2) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), (res1), \
-            (res2), 0, 0, 0)
-#define ipc_call_sync_3_3(phoneid, method, arg1, arg2, arg3, res1, res2, \
-    res3) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), \
-            (res1), (res2), (res3), 0, 0)
-#define ipc_call_sync_3_4(phoneid, method, arg1, arg2, arg3, res1, res2, \
-    res3, res4) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), \
-            (res1), (res2), (res3), (res4), 0)
-#define ipc_call_sync_3_5(phoneid, method, arg1, arg2, arg3, res1, res2, \
-    res3, res4, res5) \
-        ipc_call_sync_fast((phoneid), (method), (arg1), (arg2), (arg3), \
-            (res1), (res2), (res3), (res4), (res5))
-
-#define ipc_call_sync_4_0(phoneid, method, arg1, arg2, arg3, arg4) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), 0, \
-            0, 0, 0, 0, 0)
-#define ipc_call_sync_4_1(phoneid, method, arg1, arg2, arg3, arg4, res1) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), 0, \
-            (res1), 0, 0, 0, 0)
-#define ipc_call_sync_4_2(phoneid, method, arg1, arg2, arg3, arg4, res1, res2) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), 0, \
-            (res1), (res2), 0, 0, 0)
-#define ipc_call_sync_4_3(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \
-    res3) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), 0, (res1), (res2), (res3), 0, 0)
-#define ipc_call_sync_4_4(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \
-    res3, res4) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), 0, (res1), (res2), (res3), (res4), 0)
-#define ipc_call_sync_4_5(phoneid, method, arg1, arg2, arg3, arg4, res1, res2, \
-    res3, res4, res5) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), 0, (res1), (res2), (res3), (res4), (res5))
-
-#define ipc_call_sync_5_0(phoneid, method, arg1, arg2, arg3, arg4, arg5) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-            (arg5), 0, 0, 0, 0, 0)
-#define ipc_call_sync_5_1(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
-            (arg5), (res1), 0, 0, 0, 0)
-#define ipc_call_sync_5_2(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \
-    res2) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), (arg5), (res1), (res2), 0, 0, 0)
-#define ipc_call_sync_5_3(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \
-    res2, res3) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), (arg5), (res1), (res2), (res3), 0, 0)
-#define ipc_call_sync_5_4(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \
-    res2, res3, res4) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), (arg5), (res1), (res2), (res3), (res4), 0)
-#define ipc_call_sync_5_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, res1, \
-    res2, res3, res4, res5) \
-        ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
-            (arg4), (arg5), (res1), (res2), (res3), (res4), (res5))
-
-extern int ipc_call_sync_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *);
-
-extern int ipc_call_sync_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *,
-    sysarg_t *);
 
 extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
@@ -254 +118 @@
     sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
 
-extern int ipc_clone_establish(int);
-extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, task_id_t *,
-    sysarg_t *);
-extern int ipc_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
-extern int ipc_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);
-
 extern int ipc_hangup(int);
 
@@ -267 +125 @@
     sysarg_t, sysarg_t, sysarg_t, unsigned int);
 
-/*
- * User-friendly wrappers for ipc_share_in_start().
- */
-
-#define ipc_share_in_start_0_0(phoneid, size, dst) \
-        ipc_share_in_start((phoneid), (size), 0, NULL, (dst))
-#define ipc_share_in_start_0_1(phoneid, size, flags, dst) \
-        ipc_share_in_start((phoneid), (size), 0, (flags), (dst))
-#define ipc_share_in_start_1_0(phoneid, size, arg, dst) \
-        ipc_share_in_start((phoneid), (size), (arg), NULL, (dst))
-#define ipc_share_in_start_1_1(phoneid, size, arg, flags, dst) \
-        ipc_share_in_start((phoneid), (size), (arg), (flags), (dst))
-
-extern int ipc_share_in_start(int, size_t, sysarg_t, unsigned int *, void **);
-extern int ipc_share_in_finalize(ipc_callid_t, void *, unsigned int);
-extern int ipc_share_out_start(int, void *, unsigned int);
-extern int ipc_share_out_finalize(ipc_callid_t, void **);
-extern int ipc_data_read_start(int, void *, size_t);
-extern int ipc_data_read_finalize(ipc_callid_t, const void *, size_t);
-extern int ipc_data_write_start(int, const void *, size_t);
-extern int ipc_data_write_finalize(ipc_callid_t, void *, size_t);
-
 extern int ipc_connect_kbox(task_id_t);