Changeset 46c20c8 in mainline for kernel/generic/include/ddi/ddi_arg.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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_arg.h (modified) (2 diffs)

kernel/generic/include/ddi/ddi_arg.h

@@ -36 +36 @@
 #define KERN_DDI_ARG_H_
 
+#ifdef KERNEL
+
+#include <typedefs.h>
+
+#endif /* KERNEL */
+
 /** Structure encapsulating arguments for SYS_PHYSMEM_MAP syscall. */
 typedef struct {
         /** ID of the destination task. */
-        unsigned long long task_id;
+        uint64_t task_id;
         /** Physical address of starting frame. */
         void *phys_base;
@@ -45 +51 @@
         void *virt_base;
         /** Number of pages to map. */
-        unsigned long pages;
+        size_t pages;
         /** Address space area flags for the mapping. */
-        int flags;
+        unsigned int flags;
 } ddi_memarg_t;
 
 /** Structure encapsulating arguments for SYS_ENABLE_IOSPACE syscall. */
 typedef struct {
-        unsigned long long task_id;     /**< ID of the destination task. */
-        void *ioaddr;                   /**< Starting I/O space address. */
-        unsigned long size;             /**< Number of bytes. */
+        uint64_t task_id;  /**< ID of the destination task. */
+        void *ioaddr;      /**< Starting I/O space address. */
+        size_t size;       /**< Number of bytes. */
 } ddi_ioarg_t;