Changeset 9a8d91b in mainline

Timestamp:

2006-04-12T16:40:35Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ace9ea

Parents:

b7f364e

Message:

Add task_find_by_id().
Add kernel support for SYS_MAP_PHYSMEM.

Files:

• Makefile (modified) (1 diff)
• generic/include/ddi/ddi.h (added)
• generic/include/ddi/ddi_arg.h (added)
• generic/include/errno.h (modified) (1 diff)
• generic/include/mm/as.h (modified) (1 diff)
• generic/include/proc/task.h (modified) (1 diff)
• generic/include/syscall/syscall.h (modified) (1 diff)
• generic/src/ddi/ddi.c (added)
• generic/src/mm/as.c (modified) (2 diffs)
• generic/src/proc/task.c (modified) (1 diff)
• generic/src/syscall/syscall.c (modified) (2 diffs)

Makefile

@@ -109 +109 @@
         generic/src/console/cmd.c \
         generic/src/cpu/cpu.c \
+        generic/src/ddi/ddi.c \
         generic/src/interrupt/interrupt.c \
         generic/src/main/main.c \

generic/include/errno.h

@@ -38 +38 @@
 #define EFORWARD   -5  /* Forward error */
 #define EPERM      -6  /* Permission denied */
-#define EHANGUP    -7  /* Answerbox closed cionnection, call sys_ipc_hangup
+#define EHANGUP    -7  /* Answerbox closed connection, call sys_ipc_hangup
                         * to close the connection. Used by answerbox
                         * to close the connection.  */

generic/include/mm/as.h

@@ -57 +57 @@
 #define AS_AREA_WRITE   2
 #define AS_AREA_EXEC    4
+#define AS_AREA_DEVICE  8
 
 /** Address space area structure.

generic/include/proc/task.h

@@ -59 +59 @@
 extern task_t *task_create(as_t *as, char *name);
 extern task_t *task_run_program(void *program_addr, char *name);
+extern task_t *task_find_by_id(task_id_t id);
 
 extern __native sys_get_task_id(task_id_t *uspace_task_id);

generic/include/syscall/syscall.h

@@ -49 +49 @@
         SYS_IPC_WAIT,
         SYS_IPC_HANGUP,
+        SYS_MAP_PHYSMEM,
         SYSCALL_END
 } syscall_t;

generic/src/mm/as.c

@@ -353 +353 @@
         int flags;
 
-        flags = PAGE_USER | PAGE_PRESENT | PAGE_CACHEABLE;
+        flags = PAGE_USER | PAGE_PRESENT;
         
         if (a->flags & AS_AREA_READ)
@@ -364 +364 @@
                 flags |= PAGE_EXEC;
         
+        if (!(a->flags & AS_AREA_DEVICE))
+                flags |= PAGE_CACHEABLE;
+                
         return flags;
 }

generic/src/proc/task.c

@@ -173 +173 @@
 }
 
+/** Find task structure corresponding to task ID.
+ *
+ * The tasks_lock must be already held by the caller of this function
+ * and interrupts must be disabled.
+ *
+ * @param id Task ID.
+ *
+ * @return Task structure address or NULL if there is no such task ID.
+ */
+task_t *task_find_by_id(task_id_t id)
+{
+        btree_node_t *leaf;
+        
+        return (task_t *) btree_search(&tasks_btree, (btree_key_t) id, &leaf);
+}
+
 /** Print task list */
 void task_print_list(void)

generic/src/syscall/syscall.c

@@ -38 +38 @@
 #include <ipc/sysipc.h>
 #include <synch/futex.h>
+#include <ddi/ddi.h>
 
 static __native sys_io(int fd, const void * buf, size_t count) {
@@ -92 +93 @@
         sys_ipc_forward_fast,
         sys_ipc_wait_for_call,
-        sys_ipc_hangup
+        sys_ipc_hangup,
+        sys_map_physmem
 };