Changeset a676574 in mainline for kernel/generic/include

Timestamp:

2011-01-09T12:18:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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:

kernel/generic/include

Files:

• ddi/irq.h (modified) (3 diffs)
• interrupt.h (modified) (1 diff)
• proc/task.h (modified) (1 diff)
• syscall/syscall.h (modified) (1 diff)

kernel/generic/include/ddi/irq.h

@@ -54 +54 @@
         /** Read 4 bytes from the I/O space. */
         CMD_PIO_READ_32,
+        
         /** Write 1 byte to the I/O space. */
         CMD_PIO_WRITE_8,
@@ -62 +63 @@
         
         /**
-         * Perform a bit test on the source argument and store the result into
-         * the destination argument.
+         * Write 1 byte from the source argument
+         * to the I/O space.
+         */
+        CMD_PIO_WRITE_A_8,
+        /**
+         * Write 2 bytes from the source argument
+         * to the I/O space.
+         */
+        CMD_PIO_WRITE_A_16,
+        /**
+         * Write 4 bytes from the source argument
+         * to the I/O space.
+         */
+        CMD_PIO_WRITE_A_32,
+        
+        /**
+         * Perform a bit masking on the source argument
+         * and store the result into the destination argument.
          */
         CMD_BTEST,
         
         /**
-         * Predicate the execution of the following N commands by the boolean
-         * value of the source argument.
+         * Predicate the execution of the following
+         * N commands by the boolean value of the source
+         * argument.
          */
         CMD_PREDICATE,
@@ -75 +93 @@
         /** Accept the interrupt. */
         CMD_ACCEPT,
+        
         /** Decline the interrupt. */
         CMD_DECLINE,

kernel/generic/include/interrupt.h

@@ -60 +60 @@
 extern void fault_if_from_uspace(istate_t *, const char *, ...)
     PRINTF_ATTRIBUTE(2, 3);
+extern istate_t *istate_get(thread_t *);
 extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
 extern void exc_dispatch(unsigned int, istate_t *);

kernel/generic/include/proc/task.h

@@ -154 +154 @@
 
 extern sysarg_t sys_task_set_name(const char *, size_t);
+extern sysarg_t sys_task_kill(task_id_t *);
 
 #endif

kernel/generic/include/syscall/syscall.h

@@ -47 +47 @@
         SYS_TASK_GET_ID,
         SYS_TASK_SET_NAME,
+        SYS_TASK_KILL,
         SYS_PROGRAM_SPAWN_LOADER,