Changeset 89c57b6 in mainline for kernel/generic/include/ddi/ddi.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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:

• kernel/generic/include/ddi/ddi.h (modified) (2 diffs)

kernel/generic/include/ddi/ddi.h

@@ -43 +43 @@
 /** Structure representing contiguous physical memory area. */
 typedef struct {
-        uintptr_t pbase;    /**< Physical base of the area. */
-        pfn_t frames;       /**< Number of frames in the area. */
+        link_t link;      /**< Linked list link */
         
-        link_t link;        /**< Linked list link */
+        uintptr_t pbase;  /**< Physical base of the area. */
+        pfn_t frames;     /**< Number of frames in the area. */
+        bool unpriv;      /**< Allow mapping by unprivileged tasks. */
 } parea_t;
 
@@ -52 +53 @@
 extern void ddi_parea_register(parea_t *);
 
-extern unative_t sys_physmem_map(unative_t, unative_t, unative_t, unative_t);
-extern unative_t sys_iospace_enable(ddi_ioarg_t *);
-extern unative_t sys_preempt_control(int);
+extern sysarg_t sys_physmem_map(sysarg_t, sysarg_t, sysarg_t, sysarg_t);
+extern sysarg_t sys_iospace_enable(ddi_ioarg_t *);
 
 /*