Changeset ad7a6c9 in mainline for kernel/generic/include/ddi/ddi.h

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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) (3 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;
 
@@ -54 +55 @@
 extern sysarg_t sys_physmem_map(sysarg_t, sysarg_t, sysarg_t, sysarg_t);
 extern sysarg_t sys_iospace_enable(ddi_ioarg_t *);
-extern sysarg_t sys_interrupt_enable(int irq, int enable);
 
 /*
@@ -61 +61 @@
 extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
 
-
 #endif