Changeset 7bdcc45 in mainline for kernel/generic/include/ddi

Timestamp:

2010-12-16T16:38:49Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/ddi

Files:

• ddi.h (modified) (1 diff)
• device.h (modified) (1 diff)
• irq.h (modified) (1 diff)

kernel/generic/include/ddi/ddi.h

@@ -52 +52 @@
 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_interrupt_enable(int irq, int enable);
+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);
 
 /*

kernel/generic/include/ddi/device.h

@@ -39 +39 @@
 
 extern devno_t device_assign_devno(void);
-extern unative_t sys_device_assign_devno(void);
+extern sysarg_t sys_device_assign_devno(void);
 
 #endif

kernel/generic/include/ddi/irq.h

@@ -122 +122 @@
         /** Answerbox for notifications. */
         answerbox_t *answerbox;
-        /** Method to be used for the notification. */
-        unative_t method;
+        /** Interface and method to be used for the notification. */
+        sysarg_t imethod;
         /** Arguments that will be sent if the IRQ is claimed. */
         uint32_t scratch[IPC_CALL_LEN];