Changeset 03362fbd in mainline for kernel/generic/src/ipc/ops/shareout.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/generic/src/ipc/ops/shareout.c (moved) (moved from uspace/lib/ext2/libext2_block_group.h ) (2 diffs)

kernel/generic/src/ipc/ops/shareout.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2012 Jakub Jermar 
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libext2
+/** @addtogroup genericipc
  * @{
  */
-/**
- * @file
+/** @file
  */
 
-#ifndef LIBEXT2_LIBEXT2_BLOCK_GROUP_H_
-#define LIBEXT2_LIBEXT2_BLOCK_GROUP_H_
+#include <ipc/sysipc_ops.h>
+#include <ipc/ipc.h>
+#include <mm/as.h>
+#include <synch/spinlock.h>
+#include <proc/task.h>
+#include <syscall/copy.h>
+#include <abi/errno.h>
+#include <arch.h>
 
-#include <libblock.h>
+static int request_preprocess(call_t *call, phone_t *phone)
+{
+        size_t size = as_area_get_size(IPC_GET_ARG1(call->data));
 
-typedef struct ext2_block_group {
-        uint32_t block_bitmap_block; // Block ID for block bitmap
-        uint32_t inode_bitmap_block; // Block ID for inode bitmap
-        uint32_t inode_table_first_block; // Block ID of first block of inode table 
-        uint16_t free_block_count; // Count of free blocks
-        uint16_t free_inode_count; // Count of free inodes
-        uint16_t directory_inode_count; // Number of inodes allocated to directories
-} ext2_block_group_t;
+        if (!size)
+                return EPERM;
+        IPC_SET_ARG2(call->data, size);
 
-typedef struct ext2_block_group_ref {
-        block_t *block; // Reference to a block containing this block group descr
-        ext2_block_group_t *block_group;
-} ext2_block_group_ref_t;
+        return EOK;
+}
 
-#define EXT2_BLOCK_GROUP_DESCRIPTOR_SIZE 32
+static int answer_preprocess(call_t *answer, ipc_data_t *olddata)
+{
+        int rc = EOK;
 
-extern uint32_t ext2_block_group_get_block_bitmap_block(ext2_block_group_t *);
-extern uint32_t ext2_block_group_get_inode_bitmap_block(ext2_block_group_t *);
-extern uint32_t ext2_block_group_get_inode_table_first_block(ext2_block_group_t *);
-extern uint16_t ext2_block_group_get_free_block_count(ext2_block_group_t *);
-extern uint16_t ext2_block_group_get_free_inode_count(ext2_block_group_t *);
-extern uint16_t ext2_block_group_get_directory_inode_count(ext2_block_group_t *);
+        if (!IPC_GET_RETVAL(answer->data)) {
+                /* Accepted, handle as_area receipt */
 
-extern void     ext2_block_group_set_free_block_count(ext2_block_group_t *, uint16_t);
+                irq_spinlock_lock(&answer->sender->lock, true);
+                as_t *as = answer->sender->as;
+                irq_spinlock_unlock(&answer->sender->lock, true);
 
-#endif
+                uintptr_t dst_base = (uintptr_t) -1;
+                rc = as_area_share(as, IPC_GET_ARG1(*olddata),
+                    IPC_GET_ARG2(*olddata), AS, IPC_GET_ARG3(*olddata),
+                    &dst_base, IPC_GET_ARG1(answer->data));
+                        
+                if (rc == EOK) {
+                        rc = copy_to_uspace((void *) IPC_GET_ARG2(answer->data),
+                            &dst_base, sizeof(dst_base));
+                }
+                        
+                IPC_SET_RETVAL(answer->data, rc);
+        }
+
+        return rc;
+}
+
+sysipc_ops_t ipc_m_share_out_ops = {
+        .request_preprocess = request_preprocess,
+        .request_forget = null_request_forget,
+        .request_process = null_request_process,
+        .answer_cleanup = null_answer_cleanup,
+        .answer_preprocess = answer_preprocess,
+        .answer_process = null_answer_process,
+};
 
 /** @}